Merge 14b7f1ead768acd7b1c60b5e138263f1c7442f79 into b5d3dac4ebdfbbc5de1f6ab9fc6a94c3fd47d13d

Signed-off-by: Aiden Fox Ivey <aiden@aidenfoxivey.com>

scripts/copy_from_upstream/copy_from_upstream.yml

@@ -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-classic-mceliese.patch]
+    pqclean-kyber-armneon-asan.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

scripts/copy_from_upstream/patches/pqclean-classic-mceliese.patch

@@ -1,180 +0,0 @@
-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 */

src/kem/classic_mceliece/pqclean_mceliece348864_avx2/controlbits.c

@@ -209,11 +209,11 @@ void controlbitsfrompermutation(unsigned char *out, const int16 *pi, long long w
     int i;
     unsigned char *ptr;
 
-    memset(temp, 0, (size_t)n * 2);
-    memset(pi_test, 0, (size_t)n);
+    OQS_MEM_cleanse(temp, 0, (size_t)n * 2);
+    OQS_MEM_cleanse(pi_test, 0, (size_t)n);
 
     while (1) {
-        memset(out, 0, (size_t)((((2 * w - 1)*n / 2) + 7) / 8));
+        OQS_MEM_cleanse(out, 0, (size_t)((((2 * w - 1)*n / 2) + 7) / 8));
         cbrecursion(out, 0, 1, pi, w, n, temp);
 
         // check for correctness

src/kem/classic_mceliece/pqclean_mceliece348864_clean/controlbits.c

@@ -209,11 +209,11 @@ void controlbitsfrompermutation(unsigned char *out, const int16 *pi, long long w
     int i;
     unsigned char *ptr;
 
-    memset(temp, 0, (size_t)n * 2);
-    memset(pi_test, 0, (size_t)n);
+    OQS_MEM_cleanse(temp, 0, (size_t)n * 2);
+    OQS_MEM_cleanse(pi_test, 0, (size_t)n);
 
     while (1) {
-        memset(out, 0, (size_t)((((2 * w - 1)*n / 2) + 7) / 8));
+        OQS_MEM_cleanse(out, 0, (size_t)((((2 * w - 1)*n / 2) + 7) / 8));
         cbrecursion(out, 0, 1, pi, w, n, temp);
 
         // check for correctness

src/kem/classic_mceliece/pqclean_mceliece348864f_avx2/controlbits.c

@@ -209,11 +209,11 @@ void controlbitsfrompermutation(unsigned char *out, const int16 *pi, long long w
     int i;
     unsigned char *ptr;
 
-    memset(temp, 0, (size_t)n * 2);
-    memset(pi_test, 0, (size_t)n);
+    OQS_MEM_cleanse(temp, 0, (size_t)n * 2);
+    OQS_MEM_cleanse(pi_test, 0, (size_t)n);
 
     while (1) {
-        memset(out, 0, (size_t)((((2 * w - 1)*n / 2) + 7) / 8));
+        OQS_MEM_cleanse(out, 0, (size_t)((((2 * w - 1)*n / 2) + 7) / 8));
         cbrecursion(out, 0, 1, pi, w, n, temp);
 
         // check for correctness

src/kem/classic_mceliece/pqclean_mceliece348864f_clean/controlbits.c

@@ -209,11 +209,11 @@ void controlbitsfrompermutation(unsigned char *out, const int16 *pi, long long w
     int i;
     unsigned char *ptr;
 
-    memset(temp, 0, (size_t)n * 2);
-    memset(pi_test, 0, (size_t)n);
+    OQS_MEM_cleanse(temp, 0, (size_t)n * 2);
+    OQS_MEM_cleanse(pi_test, 0, (size_t)n);
 
     while (1) {
-        memset(out, 0, (size_t)((((2 * w - 1)*n / 2) + 7) / 8));
+        OQS_MEM_cleanse(out, 0, (size_t)((((2 * w - 1)*n / 2) + 7) / 8));
         cbrecursion(out, 0, 1, pi, w, n, temp);
 
         // check for correctness

src/kem/classic_mceliece/pqclean_mceliece460896_avx2/controlbits.c

@@ -209,11 +209,11 @@ void controlbitsfrompermutation(unsigned char *out, const int16 *pi, long long w
     int i;
     unsigned char *ptr;
 
-    memset(temp, 0, (size_t)n * 2);
-    memset(pi_test, 0, (size_t)n);
+    OQS_MEM_cleanse(temp, 0, (size_t)n * 2);
+    OQS_MEM_cleanse(pi_test, 0, (size_t)n);
 
     while (1) {
-        memset(out, 0, (size_t)((((2 * w - 1)*n / 2) + 7) / 8));
+        OQS_MEM_cleanse(out, 0, (size_t)((((2 * w - 1)*n / 2) + 7) / 8));
         cbrecursion(out, 0, 1, pi, w, n, temp);
 
         // check for correctness

src/kem/classic_mceliece/pqclean_mceliece460896_clean/controlbits.c

@@ -209,11 +209,11 @@ void controlbitsfrompermutation(unsigned char *out, const int16 *pi, long long w
     int i;
     unsigned char *ptr;
 
-    memset(temp, 0, (size_t)n * 2);
-    memset(pi_test, 0, (size_t)n);
+    OQS_MEM_cleanse(temp, 0, (size_t)n * 2);
+    OQS_MEM_cleanse(pi_test, 0, (size_t)n);
 
     while (1) {
-        memset(out, 0, (size_t)((((2 * w - 1)*n / 2) + 7) / 8));
+        OQS_MEM_cleanse(out, 0, (size_t)((((2 * w - 1)*n / 2) + 7) / 8));
         cbrecursion(out, 0, 1, pi, w, n, temp);
 
         // check for correctness

src/kem/classic_mceliece/pqclean_mceliece460896f_avx2/controlbits.c

@@ -209,11 +209,11 @@ void controlbitsfrompermutation(unsigned char *out, const int16 *pi, long long w
     int i;
     unsigned char *ptr;
 
-    memset(temp, 0, (size_t)n * 2);
-    memset(pi_test, 0, (size_t)n);
+    OQS_MEM_cleanse(temp, 0, (size_t)n * 2);
+    OQS_MEM_cleanse(pi_test, 0, (size_t)n);
 
     while (1) {
-        memset(out, 0, (size_t)((((2 * w - 1)*n / 2) + 7) / 8));
+        OQS_MEM_cleanse(out, 0, (size_t)((((2 * w - 1)*n / 2) + 7) / 8));
         cbrecursion(out, 0, 1, pi, w, n, temp);
 
         // check for correctness

src/kem/classic_mceliece/pqclean_mceliece460896f_clean/controlbits.c

@@ -209,11 +209,11 @@ void controlbitsfrompermutation(unsigned char *out, const int16 *pi, long long w
     int i;
     unsigned char *ptr;
 
-    memset(temp, 0, (size_t)n * 2);
-    memset(pi_test, 0, (size_t)n);
+    OQS_MEM_cleanse(temp, 0, (size_t)n * 2);
+    OQS_MEM_cleanse(pi_test, 0, (size_t)n);
 
     while (1) {
-        memset(out, 0, (size_t)((((2 * w - 1)*n / 2) + 7) / 8));
+        OQS_MEM_cleanse(out, 0, (size_t)((((2 * w - 1)*n / 2) + 7) / 8));
         cbrecursion(out, 0, 1, pi, w, n, temp);
 
         // check for correctness

src/kem/classic_mceliece/pqclean_mceliece6688128_avx2/controlbits.c

@@ -209,11 +209,11 @@ void controlbitsfrompermutation(unsigned char *out, const int16 *pi, long long w
     int i;
     unsigned char *ptr;
 
-    memset(temp, 0, (size_t)n * 2);
-    memset(pi_test, 0, (size_t)n);
+    OQS_MEM_cleanse(temp, 0, (size_t)n * 2);
+    OQS_MEM_cleanse(pi_test, 0, (size_t)n);
 
     while (1) {
-        memset(out, 0, (size_t)((((2 * w - 1)*n / 2) + 7) / 8));
+        OQS_MEM_cleanse(out, 0, (size_t)((((2 * w - 1)*n / 2) + 7) / 8));
         cbrecursion(out, 0, 1, pi, w, n, temp);
 
         // check for correctness

src/kem/classic_mceliece/pqclean_mceliece6688128_clean/controlbits.c

@@ -209,11 +209,11 @@ void controlbitsfrompermutation(unsigned char *out, const int16 *pi, long long w
     int i;
     unsigned char *ptr;
 
-    memset(temp, 0, (size_t)n * 2);
-    memset(pi_test, 0, (size_t)n);
+    OQS_MEM_cleanse(temp, 0, (size_t)n * 2);
+    OQS_MEM_cleanse(pi_test, 0, (size_t)n);
 
     while (1) {
-        memset(out, 0, (size_t)((((2 * w - 1)*n / 2) + 7) / 8));
+        OQS_MEM_cleanse(out, 0, (size_t)((((2 * w - 1)*n / 2) + 7) / 8));
         cbrecursion(out, 0, 1, pi, w, n, temp);
 
         // check for correctness

src/kem/classic_mceliece/pqclean_mceliece6688128f_avx2/controlbits.c

@@ -209,11 +209,11 @@ void controlbitsfrompermutation(unsigned char *out, const int16 *pi, long long w
     int i;
     unsigned char *ptr;
 
-    memset(temp, 0, (size_t)n * 2);
-    memset(pi_test, 0, (size_t)n);
+    OQS_MEM_cleanse(temp, 0, (size_t)n * 2);
+    OQS_MEM_cleanse(pi_test, 0, (size_t)n);
 
     while (1) {
-        memset(out, 0, (size_t)((((2 * w - 1)*n / 2) + 7) / 8));
+        OQS_MEM_cleanse(out, 0, (size_t)((((2 * w - 1)*n / 2) + 7) / 8));
         cbrecursion(out, 0, 1, pi, w, n, temp);
 
         // check for correctness

src/kem/classic_mceliece/pqclean_mceliece6688128f_clean/controlbits.c

@@ -209,11 +209,11 @@ void controlbitsfrompermutation(unsigned char *out, const int16 *pi, long long w
     int i;
     unsigned char *ptr;
 
-    memset(temp, 0, (size_t)n * 2);
-    memset(pi_test, 0, (size_t)n);
+    OQS_MEM_cleanse(temp, 0, (size_t)n * 2);
+    OQS_MEM_cleanse(pi_test, 0, (size_t)n);
 
     while (1) {
-        memset(out, 0, (size_t)((((2 * w - 1)*n / 2) + 7) / 8));
+        OQS_MEM_cleanse(out, 0, (size_t)((((2 * w - 1)*n / 2) + 7) / 8));
         cbrecursion(out, 0, 1, pi, w, n, temp);
 
         // check for correctness

src/kem/classic_mceliece/pqclean_mceliece6960119_avx2/controlbits.c

@@ -209,11 +209,11 @@ void controlbitsfrompermutation(unsigned char *out, const int16 *pi, long long w
     int i;
     unsigned char *ptr;
 
-    memset(temp, 0, (size_t)n * 2);
-    memset(pi_test, 0, (size_t)n);
+    OQS_MEM_cleanse(temp, 0, (size_t)n * 2);
+    OQS_MEM_cleanse(pi_test, 0, (size_t)n);
 
     while (1) {
-        memset(out, 0, (size_t)((((2 * w - 1)*n / 2) + 7) / 8));
+        OQS_MEM_cleanse(out, 0, (size_t)((((2 * w - 1)*n / 2) + 7) / 8));
         cbrecursion(out, 0, 1, pi, w, n, temp);
 
         // check for correctness

src/kem/classic_mceliece/pqclean_mceliece6960119_clean/controlbits.c

@@ -209,11 +209,11 @@ void controlbitsfrompermutation(unsigned char *out, const int16 *pi, long long w
     int i;
     unsigned char *ptr;
 
-    memset(temp, 0, (size_t)n * 2);
-    memset(pi_test, 0, (size_t)n);
+    OQS_MEM_cleanse(temp, 0, (size_t)n * 2);
+    OQS_MEM_cleanse(pi_test, 0, (size_t)n);
 
     while (1) {
-        memset(out, 0, (size_t)((((2 * w - 1)*n / 2) + 7) / 8));
+        OQS_MEM_cleanse(out, 0, (size_t)((((2 * w - 1)*n / 2) + 7) / 8));
         cbrecursion(out, 0, 1, pi, w, n, temp);
 
         // check for correctness

src/kem/classic_mceliece/pqclean_mceliece6960119f_avx2/controlbits.c

@@ -209,11 +209,11 @@ void controlbitsfrompermutation(unsigned char *out, const int16 *pi, long long w
     int i;
     unsigned char *ptr;
 
-    memset(temp, 0, (size_t)n * 2);
-    memset(pi_test, 0, (size_t)n);
+    OQS_MEM_cleanse(temp, 0, (size_t)n * 2);
+    OQS_MEM_cleanse(pi_test, 0, (size_t)n);
 
     while (1) {
-        memset(out, 0, (size_t)((((2 * w - 1)*n / 2) + 7) / 8));
+        OQS_MEM_cleanse(out, 0, (size_t)((((2 * w - 1)*n / 2) + 7) / 8));
         cbrecursion(out, 0, 1, pi, w, n, temp);
 
         // check for correctness

src/kem/classic_mceliece/pqclean_mceliece6960119f_clean/controlbits.c

@@ -209,11 +209,11 @@ void controlbitsfrompermutation(unsigned char *out, const int16 *pi, long long w
     int i;
     unsigned char *ptr;
 
-    memset(temp, 0, (size_t)n * 2);
-    memset(pi_test, 0, (size_t)n);
+    OQS_MEM_cleanse(temp, 0, (size_t)n * 2);
+    OQS_MEM_cleanse(pi_test, 0, (size_t)n);
 
     while (1) {
-        memset(out, 0, (size_t)((((2 * w - 1)*n / 2) + 7) / 8));
+        OQS_MEM_cleanse(out, 0, (size_t)((((2 * w - 1)*n / 2) + 7) / 8));
         cbrecursion(out, 0, 1, pi, w, n, temp);
 
         // check for correctness

src/kem/classic_mceliece/pqclean_mceliece8192128_avx2/controlbits.c

@@ -209,11 +209,11 @@ void controlbitsfrompermutation(unsigned char *out, const int16 *pi, long long w
     int i;
     unsigned char *ptr;
 
-    memset(temp, 0, (size_t)n * 2);
-    memset(pi_test, 0, (size_t)n);
+    OQS_MEM_cleanse(temp, 0, (size_t)n * 2);
+    OQS_MEM_cleanse(pi_test, 0, (size_t)n);
 
     while (1) {
-        memset(out, 0, (size_t)((((2 * w - 1)*n / 2) + 7) / 8));
+        OQS_MEM_cleanse(out, 0, (size_t)((((2 * w - 1)*n / 2) + 7) / 8));
         cbrecursion(out, 0, 1, pi, w, n, temp);
 
         // check for correctness

src/kem/classic_mceliece/pqclean_mceliece8192128_clean/controlbits.c

@@ -209,11 +209,11 @@ void controlbitsfrompermutation(unsigned char *out, const int16 *pi, long long w
     int i;
     unsigned char *ptr;
 
-    memset(temp, 0, (size_t)n * 2);
-    memset(pi_test, 0, (size_t)n);
+    OQS_MEM_cleanse(temp, 0, (size_t)n * 2);
+    OQS_MEM_cleanse(pi_test, 0, (size_t)n);
 
     while (1) {
-        memset(out, 0, (size_t)((((2 * w - 1)*n / 2) + 7) / 8));
+        OQS_MEM_cleanse(out, 0, (size_t)((((2 * w - 1)*n / 2) + 7) / 8));
         cbrecursion(out, 0, 1, pi, w, n, temp);
 
         // check for correctness

src/kem/classic_mceliece/pqclean_mceliece8192128f_avx2/controlbits.c

@@ -209,11 +209,11 @@ void controlbitsfrompermutation(unsigned char *out, const int16 *pi, long long w
     int i;
     unsigned char *ptr;
 
-    memset(temp, 0, (size_t)n * 2);
-    memset(pi_test, 0, (size_t)n);
+    OQS_MEM_cleanse(temp, 0, (size_t)n * 2);
+    OQS_MEM_cleanse(pi_test, 0, (size_t)n);
 
     while (1) {
-        memset(out, 0, (size_t)((((2 * w - 1)*n / 2) + 7) / 8));
+        OQS_MEM_cleanse(out, 0, (size_t)((((2 * w - 1)*n / 2) + 7) / 8));
         cbrecursion(out, 0, 1, pi, w, n, temp);
 
         // check for correctness

src/kem/classic_mceliece/pqclean_mceliece8192128f_clean/controlbits.c

@@ -209,11 +209,11 @@ void controlbitsfrompermutation(unsigned char *out, const int16 *pi, long long w
     int i;
     unsigned char *ptr;
 
-    memset(temp, 0, (size_t)n * 2);
-    memset(pi_test, 0, (size_t)n);
+    OQS_MEM_cleanse(temp, 0, (size_t)n * 2);
+    OQS_MEM_cleanse(pi_test, 0, (size_t)n);
 
     while (1) {
-        memset(out, 0, (size_t)((((2 * w - 1)*n / 2) + 7) / 8));
+        OQS_MEM_cleanse(out, 0, (size_t)((((2 * w - 1)*n / 2) + 7) / 8));
         cbrecursion(out, 0, 1, pi, w, n, temp);
 
         // check for correctness