Compare commits

...

2 Commits

Author SHA1 Message Date
Aiden Fox Ivey
71b6ff1594
Merge 8dfad07d8d03089f22988ff0cd9ff1f9382ac573 into b5d3dac4ebdfbbc5de1f6ab9fc6a94c3fd47d13d 2025-07-02 23:54:03 +00:00
Aiden Fox Ivey
8dfad07d8d
Maybe fix patch?
Signed-off-by: Aiden Fox Ivey <aiden@aidenfoxivey.com>
2025-07-02 19:53:44 -04:00
2 changed files with 181 additions and 1 deletions

View File

@ -9,7 +9,7 @@ upstreams:
kem_scheme_path: 'crypto_kem/{pqclean_scheme}'
sig_scheme_path: 'crypto_sign/{pqclean_scheme}'
patches: [pqclean-dilithium-arm-randomized-signing.patch, pqclean-kyber-armneon-shake-fixes.patch, pqclean-kyber-armneon-768-1024-fixes.patch, pqclean-kyber-armneon-variable-timing-fix.patch,
pqclean-kyber-armneon-asan.patch]
pqclean-kyber-armneon-asan.patch, pqclean-classic-mceliese.patch]
ignore: pqclean_sphincs-shake-256s-simple_aarch64, pqclean_sphincs-shake-256s-simple_aarch64, pqclean_sphincs-shake-256f-simple_aarch64, pqclean_sphincs-shake-192s-simple_aarch64, pqclean_sphincs-shake-192f-simple_aarch64, pqclean_sphincs-shake-128s-simple_aarch64, pqclean_sphincs-shake-128f-simple_aarch64
-
name: pqclean

View File

