diff --git a/Makefile b/Makefile index 2a321c01..a3f49c35 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: Apache-2.0 or CC0-1.0 .PHONY: all all: tests tests-bin diff --git a/README.md b/README.md index 082dce55..3fff71bf 100644 --- a/README.md +++ b/README.md @@ -406,5 +406,6 @@ Each subdirectory containing implementations contains a LICENSE or COPYING file under what license that specific implementation is released. The files in common contain licensing information at the top of the file (and are currently either public domain or MIT). -All other code in this repository is released under the conditions of [CC0](https://creativecommons.org/publicdomain/zero/1.0/). + +All other code in this repository is dual-licensed under [Apache-2.0](https://www.apache.org/licenses/LICENSE-2.0) and under the conditions of [CC0](https://creativecommons.org/publicdomain/zero/1.0/). diff --git a/benchmarks.py b/benchmarks.py index 5895fc0e..f1b91181 100755 --- a/benchmarks.py +++ b/benchmarks.py @@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# SPDX-License-Identifier: Apache-2.0 or CC0-1.0 from mupq import mupq from interface import parse_arguments, get_platform import sys diff --git a/build_everything.py b/build_everything.py index 16bae738..21947895 100755 --- a/build_everything.py +++ b/build_everything.py @@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# SPDX-License-Identifier: Apache-2.0 or CC0-1.0 """ Builds all of the binaries without flashing them. """ diff --git a/common/aes.c b/common/aes.c index aab280eb..ff84540c 100644 --- a/common/aes.c +++ b/common/aes.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: Apache-2.0 or CC0-1.0 #include #include #include "aes.h" diff --git a/common/aes.h b/common/aes.h index f4586589..49e9433b 100644 --- a/common/aes.h +++ b/common/aes.h @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: Apache-2.0 or CC0-1.0 #ifndef AES_H #define AES_H diff --git a/common/hal-mps2.c b/common/hal-mps2.c index eefa6440..62e1924b 100644 --- a/common/hal-mps2.c +++ b/common/hal-mps2.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: Apache-2.0 or CC0-1.0 #include #include diff --git a/common/hal-opencm3.c b/common/hal-opencm3.c index ec80ad01..05d7377a 100644 --- a/common/hal-opencm3.c +++ b/common/hal-opencm3.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: Apache-2.0 or CC0-1.0 #include "hal.h" #include diff --git a/common/keccaktest.c b/common/keccaktest.c index 05d13381..389bb9cf 100644 --- a/common/keccaktest.c +++ b/common/keccaktest.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: Apache-2.0 or CC0-1.0 #include "randombytes.h" #include #include diff --git a/common/randombytes.c b/common/randombytes.c index 386059d9..ba60a120 100644 --- a/common/randombytes.c +++ b/common/randombytes.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: Apache-2.0 or CC0-1.0 #include "randombytes.h" #if defined(STM32F2) || defined(STM32F4) || defined(STM32L4R5ZI) && !defined(MPS2_AN386) diff --git a/common/test.c b/common/test.c index 987d12d2..1a24c275 100644 --- a/common/test.c +++ b/common/test.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: Apache-2.0 or CC0-1.0 #include #include #include diff --git a/convert_benchmarks.py b/convert_benchmarks.py index 13e7a038..6d9667f3 100755 --- a/convert_benchmarks.py +++ b/convert_benchmarks.py @@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# SPDX-License-Identifier: Apache-2.0 or CC0-1.0 import sys from mupq import mupq diff --git a/interface.py b/interface.py index 2b386caf..76d4e7af 100644 --- a/interface.py +++ b/interface.py @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: Apache-2.0 or CC0-1.0 import argparse from mupq import mupq diff --git a/mk/config.mk b/mk/config.mk index 53740a84..85fc9145 100644 --- a/mk/config.mk +++ b/mk/config.mk @@ -1,2 +1,3 @@ +# SPDX-License-Identifier: Apache-2.0 or CC0-1.0 CPPFLAGS += \ -DPQM4 diff --git a/mk/crypto.mk b/mk/crypto.mk index 4c6904b3..7aae6b10 100644 --- a/mk/crypto.mk +++ b/mk/crypto.mk @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: Apache-2.0 or CC0-1.0 SYMCRYPTO_SRC = \ mupq/common/fips202.c \ mupq/common/sp800-185.c \ diff --git a/mk/cw308t-stm32f3.mk b/mk/cw308t-stm32f3.mk index 7aa3d846..5cb9a678 100644 --- a/mk/cw308t-stm32f3.mk +++ b/mk/cw308t-stm32f3.mk @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: Apache-2.0 or CC0-1.0 DEVICE=stm32f303rct7 OPENCM3_TARGET=lib/stm32/f3 diff --git a/mk/cw308t-stm32f415.mk b/mk/cw308t-stm32f415.mk index c148f5c0..aeb98deb 100644 --- a/mk/cw308t-stm32f415.mk +++ b/mk/cw308t-stm32f415.mk @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: Apache-2.0 or CC0-1.0 DEVICE=stm32f415rgt6 OPENCM3_TARGET=lib/stm32/f4 diff --git a/mk/mps2-an386.mk b/mk/mps2-an386.mk index 48914751..0412d861 100644 --- a/mk/mps2-an386.mk +++ b/mk/mps2-an386.mk @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: Apache-2.0 or CC0-1.0 EXCLUDED_SCHEMES = \ mupq/crypto_sign/tuov_v/ref% diff --git a/mk/nucleo-l476rg.mk b/mk/nucleo-l476rg.mk index 62349b53..9cdebc35 100644 --- a/mk/nucleo-l476rg.mk +++ b/mk/nucleo-l476rg.mk @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: Apache-2.0 or CC0-1.0 DEVICE=stm32l476rg OPENCM3_TARGET=lib/stm32/l4 diff --git a/mk/nucleo-l4r5zi.mk b/mk/nucleo-l4r5zi.mk index b0d30fea..b41cc24a 100644 --- a/mk/nucleo-l4r5zi.mk +++ b/mk/nucleo-l4r5zi.mk @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: Apache-2.0 or CC0-1.0 DEVICE=stm32l4r5zi OPENCM3_TARGET=lib/stm32/l4 diff --git a/mk/opencm3.mk b/mk/opencm3.mk index fbcd2428..6e07c71c 100644 --- a/mk/opencm3.mk +++ b/mk/opencm3.mk @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: Apache-2.0 or CC0-1.0 LIBHAL_SRC := \ common/hal-opencm3.c \ common/randombytes.c diff --git a/mk/stm32f4discovery.mk b/mk/stm32f4discovery.mk index 2b10ef4b..76426d99 100644 --- a/mk/stm32f4discovery.mk +++ b/mk/stm32f4discovery.mk @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: Apache-2.0 or CC0-1.0 DEVICE=stm32f407vg OPENCM3_TARGET=lib/stm32/f4 diff --git a/mk/tests.mk b/mk/tests.mk index 40923ab8..8b6aab8a 100644 --- a/mk/tests.mk +++ b/mk/tests.mk @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: Apache-2.0 or CC0-1.0 ifeq ($(AIO),1) elf/boardtest.elf: common/test.c $(LINKDEPS) $(CONFIG) $(compiletest) diff --git a/mupq b/mupq index 66102a0c..a165f5d4 160000 --- a/mupq +++ b/mupq @@ -1 +1 @@ -Subproject commit 66102a0c237849e7c88adb88cfa4934b398a3a0b +Subproject commit a165f5d48c011e2647065ec7ad84cec3314b3375 diff --git a/st_nucleo_l4r5.cfg b/st_nucleo_l4r5.cfg index 830c1659..be4fffd5 100644 --- a/st_nucleo_l4r5.cfg +++ b/st_nucleo_l4r5.cfg @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: Apache-2.0 or CC0-1.0 + # This is for STM32L4R5 Nucleo Dev Boards. source [find interface/stlink-dap.cfg] diff --git a/test.py b/test.py index 2d6686af..969282b5 100755 --- a/test.py +++ b/test.py @@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# SPDX-License-Identifier: Apache-2.0 or CC0-1.0 from mupq import mupq from interface import parse_arguments, get_platform diff --git a/testvectors.py b/testvectors.py index 2424a483..a08c1510 100755 --- a/testvectors.py +++ b/testvectors.py @@ -1,4 +1,5 @@ #!/usr/bin/env python3 +# SPDX-License-Identifier: Apache-2.0 or CC0-1.0 from mupq import mupq from interface import parse_arguments, get_platform import sys