From d79b50c912de2445e75c1c179461a6af56505301 Mon Sep 17 00:00:00 2001 From: Johan Sydseter Date: Tue, 7 May 2024 20:52:43 +0200 Subject: [PATCH] Fix licensing. --- README.md | 16 ++++++++++++++-- LICENSE => source/LICENSE.md | 0 2 files changed, 14 insertions(+), 2 deletions(-) rename LICENSE => source/LICENSE.md (100%) diff --git a/README.md b/README.md index 19717058..e1746759 100644 --- a/README.md +++ b/README.md @@ -8,18 +8,30 @@ OWASP Cornucopia is a mechanism in the form of a card game to assist software de identify security requirements in Agile, conventional and formal development processes. It is language, platform and technology agnostic. -### The cross-references on the Web App Edition deck relate to the following versions of other OWASP and external resources: +## The cross-references on the Web App Edition deck relate to the following versions of other OWASP and external resources: * OWASP SCP OWASP_Secure_Coding_Practices_Checklist v2 * OWASP ASVS OWASP_Application_Security_Verification_Standard v4 (2019) * OWASP AppSensor AppSensor_DetectionPoints * CAPEC Mitre Common Attack Pattern Enumeration and Classification v1.7.1 * SAFECode SAFECode Practical Security Stories and Security Tasks for Agile Development Environments July 2012 -### Credits +## Credits Cornucopia was originally conceived and created by Colin Watson and has since had contributions from a worldwide team of volunteers. Please see [Project Page](https://owasp.org/www-project-cornucopia/) for more details. +## License + +Except, where otherwise noted, content in this repository is licensed under a [CC-BY-SA-3.0](./LICENSE.md) + +Text for Elevation of Privilege (EoP) is licensed under [CC-BY-SA-3.0](./LICENSE.md) + +Text and code mapping for OWASP Cornucopia Website App Edition is licensed under [CC-BY-SA-3.0](./LICENSE.md) + +Text and code mapping for OWASP Cornucopia Mobile App Edition is licensed under [Apache License 2.0](./source/LICENSE.md) + + + ## Building the Deck Merges to the main branch will generate new DOCX and IDML files to use to print off new version of the deck but if you wish to produce these locally yourself then use the ./scripts/convert.py scipt to do this: diff --git a/LICENSE b/source/LICENSE.md similarity index 100% rename from LICENSE rename to source/LICENSE.md