@ -0,0 +1,180 @@
diff --git a/src/kem/classic_mceliece/pqclean_mceliece348864_avx2/controlbits.c b/src/kem/classic_mceliece/pqclean_mceliece348864_avx2/controlbits.c
index ab32b1df..a86eea4f 100644
--- a/src/kem/classic_mceliece/pqclean_mceliece348864_avx2/controlbits.c
+++ b/src/kem/classic_mceliece/pqclean_mceliece348864_avx2/controlbits.c
@@ -1,3 +1,4 @@
+#define memset OQS_MEM_cleanse
/* This file is for implementing the Nassimi-Sahni algorithm */
/* See David Nassimi, Sartaj Sahni "Parallel algorithms to set up the Benes permutationnetwork" */
/* See also https://cr.yp.to/papers/controlbits-20200923.pdf */
diff --git a/src/kem/classic_mceliece/pqclean_mceliece348864_clean/controlbits.c b/src/kem/classic_mceliece/pqclean_mceliece348864_clean/controlbits.c
index ab32b1df..a86eea4f 100644
--- a/src/kem/classic_mceliece/pqclean_mceliece348864_clean/controlbits.c
+++ b/src/kem/classic_mceliece/pqclean_mceliece348864_clean/controlbits.c
@@ -1,3 +1,4 @@
+#define memset OQS_MEM_cleanse
/* This file is for implementing the Nassimi-Sahni algorithm */
/* See David Nassimi, Sartaj Sahni "Parallel algorithms to set up the Benes permutationnetwork" */
/* See also https://cr.yp.to/papers/controlbits-20200923.pdf */
diff --git a/src/kem/classic_mceliece/pqclean_mceliece348864f_avx2/controlbits.c b/src/kem/classic_mceliece/pqclean_mceliece348864f_avx2/controlbits.c
index ab32b1df..a86eea4f 100644
--- a/src/kem/classic_mceliece/pqclean_mceliece348864f_avx2/controlbits.c
+++ b/src/kem/classic_mceliece/pqclean_mceliece348864f_avx2/controlbits.c
@@ -1,3 +1,4 @@
+#define memset OQS_MEM_cleanse
/* This file is for implementing the Nassimi-Sahni algorithm */
/* See David Nassimi, Sartaj Sahni "Parallel algorithms to set up the Benes permutationnetwork" */
/* See also https://cr.yp.to/papers/controlbits-20200923.pdf */
diff --git a/src/kem/classic_mceliece/pqclean_mceliece348864f_clean/controlbits.c b/src/kem/classic_mceliece/pqclean_mceliece348864f_clean/controlbits.c
index ab32b1df..a86eea4f 100644
--- a/src/kem/classic_mceliece/pqclean_mceliece348864f_clean/controlbits.c
+++ b/src/kem/classic_mceliece/pqclean_mceliece348864f_clean/controlbits.c
@@ -1,3 +1,4 @@
+#define memset OQS_MEM_cleanse
/* This file is for implementing the Nassimi-Sahni algorithm */
/* See David Nassimi, Sartaj Sahni "Parallel algorithms to set up the Benes permutationnetwork" */
/* See also https://cr.yp.to/papers/controlbits-20200923.pdf */
diff --git a/src/kem/classic_mceliece/pqclean_mceliece460896_avx2/controlbits.c b/src/kem/classic_mceliece/pqclean_mceliece460896_avx2/controlbits.c
index ab32b1df..a86eea4f 100644
--- a/src/kem/classic_mceliece/pqclean_mceliece460896_avx2/controlbits.c
+++ b/src/kem/classic_mceliece/pqclean_mceliece460896_avx2/controlbits.c
@@ -1,3 +1,4 @@
+#define memset OQS_MEM_cleanse
/* This file is for implementing the Nassimi-Sahni algorithm */
/* See David Nassimi, Sartaj Sahni "Parallel algorithms to set up the Benes permutationnetwork" */
/* See also https://cr.yp.to/papers/controlbits-20200923.pdf */
diff --git a/src/kem/classic_mceliece/pqclean_mceliece460896_clean/controlbits.c b/src/kem/classic_mceliece/pqclean_mceliece460896_clean/controlbits.c
index ab32b1df..a86eea4f 100644
--- a/src/kem/classic_mceliece/pqclean_mceliece460896_clean/controlbits.c
+++ b/src/kem/classic_mceliece/pqclean_mceliece460896_clean/controlbits.c
@@ -1,3 +1,4 @@
+#define memset OQS_MEM_cleanse
/* This file is for implementing the Nassimi-Sahni algorithm */
/* See David Nassimi, Sartaj Sahni "Parallel algorithms to set up the Benes permutationnetwork" */
/* See also https://cr.yp.to/papers/controlbits-20200923.pdf */
diff --git a/src/kem/classic_mceliece/pqclean_mceliece460896f_avx2/controlbits.c b/src/kem/classic_mceliece/pqclean_mceliece460896f_avx2/controlbits.c
index ab32b1df..a86eea4f 100644
--- a/src/kem/classic_mceliece/pqclean_mceliece460896f_avx2/controlbits.c
+++ b/src/kem/classic_mceliece/pqclean_mceliece460896f_avx2/controlbits.c
@@ -1,3 +1,4 @@
+#define memset OQS_MEM_cleanse
/* This file is for implementing the Nassimi-Sahni algorithm */
/* See David Nassimi, Sartaj Sahni "Parallel algorithms to set up the Benes permutationnetwork" */
/* See also https://cr.yp.to/papers/controlbits-20200923.pdf */
diff --git a/src/kem/classic_mceliece/pqclean_mceliece460896f_clean/controlbits.c b/src/kem/classic_mceliece/pqclean_mceliece460896f_clean/controlbits.c
index ab32b1df..a86eea4f 100644
--- a/src/kem/classic_mceliece/pqclean_mceliece460896f_clean/controlbits.c
+++ b/src/kem/classic_mceliece/pqclean_mceliece460896f_clean/controlbits.c
@@ -1,3 +1,4 @@
+#define memset OQS_MEM_cleanse
/* This file is for implementing the Nassimi-Sahni algorithm */
/* See David Nassimi, Sartaj Sahni "Parallel algorithms to set up the Benes permutationnetwork" */
/* See also https://cr.yp.to/papers/controlbits-20200923.pdf */
diff --git a/src/kem/classic_mceliece/pqclean_mceliece6688128_avx2/controlbits.c b/src/kem/classic_mceliece/pqclean_mceliece6688128_avx2/controlbits.c
index ab32b1df..a86eea4f 100644
--- a/src/kem/classic_mceliece/pqclean_mceliece6688128_avx2/controlbits.c
+++ b/src/kem/classic_mceliece/pqclean_mceliece6688128_avx2/controlbits.c
@@ -1,3 +1,4 @@
+#define memset OQS_MEM_cleanse
/* This file is for implementing the Nassimi-Sahni algorithm */
/* See David Nassimi, Sartaj Sahni "Parallel algorithms to set up the Benes permutationnetwork" */
/* See also https://cr.yp.to/papers/controlbits-20200923.pdf */
diff --git a/src/kem/classic_mceliece/pqclean_mceliece6688128_clean/controlbits.c b/src/kem/classic_mceliece/pqclean_mceliece6688128_clean/controlbits.c
index ab32b1df..a86eea4f 100644
--- a/src/kem/classic_mceliece/pqclean_mceliece6688128_clean/controlbits.c
+++ b/src/kem/classic_mceliece/pqclean_mceliece6688128_clean/controlbits.c
@@ -1,3 +1,4 @@
+#define memset OQS_MEM_cleanse
/* This file is for implementing the Nassimi-Sahni algorithm */
/* See David Nassimi, Sartaj Sahni "Parallel algorithms to set up the Benes permutationnetwork" */
/* See also https://cr.yp.to/papers/controlbits-20200923.pdf */
diff --git a/src/kem/classic_mceliece/pqclean_mceliece6688128f_avx2/controlbits.c b/src/kem/classic_mceliece/pqclean_mceliece6688128f_avx2/controlbits.c
index ab32b1df..a86eea4f 100644
--- a/src/kem/classic_mceliece/pqclean_mceliece6688128f_avx2/controlbits.c
+++ b/src/kem/classic_mceliece/pqclean_mceliece6688128f_avx2/controlbits.c
@@ -1,3 +1,4 @@
+#define memset OQS_MEM_cleanse
/* This file is for implementing the Nassimi-Sahni algorithm */
/* See David Nassimi, Sartaj Sahni "Parallel algorithms to set up the Benes permutationnetwork" */
/* See also https://cr.yp.to/papers/controlbits-20200923.pdf */
diff --git a/src/kem/classic_mceliece/pqclean_mceliece6688128f_clean/controlbits.c b/src/kem/classic_mceliece/pqclean_mceliece6688128f_clean/controlbits.c
index ab32b1df..a86eea4f 100644
--- a/src/kem/classic_mceliece/pqclean_mceliece6688128f_clean/controlbits.c
+++ b/src/kem/classic_mceliece/pqclean_mceliece6688128f_clean/controlbits.c
@@ -1,3 +1,4 @@
+#define memset OQS_MEM_cleanse
/* This file is for implementing the Nassimi-Sahni algorithm */
/* See David Nassimi, Sartaj Sahni "Parallel algorithms to set up the Benes permutationnetwork" */
/* See also https://cr.yp.to/papers/controlbits-20200923.pdf */
diff --git a/src/kem/classic_mceliece/pqclean_mceliece6960119_avx2/controlbits.c b/src/kem/classic_mceliece/pqclean_mceliece6960119_avx2/controlbits.c
index ab32b1df..a86eea4f 100644
--- a/src/kem/classic_mceliece/pqclean_mceliece6960119_avx2/controlbits.c
+++ b/src/kem/classic_mceliece/pqclean_mceliece6960119_avx2/controlbits.c
@@ -1,3 +1,4 @@
+#define memset OQS_MEM_cleanse
/* This file is for implementing the Nassimi-Sahni algorithm */
/* See David Nassimi, Sartaj Sahni "Parallel algorithms to set up the Benes permutationnetwork" */
/* See also https://cr.yp.to/papers/controlbits-20200923.pdf */
diff --git a/src/kem/classic_mceliece/pqclean_mceliece6960119_clean/controlbits.c b/src/kem/classic_mceliece/pqclean_mceliece6960119_clean/controlbits.c
index ab32b1df..a86eea4f 100644
--- a/src/kem/classic_mceliece/pqclean_mceliece6960119_clean/controlbits.c
+++ b/src/kem/classic_mceliece/pqclean_mceliece6960119_clean/controlbits.c
@@ -1,3 +1,4 @@
+#define memset OQS_MEM_cleanse
/* This file is for implementing the Nassimi-Sahni algorithm */
/* See David Nassimi, Sartaj Sahni "Parallel algorithms to set up the Benes permutationnetwork" */
/* See also https://cr.yp.to/papers/controlbits-20200923.pdf */
diff --git a/src/kem/classic_mceliece/pqclean_mceliece6960119f_avx2/controlbits.c b/src/kem/classic_mceliece/pqclean_mceliece6960119f_avx2/controlbits.c
index ab32b1df..a86eea4f 100644
--- a/src/kem/classic_mceliece/pqclean_mceliece6960119f_avx2/controlbits.c
+++ b/src/kem/classic_mceliece/pqclean_mceliece6960119f_avx2/controlbits.c
@@ -1,3 +1,4 @@
+#define memset OQS_MEM_cleanse
/* This file is for implementing the Nassimi-Sahni algorithm */
/* See David Nassimi, Sartaj Sahni "Parallel algorithms to set up the Benes permutationnetwork" */
/* See also https://cr.yp.to/papers/controlbits-20200923.pdf */
diff --git a/src/kem/classic_mceliece/pqclean_mceliece6960119f_clean/controlbits.c b/src/kem/classic_mceliece/pqclean_mceliece6960119f_clean/controlbits.c
index ab32b1df..a86eea4f 100644
--- a/src/kem/classic_mceliece/pqclean_mceliece6960119f_clean/controlbits.c
+++ b/src/kem/classic_mceliece/pqclean_mceliece6960119f_clean/controlbits.c
@@ -1,3 +1,4 @@
+#define memset OQS_MEM_cleanse
/* This file is for implementing the Nassimi-Sahni algorithm */
/* See David Nassimi, Sartaj Sahni "Parallel algorithms to set up the Benes permutationnetwork" */
/* See also https://cr.yp.to/papers/controlbits-20200923.pdf */
diff --git a/src/kem/classic_mceliece/pqclean_mceliece8192128_avx2/controlbits.c b/src/kem/classic_mceliece/pqclean_mceliece8192128_avx2/controlbits.c
index ab32b1df..a86eea4f 100644
--- a/src/kem/classic_mceliece/pqclean_mceliece8192128_avx2/controlbits.c
+++ b/src/kem/classic_mceliece/pqclean_mceliece8192128_avx2/controlbits.c
@@ -1,3 +1,4 @@
+#define memset OQS_MEM_cleanse
/* This file is for implementing the Nassimi-Sahni algorithm */
/* See David Nassimi, Sartaj Sahni "Parallel algorithms to set up the Benes permutationnetwork" */
/* See also https://cr.yp.to/papers/controlbits-20200923.pdf */
diff --git a/src/kem/classic_mceliece/pqclean_mceliece8192128_clean/controlbits.c b/src/kem/classic_mceliece/pqclean_mceliece8192128_clean/controlbits.c
index ab32b1df..a86eea4f 100644
--- a/src/kem/classic_mceliece/pqclean_mceliece8192128_clean/controlbits.c
+++ b/src/kem/classic_mceliece/pqclean_mceliece8192128_clean/controlbits.c
@@ -1,3 +1,4 @@
+#define memset OQS_MEM_cleanse
/* This file is for implementing the Nassimi-Sahni algorithm */
/* See David Nassimi, Sartaj Sahni "Parallel algorithms to set up the Benes permutationnetwork" */
/* See also https://cr.yp.to/papers/controlbits-20200923.pdf */
diff --git a/src/kem/classic_mceliece/pqclean_mceliece8192128f_avx2/controlbits.c b/src/kem/classic_mceliece/pqclean_mceliece8192128f_avx2/controlbits.c
index ab32b1df..a86eea4f 100644
--- a/src/kem/classic_mceliece/pqclean_mceliece8192128f_avx2/controlbits.c
+++ b/src/kem/classic_mceliece/pqclean_mceliece8192128f_avx2/controlbits.c
@@ -1,3 +1,4 @@
+#define memset OQS_MEM_cleanse
/* This file is for implementing the Nassimi-Sahni algorithm */
/* See David Nassimi, Sartaj Sahni "Parallel algorithms to set up the Benes permutationnetwork" */
/* See also https://cr.yp.to/papers/controlbits-20200923.pdf */
diff --git a/src/kem/classic_mceliece/pqclean_mceliece8192128f_clean/controlbits.c b/src/kem/classic_mceliece/pqclean_mceliece8192128f_clean/controlbits.c
index ab32b1df..a86eea4f 100644
--- a/src/kem/classic_mceliece/pqclean_mceliece8192128f_clean/controlbits.c
+++ b/src/kem/classic_mceliece/pqclean_mceliece8192128f_clean/controlbits.c
@@ -1,3 +1,4 @@
+#define memset OQS_MEM_cleanse
/* This file is for implementing the Nassimi-Sahni algorithm */
/* See David Nassimi, Sartaj Sahni "Parallel algorithms to set up the Benes permutationnetwork" */
/* See also https://cr.yp.to/papers/controlbits-20200923.pdf */