Merge pull request #335 from mupq/duallicense

Merge branch 'master' of github.com:mupq/pqm4
mupq · Mar 26, 2024 · 4f5b5ce · 4f5b5ce
2 parents 82c6d7a + 5d0fe86
commit 4f5b5ce
Show file tree

Hide file tree

Showing 27 changed files with 29 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Apache-2.0 or CC0-1.0
 #include <stdint.h>
 #include <string.h>
 #include "aes.h"

diff --git 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
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Apache-2.0 or CC0-1.0
 #include <hal.h>
 #include <CMSDK_CM4.h>
 

diff --git 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 <sys/cdefs.h>
 

diff --git 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 <hal.h>
 #include <fips202.h>

diff --git 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
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: Apache-2.0 or CC0-1.0
 #include <hal.h>
 #include <randombytes.h>
 #include <sendfn.h>

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
+2 −1		README.md
+1 −0		common/aes-publicinputs.h
+1 −0		common/aes.h
+1 −0		common/compat.h
+1 −0		common/crypto_hashblocks_sha512.h
+1 −0		common/fips202.c
+1 −0		common/fips202.h
+1 −0		common/hal.h
+1 −0		common/sendfn.h
+1 −0		crypto_kem/hashing.c
+1 −0		crypto_kem/speed.c
+1 −0		crypto_kem/stack.c
+1 −0		crypto_kem/test.c
+2 −0		crypto_kem/testvectors-host.c
+2 −0		crypto_kem/testvectors.c
+1 −0		crypto_sign/hashing.c
+1 −0		crypto_sign/speed.c
+1 −0		crypto_sign/stack.c
+1 −0		crypto_sign/test.c
+2 −0		crypto_sign/testvectors-host.c
+2 −0		crypto_sign/testvectors.c
+1 −0		genskiplist.py
+1 −0		mk/config.mk
+1 −0		mk/host-crypto.mk
+1 −0		mk/rules.mk
+1 −0		mk/schemes.mk
+1 −0		mupq.py
+1 −0		platforms.py