update sphincs to r3

src/sign/dilithium/sampling.c

@@ -1,46 +0,0 @@
-#include <stdint.h>
-#include <stddef.h>
-
-#include <stdio.h>
-#include <assert.h>
-
-// calculate number of bits used to encode 'v'
-static inline uint8_t bitlen8(uint8_t v) {
-	unsigned r = 8;
-	while (!((v >> (r-1)) & 1) && --r) {}
-	return r;
-}
-
-
-unsigned sampling_rej_eta(
-    int32_t *out,
-    size_t olen,
-    const uint8_t *in,
-    size_t isz,
-    int8_t maxv) {
-
-    const uint8_t maxv_log2 = bitlen8(maxv);
-    const int32_t maxv_h = maxv>>1;
-    const uint8_t mask = (1<<maxv_log2)-1;
-    size_t oid = 0, bid = 0, c;
-    uint32_t tmp;
-    uint8_t y;
-
-    while ((bid + 3 < isz) && (oid<olen)) {
-        tmp = (uint32_t)in[bid+0] << 0 |
-              (uint32_t)in[bid+1] << 8 |
-              (uint32_t)in[bid+2] << 16|
-              (uint32_t)in[bid+3] << 24;
-        do {
-            y = (tmp >> c) & mask;
-            if (y < maxv) {
-                out[oid++] = maxv_h - y;
-            }
-            c += maxv_log2;
-        } while ((c+maxv_log2 < 8*sizeof tmp) && (oid < olen));
-        bid += sizeof tmp;
-        c = 0;
-    }
-
-    return oid;
-}

src/sign/dilithium/sampling.h

@@ -1,8 +0,0 @@
-#include <stdint.h>
-
-unsigned int sampling_rej_eta(
-	int32_t *a,
-	unsigned int len,
-	const uint8_t *buf,
-	unsigned int buflen,
-	uint8_t maxv);

src/sign/sphincs/sphincs-sha256-128f-robust/avx2/api.h

@@ -10,7 +10,7 @@
 
 #define PQCLEAN_SPHINCSSHA256128FROBUST_AVX2_CRYPTO_SECRETKEYBYTES 64
 #define PQCLEAN_SPHINCSSHA256128FROBUST_AVX2_CRYPTO_PUBLICKEYBYTES 32
-#define PQCLEAN_SPHINCSSHA256128FROBUST_AVX2_CRYPTO_BYTES 16976
+#define PQCLEAN_SPHINCSSHA256128FROBUST_AVX2_CRYPTO_BYTES 17088
 #define PQCLEAN_SPHINCSSHA256128FROBUST_AVX2_CRYPTO_SEEDBYTES 48
 
 

src/sign/sphincs/sphincs-sha256-128f-robust/avx2/params.h

@@ -4,12 +4,12 @@
 /* Hash output length in bytes. */
 #define PQCLEAN_SPHINCSSHA256128FROBUST_AVX2_N 16
 /* Height of the hypertree. */
-#define PQCLEAN_SPHINCSSHA256128FROBUST_AVX2_FULL_HEIGHT 60
+#define PQCLEAN_SPHINCSSHA256128FROBUST_AVX2_FULL_HEIGHT 66
 /* Number of subtree layer. */
-#define PQCLEAN_SPHINCSSHA256128FROBUST_AVX2_D 20
+#define PQCLEAN_SPHINCSSHA256128FROBUST_AVX2_D 22
 /* FORS tree dimensions. */
-#define PQCLEAN_SPHINCSSHA256128FROBUST_AVX2_FORS_HEIGHT 9
+#define PQCLEAN_SPHINCSSHA256128FROBUST_AVX2_FORS_HEIGHT 6
-#define PQCLEAN_SPHINCSSHA256128FROBUST_AVX2_FORS_TREES 30
+#define PQCLEAN_SPHINCSSHA256128FROBUST_AVX2_FORS_TREES 33
 /* Winternitz parameter, */
 #define PQCLEAN_SPHINCSSHA256128FROBUST_AVX2_WOTS_W 16
 

src/sign/sphincs/sphincs-sha256-128f-robust/clean/api.h

@@ -10,7 +10,7 @@
 
 #define PQCLEAN_SPHINCSSHA256128FROBUST_CLEAN_CRYPTO_SECRETKEYBYTES 64
 #define PQCLEAN_SPHINCSSHA256128FROBUST_CLEAN_CRYPTO_PUBLICKEYBYTES 32
-#define PQCLEAN_SPHINCSSHA256128FROBUST_CLEAN_CRYPTO_BYTES 16976
+#define PQCLEAN_SPHINCSSHA256128FROBUST_CLEAN_CRYPTO_BYTES 17088
 #define PQCLEAN_SPHINCSSHA256128FROBUST_CLEAN_CRYPTO_SEEDBYTES 48
 
 

src/sign/sphincs/sphincs-sha256-128f-robust/clean/params.h

@@ -4,12 +4,12 @@
 /* Hash output length in bytes. */
 #define PQCLEAN_SPHINCSSHA256128FROBUST_CLEAN_N 16
 /* Height of the hypertree. */
-#define PQCLEAN_SPHINCSSHA256128FROBUST_CLEAN_FULL_HEIGHT 60
+#define PQCLEAN_SPHINCSSHA256128FROBUST_CLEAN_FULL_HEIGHT 66
 /* Number of subtree layer. */
-#define PQCLEAN_SPHINCSSHA256128FROBUST_CLEAN_D 20
+#define PQCLEAN_SPHINCSSHA256128FROBUST_CLEAN_D 22
 /* FORS tree dimensions. */
-#define PQCLEAN_SPHINCSSHA256128FROBUST_CLEAN_FORS_HEIGHT 9
+#define PQCLEAN_SPHINCSSHA256128FROBUST_CLEAN_FORS_HEIGHT 6
-#define PQCLEAN_SPHINCSSHA256128FROBUST_CLEAN_FORS_TREES 30
+#define PQCLEAN_SPHINCSSHA256128FROBUST_CLEAN_FORS_TREES 33
 /* Winternitz parameter, */
 #define PQCLEAN_SPHINCSSHA256128FROBUST_CLEAN_WOTS_W 16
 

src/sign/sphincs/sphincs-sha256-128f-simple/avx2/api.h

@@ -10,7 +10,7 @@
 
 #define PQCLEAN_SPHINCSSHA256128FSIMPLE_AVX2_CRYPTO_SECRETKEYBYTES 64
 #define PQCLEAN_SPHINCSSHA256128FSIMPLE_AVX2_CRYPTO_PUBLICKEYBYTES 32
-#define PQCLEAN_SPHINCSSHA256128FSIMPLE_AVX2_CRYPTO_BYTES 16976
+#define PQCLEAN_SPHINCSSHA256128FSIMPLE_AVX2_CRYPTO_BYTES 17088
 #define PQCLEAN_SPHINCSSHA256128FSIMPLE_AVX2_CRYPTO_SEEDBYTES 48
 
 

src/sign/sphincs/sphincs-sha256-128f-simple/avx2/params.h

@@ -4,12 +4,12 @@
 /* Hash output length in bytes. */
 #define PQCLEAN_SPHINCSSHA256128FSIMPLE_AVX2_N 16
 /* Height of the hypertree. */
-#define PQCLEAN_SPHINCSSHA256128FSIMPLE_AVX2_FULL_HEIGHT 60
+#define PQCLEAN_SPHINCSSHA256128FSIMPLE_AVX2_FULL_HEIGHT 66
 /* Number of subtree layer. */
-#define PQCLEAN_SPHINCSSHA256128FSIMPLE_AVX2_D 20
+#define PQCLEAN_SPHINCSSHA256128FSIMPLE_AVX2_D 22
 /* FORS tree dimensions. */
-#define PQCLEAN_SPHINCSSHA256128FSIMPLE_AVX2_FORS_HEIGHT 9
+#define PQCLEAN_SPHINCSSHA256128FSIMPLE_AVX2_FORS_HEIGHT 6
-#define PQCLEAN_SPHINCSSHA256128FSIMPLE_AVX2_FORS_TREES 30
+#define PQCLEAN_SPHINCSSHA256128FSIMPLE_AVX2_FORS_TREES 33
 /* Winternitz parameter, */
 #define PQCLEAN_SPHINCSSHA256128FSIMPLE_AVX2_WOTS_W 16
 

src/sign/sphincs/sphincs-sha256-128f-simple/clean/api.h

@@ -10,7 +10,7 @@
 
 #define PQCLEAN_SPHINCSSHA256128FSIMPLE_CLEAN_CRYPTO_SECRETKEYBYTES 64
 #define PQCLEAN_SPHINCSSHA256128FSIMPLE_CLEAN_CRYPTO_PUBLICKEYBYTES 32
-#define PQCLEAN_SPHINCSSHA256128FSIMPLE_CLEAN_CRYPTO_BYTES 16976
+#define PQCLEAN_SPHINCSSHA256128FSIMPLE_CLEAN_CRYPTO_BYTES 17088
 #define PQCLEAN_SPHINCSSHA256128FSIMPLE_CLEAN_CRYPTO_SEEDBYTES 48
 
 

src/sign/sphincs/sphincs-sha256-128f-simple/clean/params.h

@@ -4,12 +4,12 @@
 /* Hash output length in bytes. */
 #define PQCLEAN_SPHINCSSHA256128FSIMPLE_CLEAN_N 16
 /* Height of the hypertree. */
-#define PQCLEAN_SPHINCSSHA256128FSIMPLE_CLEAN_FULL_HEIGHT 60
+#define PQCLEAN_SPHINCSSHA256128FSIMPLE_CLEAN_FULL_HEIGHT 66
 /* Number of subtree layer. */
-#define PQCLEAN_SPHINCSSHA256128FSIMPLE_CLEAN_D 20
+#define PQCLEAN_SPHINCSSHA256128FSIMPLE_CLEAN_D 22
 /* FORS tree dimensions. */
-#define PQCLEAN_SPHINCSSHA256128FSIMPLE_CLEAN_FORS_HEIGHT 9
+#define PQCLEAN_SPHINCSSHA256128FSIMPLE_CLEAN_FORS_HEIGHT 6
-#define PQCLEAN_SPHINCSSHA256128FSIMPLE_CLEAN_FORS_TREES 30
+#define PQCLEAN_SPHINCSSHA256128FSIMPLE_CLEAN_FORS_TREES 33
 /* Winternitz parameter, */
 #define PQCLEAN_SPHINCSSHA256128FSIMPLE_CLEAN_WOTS_W 16
 

src/sign/sphincs/sphincs-sha256-128s-robust/avx2/api.h

@@ -10,7 +10,7 @@
 
 #define PQCLEAN_SPHINCSSHA256128SROBUST_AVX2_CRYPTO_SECRETKEYBYTES 64
 #define PQCLEAN_SPHINCSSHA256128SROBUST_AVX2_CRYPTO_PUBLICKEYBYTES 32
-#define PQCLEAN_SPHINCSSHA256128SROBUST_AVX2_CRYPTO_BYTES 8080
+#define PQCLEAN_SPHINCSSHA256128SROBUST_AVX2_CRYPTO_BYTES 7856
 #define PQCLEAN_SPHINCSSHA256128SROBUST_AVX2_CRYPTO_SEEDBYTES 48
 
 

src/sign/sphincs/sphincs-sha256-128s-robust/avx2/params.h

@@ -4,12 +4,12 @@
 /* Hash output length in bytes. */
 #define PQCLEAN_SPHINCSSHA256128SROBUST_AVX2_N 16
 /* Height of the hypertree. */
-#define PQCLEAN_SPHINCSSHA256128SROBUST_AVX2_FULL_HEIGHT 64
+#define PQCLEAN_SPHINCSSHA256128SROBUST_AVX2_FULL_HEIGHT 63
 /* Number of subtree layer. */
-#define PQCLEAN_SPHINCSSHA256128SROBUST_AVX2_D 8
+#define PQCLEAN_SPHINCSSHA256128SROBUST_AVX2_D 7
 /* FORS tree dimensions. */
-#define PQCLEAN_SPHINCSSHA256128SROBUST_AVX2_FORS_HEIGHT 15
+#define PQCLEAN_SPHINCSSHA256128SROBUST_AVX2_FORS_HEIGHT 12
-#define PQCLEAN_SPHINCSSHA256128SROBUST_AVX2_FORS_TREES 10
+#define PQCLEAN_SPHINCSSHA256128SROBUST_AVX2_FORS_TREES 14
 /* Winternitz parameter, */
 #define PQCLEAN_SPHINCSSHA256128SROBUST_AVX2_WOTS_W 16
 

src/sign/sphincs/sphincs-sha256-128s-robust/clean/api.h

@@ -10,7 +10,7 @@
 
 #define PQCLEAN_SPHINCSSHA256128SROBUST_CLEAN_CRYPTO_SECRETKEYBYTES 64
 #define PQCLEAN_SPHINCSSHA256128SROBUST_CLEAN_CRYPTO_PUBLICKEYBYTES 32
-#define PQCLEAN_SPHINCSSHA256128SROBUST_CLEAN_CRYPTO_BYTES 8080
+#define PQCLEAN_SPHINCSSHA256128SROBUST_CLEAN_CRYPTO_BYTES 7856
 #define PQCLEAN_SPHINCSSHA256128SROBUST_CLEAN_CRYPTO_SEEDBYTES 48
 
 

src/sign/sphincs/sphincs-sha256-128s-robust/clean/params.h

@@ -4,12 +4,12 @@
 /* Hash output length in bytes. */
 #define PQCLEAN_SPHINCSSHA256128SROBUST_CLEAN_N 16
 /* Height of the hypertree. */
-#define PQCLEAN_SPHINCSSHA256128SROBUST_CLEAN_FULL_HEIGHT 64
+#define PQCLEAN_SPHINCSSHA256128SROBUST_CLEAN_FULL_HEIGHT 63
 /* Number of subtree layer. */
-#define PQCLEAN_SPHINCSSHA256128SROBUST_CLEAN_D 8
+#define PQCLEAN_SPHINCSSHA256128SROBUST_CLEAN_D 7
 /* FORS tree dimensions. */
-#define PQCLEAN_SPHINCSSHA256128SROBUST_CLEAN_FORS_HEIGHT 15
+#define PQCLEAN_SPHINCSSHA256128SROBUST_CLEAN_FORS_HEIGHT 12
-#define PQCLEAN_SPHINCSSHA256128SROBUST_CLEAN_FORS_TREES 10
+#define PQCLEAN_SPHINCSSHA256128SROBUST_CLEAN_FORS_TREES 14
 /* Winternitz parameter, */
 #define PQCLEAN_SPHINCSSHA256128SROBUST_CLEAN_WOTS_W 16
 

src/sign/sphincs/sphincs-sha256-128s-simple/avx2/api.h

@@ -10,7 +10,7 @@
 
 #define PQCLEAN_SPHINCSSHA256128SSIMPLE_AVX2_CRYPTO_SECRETKEYBYTES 64
 #define PQCLEAN_SPHINCSSHA256128SSIMPLE_AVX2_CRYPTO_PUBLICKEYBYTES 32
-#define PQCLEAN_SPHINCSSHA256128SSIMPLE_AVX2_CRYPTO_BYTES 8080
+#define PQCLEAN_SPHINCSSHA256128SSIMPLE_AVX2_CRYPTO_BYTES 7856
 #define PQCLEAN_SPHINCSSHA256128SSIMPLE_AVX2_CRYPTO_SEEDBYTES 48
 
 

src/sign/sphincs/sphincs-sha256-128s-simple/avx2/params.h

@@ -4,12 +4,12 @@
 /* Hash output length in bytes. */
 #define PQCLEAN_SPHINCSSHA256128SSIMPLE_AVX2_N 16
 /* Height of the hypertree. */
-#define PQCLEAN_SPHINCSSHA256128SSIMPLE_AVX2_FULL_HEIGHT 64
+#define PQCLEAN_SPHINCSSHA256128SSIMPLE_AVX2_FULL_HEIGHT 63
 /* Number of subtree layer. */
-#define PQCLEAN_SPHINCSSHA256128SSIMPLE_AVX2_D 8
+#define PQCLEAN_SPHINCSSHA256128SSIMPLE_AVX2_D 7
 /* FORS tree dimensions. */
-#define PQCLEAN_SPHINCSSHA256128SSIMPLE_AVX2_FORS_HEIGHT 15
+#define PQCLEAN_SPHINCSSHA256128SSIMPLE_AVX2_FORS_HEIGHT 12
-#define PQCLEAN_SPHINCSSHA256128SSIMPLE_AVX2_FORS_TREES 10
+#define PQCLEAN_SPHINCSSHA256128SSIMPLE_AVX2_FORS_TREES 14
 /* Winternitz parameter, */
 #define PQCLEAN_SPHINCSSHA256128SSIMPLE_AVX2_WOTS_W 16
 

src/sign/sphincs/sphincs-sha256-128s-simple/clean/api.h

@@ -10,7 +10,7 @@
 
 #define PQCLEAN_SPHINCSSHA256128SSIMPLE_CLEAN_CRYPTO_SECRETKEYBYTES 64
 #define PQCLEAN_SPHINCSSHA256128SSIMPLE_CLEAN_CRYPTO_PUBLICKEYBYTES 32
-#define PQCLEAN_SPHINCSSHA256128SSIMPLE_CLEAN_CRYPTO_BYTES 8080
+#define PQCLEAN_SPHINCSSHA256128SSIMPLE_CLEAN_CRYPTO_BYTES 7856
 #define PQCLEAN_SPHINCSSHA256128SSIMPLE_CLEAN_CRYPTO_SEEDBYTES 48
 
 

src/sign/sphincs/sphincs-sha256-128s-simple/clean/params.h

@@ -4,12 +4,12 @@
 /* Hash output length in bytes. */
 #define PQCLEAN_SPHINCSSHA256128SSIMPLE_CLEAN_N 16
 /* Height of the hypertree. */
-#define PQCLEAN_SPHINCSSHA256128SSIMPLE_CLEAN_FULL_HEIGHT 64
+#define PQCLEAN_SPHINCSSHA256128SSIMPLE_CLEAN_FULL_HEIGHT 63
 /* Number of subtree layer. */
-#define PQCLEAN_SPHINCSSHA256128SSIMPLE_CLEAN_D 8
+#define PQCLEAN_SPHINCSSHA256128SSIMPLE_CLEAN_D 7
 /* FORS tree dimensions. */
-#define PQCLEAN_SPHINCSSHA256128SSIMPLE_CLEAN_FORS_HEIGHT 15
+#define PQCLEAN_SPHINCSSHA256128SSIMPLE_CLEAN_FORS_HEIGHT 12
-#define PQCLEAN_SPHINCSSHA256128SSIMPLE_CLEAN_FORS_TREES 10
+#define PQCLEAN_SPHINCSSHA256128SSIMPLE_CLEAN_FORS_TREES 14
 /* Winternitz parameter, */
 #define PQCLEAN_SPHINCSSHA256128SSIMPLE_CLEAN_WOTS_W 16
 

src/sign/sphincs/sphincs-sha256-192s-robust/avx2/api.h

@@ -10,7 +10,7 @@
 
 #define PQCLEAN_SPHINCSSHA256192SROBUST_AVX2_CRYPTO_SECRETKEYBYTES 96
 #define PQCLEAN_SPHINCSSHA256192SROBUST_AVX2_CRYPTO_PUBLICKEYBYTES 48
-#define PQCLEAN_SPHINCSSHA256192SROBUST_AVX2_CRYPTO_BYTES 17064
+#define PQCLEAN_SPHINCSSHA256192SROBUST_AVX2_CRYPTO_BYTES 16224
 #define PQCLEAN_SPHINCSSHA256192SROBUST_AVX2_CRYPTO_SEEDBYTES 72
 
 

src/sign/sphincs/sphincs-sha256-192s-robust/avx2/params.h

@@ -4,12 +4,12 @@
 /* Hash output length in bytes. */
 #define PQCLEAN_SPHINCSSHA256192SROBUST_AVX2_N 24
 /* Height of the hypertree. */
-#define PQCLEAN_SPHINCSSHA256192SROBUST_AVX2_FULL_HEIGHT 64
+#define PQCLEAN_SPHINCSSHA256192SROBUST_AVX2_FULL_HEIGHT 63
 /* Number of subtree layer. */
-#define PQCLEAN_SPHINCSSHA256192SROBUST_AVX2_D 8
+#define PQCLEAN_SPHINCSSHA256192SROBUST_AVX2_D 7
 /* FORS tree dimensions. */
-#define PQCLEAN_SPHINCSSHA256192SROBUST_AVX2_FORS_HEIGHT 16
+#define PQCLEAN_SPHINCSSHA256192SROBUST_AVX2_FORS_HEIGHT 14
-#define PQCLEAN_SPHINCSSHA256192SROBUST_AVX2_FORS_TREES 14
+#define PQCLEAN_SPHINCSSHA256192SROBUST_AVX2_FORS_TREES 17
 /* Winternitz parameter, */
 #define PQCLEAN_SPHINCSSHA256192SROBUST_AVX2_WOTS_W 16
 

src/sign/sphincs/sphincs-sha256-192s-robust/clean/api.h

@@ -10,7 +10,7 @@
 
 #define PQCLEAN_SPHINCSSHA256192SROBUST_CLEAN_CRYPTO_SECRETKEYBYTES 96
 #define PQCLEAN_SPHINCSSHA256192SROBUST_CLEAN_CRYPTO_PUBLICKEYBYTES 48
-#define PQCLEAN_SPHINCSSHA256192SROBUST_CLEAN_CRYPTO_BYTES 17064
+#define PQCLEAN_SPHINCSSHA256192SROBUST_CLEAN_CRYPTO_BYTES 16224
 #define PQCLEAN_SPHINCSSHA256192SROBUST_CLEAN_CRYPTO_SEEDBYTES 72
 
 

src/sign/sphincs/sphincs-sha256-192s-robust/clean/params.h

@@ -4,12 +4,12 @@
 /* Hash output length in bytes. */
 #define PQCLEAN_SPHINCSSHA256192SROBUST_CLEAN_N 24
 /* Height of the hypertree. */
-#define PQCLEAN_SPHINCSSHA256192SROBUST_CLEAN_FULL_HEIGHT 64
+#define PQCLEAN_SPHINCSSHA256192SROBUST_CLEAN_FULL_HEIGHT 63
 /* Number of subtree layer. */
-#define PQCLEAN_SPHINCSSHA256192SROBUST_CLEAN_D 8
+#define PQCLEAN_SPHINCSSHA256192SROBUST_CLEAN_D 7
 /* FORS tree dimensions. */
-#define PQCLEAN_SPHINCSSHA256192SROBUST_CLEAN_FORS_HEIGHT 16
+#define PQCLEAN_SPHINCSSHA256192SROBUST_CLEAN_FORS_HEIGHT 14
-#define PQCLEAN_SPHINCSSHA256192SROBUST_CLEAN_FORS_TREES 14
+#define PQCLEAN_SPHINCSSHA256192SROBUST_CLEAN_FORS_TREES 17
 /* Winternitz parameter, */
 #define PQCLEAN_SPHINCSSHA256192SROBUST_CLEAN_WOTS_W 16
 

src/sign/sphincs/sphincs-sha256-192s-simple/avx2/api.h

@@ -10,7 +10,7 @@
 
 #define PQCLEAN_SPHINCSSHA256192SSIMPLE_AVX2_CRYPTO_SECRETKEYBYTES 96
 #define PQCLEAN_SPHINCSSHA256192SSIMPLE_AVX2_CRYPTO_PUBLICKEYBYTES 48
-#define PQCLEAN_SPHINCSSHA256192SSIMPLE_AVX2_CRYPTO_BYTES 17064
+#define PQCLEAN_SPHINCSSHA256192SSIMPLE_AVX2_CRYPTO_BYTES 16224
 #define PQCLEAN_SPHINCSSHA256192SSIMPLE_AVX2_CRYPTO_SEEDBYTES 72
 
 

src/sign/sphincs/sphincs-sha256-192s-simple/avx2/params.h

@@ -4,12 +4,12 @@
 /* Hash output length in bytes. */
 #define PQCLEAN_SPHINCSSHA256192SSIMPLE_AVX2_N 24
 /* Height of the hypertree. */
-#define PQCLEAN_SPHINCSSHA256192SSIMPLE_AVX2_FULL_HEIGHT 64
+#define PQCLEAN_SPHINCSSHA256192SSIMPLE_AVX2_FULL_HEIGHT 63
 /* Number of subtree layer. */
-#define PQCLEAN_SPHINCSSHA256192SSIMPLE_AVX2_D 8
+#define PQCLEAN_SPHINCSSHA256192SSIMPLE_AVX2_D 7
 /* FORS tree dimensions. */
-#define PQCLEAN_SPHINCSSHA256192SSIMPLE_AVX2_FORS_HEIGHT 16
+#define PQCLEAN_SPHINCSSHA256192SSIMPLE_AVX2_FORS_HEIGHT 14
-#define PQCLEAN_SPHINCSSHA256192SSIMPLE_AVX2_FORS_TREES 14
+#define PQCLEAN_SPHINCSSHA256192SSIMPLE_AVX2_FORS_TREES 17
 /* Winternitz parameter, */
 #define PQCLEAN_SPHINCSSHA256192SSIMPLE_AVX2_WOTS_W 16
 

src/sign/sphincs/sphincs-sha256-192s-simple/clean/api.h

@@ -10,7 +10,7 @@
 
 #define PQCLEAN_SPHINCSSHA256192SSIMPLE_CLEAN_CRYPTO_SECRETKEYBYTES 96
 #define PQCLEAN_SPHINCSSHA256192SSIMPLE_CLEAN_CRYPTO_PUBLICKEYBYTES 48
-#define PQCLEAN_SPHINCSSHA256192SSIMPLE_CLEAN_CRYPTO_BYTES 17064
+#define PQCLEAN_SPHINCSSHA256192SSIMPLE_CLEAN_CRYPTO_BYTES 16224
 #define PQCLEAN_SPHINCSSHA256192SSIMPLE_CLEAN_CRYPTO_SEEDBYTES 72
 
 

src/sign/sphincs/sphincs-sha256-192s-simple/clean/params.h

@@ -4,12 +4,12 @@
 /* Hash output length in bytes. */
 #define PQCLEAN_SPHINCSSHA256192SSIMPLE_CLEAN_N 24
 /* Height of the hypertree. */
-#define PQCLEAN_SPHINCSSHA256192SSIMPLE_CLEAN_FULL_HEIGHT 64
+#define PQCLEAN_SPHINCSSHA256192SSIMPLE_CLEAN_FULL_HEIGHT 63
 /* Number of subtree layer. */
-#define PQCLEAN_SPHINCSSHA256192SSIMPLE_CLEAN_D 8
+#define PQCLEAN_SPHINCSSHA256192SSIMPLE_CLEAN_D 7
 /* FORS tree dimensions. */
-#define PQCLEAN_SPHINCSSHA256192SSIMPLE_CLEAN_FORS_HEIGHT 16
+#define PQCLEAN_SPHINCSSHA256192SSIMPLE_CLEAN_FORS_HEIGHT 14
-#define PQCLEAN_SPHINCSSHA256192SSIMPLE_CLEAN_FORS_TREES 14
+#define PQCLEAN_SPHINCSSHA256192SSIMPLE_CLEAN_FORS_TREES 17
 /* Winternitz parameter, */
 #define PQCLEAN_SPHINCSSHA256192SSIMPLE_CLEAN_WOTS_W 16
 

src/sign/sphincs/sphincs-sha256-256f-robust/avx2/api.h

@@ -10,7 +10,7 @@
 
 #define PQCLEAN_SPHINCSSHA256256FROBUST_AVX2_CRYPTO_SECRETKEYBYTES 128
 #define PQCLEAN_SPHINCSSHA256256FROBUST_AVX2_CRYPTO_PUBLICKEYBYTES 64
-#define PQCLEAN_SPHINCSSHA256256FROBUST_AVX2_CRYPTO_BYTES 49216
+#define PQCLEAN_SPHINCSSHA256256FROBUST_AVX2_CRYPTO_BYTES 49856
 #define PQCLEAN_SPHINCSSHA256256FROBUST_AVX2_CRYPTO_SEEDBYTES 96
 
 

src/sign/sphincs/sphincs-sha256-256f-robust/avx2/params.h

@@ -8,8 +8,8 @@
 /* Number of subtree layer. */
 #define PQCLEAN_SPHINCSSHA256256FROBUST_AVX2_D 17
 /* FORS tree dimensions. */
-#define PQCLEAN_SPHINCSSHA256256FROBUST_AVX2_FORS_HEIGHT 10
+#define PQCLEAN_SPHINCSSHA256256FROBUST_AVX2_FORS_HEIGHT 9
-#define PQCLEAN_SPHINCSSHA256256FROBUST_AVX2_FORS_TREES 30
+#define PQCLEAN_SPHINCSSHA256256FROBUST_AVX2_FORS_TREES 35
 /* Winternitz parameter, */
 #define PQCLEAN_SPHINCSSHA256256FROBUST_AVX2_WOTS_W 16
 

src/sign/sphincs/sphincs-sha256-256f-robust/clean/api.h

@@ -10,7 +10,7 @@
 
 #define PQCLEAN_SPHINCSSHA256256FROBUST_CLEAN_CRYPTO_SECRETKEYBYTES 128
 #define PQCLEAN_SPHINCSSHA256256FROBUST_CLEAN_CRYPTO_PUBLICKEYBYTES 64
-#define PQCLEAN_SPHINCSSHA256256FROBUST_CLEAN_CRYPTO_BYTES 49216
+#define PQCLEAN_SPHINCSSHA256256FROBUST_CLEAN_CRYPTO_BYTES 49856
 #define PQCLEAN_SPHINCSSHA256256FROBUST_CLEAN_CRYPTO_SEEDBYTES 96
 
 

src/sign/sphincs/sphincs-sha256-256f-robust/clean/params.h

@@ -8,8 +8,8 @@
 /* Number of subtree layer. */
 #define PQCLEAN_SPHINCSSHA256256FROBUST_CLEAN_D 17
 /* FORS tree dimensions. */
-#define PQCLEAN_SPHINCSSHA256256FROBUST_CLEAN_FORS_HEIGHT 10
+#define PQCLEAN_SPHINCSSHA256256FROBUST_CLEAN_FORS_HEIGHT 9
-#define PQCLEAN_SPHINCSSHA256256FROBUST_CLEAN_FORS_TREES 30
+#define PQCLEAN_SPHINCSSHA256256FROBUST_CLEAN_FORS_TREES 35
 /* Winternitz parameter, */
 #define PQCLEAN_SPHINCSSHA256256FROBUST_CLEAN_WOTS_W 16
 

src/sign/sphincs/sphincs-sha256-256f-simple/avx2/api.h

@@ -10,7 +10,7 @@
 
 #define PQCLEAN_SPHINCSSHA256256FSIMPLE_AVX2_CRYPTO_SECRETKEYBYTES 128
 #define PQCLEAN_SPHINCSSHA256256FSIMPLE_AVX2_CRYPTO_PUBLICKEYBYTES 64
-#define PQCLEAN_SPHINCSSHA256256FSIMPLE_AVX2_CRYPTO_BYTES 49216
+#define PQCLEAN_SPHINCSSHA256256FSIMPLE_AVX2_CRYPTO_BYTES 49856
 #define PQCLEAN_SPHINCSSHA256256FSIMPLE_AVX2_CRYPTO_SEEDBYTES 96
 
 

src/sign/sphincs/sphincs-sha256-256f-simple/avx2/params.h

@@ -8,8 +8,8 @@
 /* Number of subtree layer. */
 #define PQCLEAN_SPHINCSSHA256256FSIMPLE_AVX2_D 17
 /* FORS tree dimensions. */
-#define PQCLEAN_SPHINCSSHA256256FSIMPLE_AVX2_FORS_HEIGHT 10
+#define PQCLEAN_SPHINCSSHA256256FSIMPLE_AVX2_FORS_HEIGHT 9
-#define PQCLEAN_SPHINCSSHA256256FSIMPLE_AVX2_FORS_TREES 30
+#define PQCLEAN_SPHINCSSHA256256FSIMPLE_AVX2_FORS_TREES 35
 /* Winternitz parameter, */
 #define PQCLEAN_SPHINCSSHA256256FSIMPLE_AVX2_WOTS_W 16
 

src/sign/sphincs/sphincs-sha256-256f-simple/clean/api.h

@@ -10,7 +10,7 @@
 
 #define PQCLEAN_SPHINCSSHA256256FSIMPLE_CLEAN_CRYPTO_SECRETKEYBYTES 128
 #define PQCLEAN_SPHINCSSHA256256FSIMPLE_CLEAN_CRYPTO_PUBLICKEYBYTES 64
-#define PQCLEAN_SPHINCSSHA256256FSIMPLE_CLEAN_CRYPTO_BYTES 49216
+#define PQCLEAN_SPHINCSSHA256256FSIMPLE_CLEAN_CRYPTO_BYTES 49856
 #define PQCLEAN_SPHINCSSHA256256FSIMPLE_CLEAN_CRYPTO_SEEDBYTES 96
 
 

src/sign/sphincs/sphincs-sha256-256f-simple/clean/params.h

@@ -8,8 +8,8 @@
 /* Number of subtree layer. */
 #define PQCLEAN_SPHINCSSHA256256FSIMPLE_CLEAN_D 17
 /* FORS tree dimensions. */
-#define PQCLEAN_SPHINCSSHA256256FSIMPLE_CLEAN_FORS_HEIGHT 10
+#define PQCLEAN_SPHINCSSHA256256FSIMPLE_CLEAN_FORS_HEIGHT 9
-#define PQCLEAN_SPHINCSSHA256256FSIMPLE_CLEAN_FORS_TREES 30
+#define PQCLEAN_SPHINCSSHA256256FSIMPLE_CLEAN_FORS_TREES 35
 /* Winternitz parameter, */
 #define PQCLEAN_SPHINCSSHA256256FSIMPLE_CLEAN_WOTS_W 16
 

src/sign/sphincs/sphincs-shake256-128f-robust/avx2/api.h

@@ -10,7 +10,7 @@
 
 #define PQCLEAN_SPHINCSSHAKE256128FROBUST_AVX2_CRYPTO_SECRETKEYBYTES 64
 #define PQCLEAN_SPHINCSSHAKE256128FROBUST_AVX2_CRYPTO_PUBLICKEYBYTES 32
-#define PQCLEAN_SPHINCSSHAKE256128FROBUST_AVX2_CRYPTO_BYTES 16976
+#define PQCLEAN_SPHINCSSHAKE256128FROBUST_AVX2_CRYPTO_BYTES 17088
 #define PQCLEAN_SPHINCSSHAKE256128FROBUST_AVX2_CRYPTO_SEEDBYTES 48
 
 

src/sign/sphincs/sphincs-shake256-128f-robust/avx2/params.h

@@ -4,12 +4,12 @@
 /* Hash output length in bytes. */
 #define PQCLEAN_SPHINCSSHAKE256128FROBUST_AVX2_N 16
 /* Height of the hypertree. */
-#define PQCLEAN_SPHINCSSHAKE256128FROBUST_AVX2_FULL_HEIGHT 60
+#define PQCLEAN_SPHINCSSHAKE256128FROBUST_AVX2_FULL_HEIGHT 66
 /* Number of subtree layer. */
-#define PQCLEAN_SPHINCSSHAKE256128FROBUST_AVX2_D 20
+#define PQCLEAN_SPHINCSSHAKE256128FROBUST_AVX2_D 22
 /* FORS tree dimensions. */
-#define PQCLEAN_SPHINCSSHAKE256128FROBUST_AVX2_FORS_HEIGHT 9
+#define PQCLEAN_SPHINCSSHAKE256128FROBUST_AVX2_FORS_HEIGHT 6
-#define PQCLEAN_SPHINCSSHAKE256128FROBUST_AVX2_FORS_TREES 30
+#define PQCLEAN_SPHINCSSHAKE256128FROBUST_AVX2_FORS_TREES 33
 /* Winternitz parameter, */
 #define PQCLEAN_SPHINCSSHAKE256128FROBUST_AVX2_WOTS_W 16
 

src/sign/sphincs/sphincs-shake256-128f-robust/clean/api.h

@@ -10,7 +10,7 @@
 
 #define PQCLEAN_SPHINCSSHAKE256128FROBUST_CLEAN_CRYPTO_SECRETKEYBYTES 64
 #define PQCLEAN_SPHINCSSHAKE256128FROBUST_CLEAN_CRYPTO_PUBLICKEYBYTES 32
-#define PQCLEAN_SPHINCSSHAKE256128FROBUST_CLEAN_CRYPTO_BYTES 16976
+#define PQCLEAN_SPHINCSSHAKE256128FROBUST_CLEAN_CRYPTO_BYTES 17088
 #define PQCLEAN_SPHINCSSHAKE256128FROBUST_CLEAN_CRYPTO_SEEDBYTES 48
 
 

src/sign/sphincs/sphincs-shake256-128f-robust/clean/params.h

@@ -4,12 +4,12 @@
 /* Hash output length in bytes. */
 #define PQCLEAN_SPHINCSSHAKE256128FROBUST_CLEAN_N 16
 /* Height of the hypertree. */
-#define PQCLEAN_SPHINCSSHAKE256128FROBUST_CLEAN_FULL_HEIGHT 60
+#define PQCLEAN_SPHINCSSHAKE256128FROBUST_CLEAN_FULL_HEIGHT 66
 /* Number of subtree layer. */
-#define PQCLEAN_SPHINCSSHAKE256128FROBUST_CLEAN_D 20
+#define PQCLEAN_SPHINCSSHAKE256128FROBUST_CLEAN_D 22
 /* FORS tree dimensions. */
-#define PQCLEAN_SPHINCSSHAKE256128FROBUST_CLEAN_FORS_HEIGHT 9
+#define PQCLEAN_SPHINCSSHAKE256128FROBUST_CLEAN_FORS_HEIGHT 6
-#define PQCLEAN_SPHINCSSHAKE256128FROBUST_CLEAN_FORS_TREES 30
+#define PQCLEAN_SPHINCSSHAKE256128FROBUST_CLEAN_FORS_TREES 33
 /* Winternitz parameter, */
 #define PQCLEAN_SPHINCSSHAKE256128FROBUST_CLEAN_WOTS_W 16
 

src/sign/sphincs/sphincs-shake256-128f-simple/avx2/api.h

@@ -10,7 +10,7 @@
 
 #define PQCLEAN_SPHINCSSHAKE256128FSIMPLE_AVX2_CRYPTO_SECRETKEYBYTES 64
 #define PQCLEAN_SPHINCSSHAKE256128FSIMPLE_AVX2_CRYPTO_PUBLICKEYBYTES 32
-#define PQCLEAN_SPHINCSSHAKE256128FSIMPLE_AVX2_CRYPTO_BYTES 16976
+#define PQCLEAN_SPHINCSSHAKE256128FSIMPLE_AVX2_CRYPTO_BYTES 17088
 #define PQCLEAN_SPHINCSSHAKE256128FSIMPLE_AVX2_CRYPTO_SEEDBYTES 48
 
 

src/sign/sphincs/sphincs-shake256-128f-simple/avx2/params.h

@@ -4,12 +4,12 @@
 /* Hash output length in bytes. */
 #define PQCLEAN_SPHINCSSHAKE256128FSIMPLE_AVX2_N 16
 /* Height of the hypertree. */
-#define PQCLEAN_SPHINCSSHAKE256128FSIMPLE_AVX2_FULL_HEIGHT 60
+#define PQCLEAN_SPHINCSSHAKE256128FSIMPLE_AVX2_FULL_HEIGHT 66
 /* Number of subtree layer. */
-#define PQCLEAN_SPHINCSSHAKE256128FSIMPLE_AVX2_D 20
+#define PQCLEAN_SPHINCSSHAKE256128FSIMPLE_AVX2_D 22
 /* FORS tree dimensions. */
-#define PQCLEAN_SPHINCSSHAKE256128FSIMPLE_AVX2_FORS_HEIGHT 9
+#define PQCLEAN_SPHINCSSHAKE256128FSIMPLE_AVX2_FORS_HEIGHT 6
-#define PQCLEAN_SPHINCSSHAKE256128FSIMPLE_AVX2_FORS_TREES 30
+#define PQCLEAN_SPHINCSSHAKE256128FSIMPLE_AVX2_FORS_TREES 33
 /* Winternitz parameter, */
 #define PQCLEAN_SPHINCSSHAKE256128FSIMPLE_AVX2_WOTS_W 16
 

src/sign/sphincs/sphincs-shake256-128f-simple/clean/api.h

@@ -10,7 +10,7 @@
 
 #define PQCLEAN_SPHINCSSHAKE256128FSIMPLE_CLEAN_CRYPTO_SECRETKEYBYTES 64
 #define PQCLEAN_SPHINCSSHAKE256128FSIMPLE_CLEAN_CRYPTO_PUBLICKEYBYTES 32
-#define PQCLEAN_SPHINCSSHAKE256128FSIMPLE_CLEAN_CRYPTO_BYTES 16976
+#define PQCLEAN_SPHINCSSHAKE256128FSIMPLE_CLEAN_CRYPTO_BYTES 17088
 #define PQCLEAN_SPHINCSSHAKE256128FSIMPLE_CLEAN_CRYPTO_SEEDBYTES 48
 
 

src/sign/sphincs/sphincs-shake256-128f-simple/clean/params.h

@@ -4,12 +4,12 @@
 /* Hash output length in bytes. */
 #define PQCLEAN_SPHINCSSHAKE256128FSIMPLE_CLEAN_N 16
 /* Height of the hypertree. */
-#define PQCLEAN_SPHINCSSHAKE256128FSIMPLE_CLEAN_FULL_HEIGHT 60
+#define PQCLEAN_SPHINCSSHAKE256128FSIMPLE_CLEAN_FULL_HEIGHT 66
 /* Number of subtree layer. */
-#define PQCLEAN_SPHINCSSHAKE256128FSIMPLE_CLEAN_D 20
+#define PQCLEAN_SPHINCSSHAKE256128FSIMPLE_CLEAN_D 22
 /* FORS tree dimensions. */
-#define PQCLEAN_SPHINCSSHAKE256128FSIMPLE_CLEAN_FORS_HEIGHT 9
+#define PQCLEAN_SPHINCSSHAKE256128FSIMPLE_CLEAN_FORS_HEIGHT 6
-#define PQCLEAN_SPHINCSSHAKE256128FSIMPLE_CLEAN_FORS_TREES 30
+#define PQCLEAN_SPHINCSSHAKE256128FSIMPLE_CLEAN_FORS_TREES 33
 /* Winternitz parameter, */
 #define PQCLEAN_SPHINCSSHAKE256128FSIMPLE_CLEAN_WOTS_W 16
 

src/sign/sphincs/sphincs-shake256-128s-robust/avx2/api.h

@@ -10,7 +10,7 @@
 
 #define PQCLEAN_SPHINCSSHAKE256128SROBUST_AVX2_CRYPTO_SECRETKEYBYTES 64
 #define PQCLEAN_SPHINCSSHAKE256128SROBUST_AVX2_CRYPTO_PUBLICKEYBYTES 32
-#define PQCLEAN_SPHINCSSHAKE256128SROBUST_AVX2_CRYPTO_BYTES 8080
+#define PQCLEAN_SPHINCSSHAKE256128SROBUST_AVX2_CRYPTO_BYTES 7856
 #define PQCLEAN_SPHINCSSHAKE256128SROBUST_AVX2_CRYPTO_SEEDBYTES 48
 
 

src/sign/sphincs/sphincs-shake256-128s-robust/avx2/params.h

@@ -4,12 +4,12 @@
 /* Hash output length in bytes. */
 #define PQCLEAN_SPHINCSSHAKE256128SROBUST_AVX2_N 16
 /* Height of the hypertree. */
-#define PQCLEAN_SPHINCSSHAKE256128SROBUST_AVX2_FULL_HEIGHT 64
+#define PQCLEAN_SPHINCSSHAKE256128SROBUST_AVX2_FULL_HEIGHT 63
 /* Number of subtree layer. */
-#define PQCLEAN_SPHINCSSHAKE256128SROBUST_AVX2_D 8
+#define PQCLEAN_SPHINCSSHAKE256128SROBUST_AVX2_D 7
 /* FORS tree dimensions. */
-#define PQCLEAN_SPHINCSSHAKE256128SROBUST_AVX2_FORS_HEIGHT 15
+#define PQCLEAN_SPHINCSSHAKE256128SROBUST_AVX2_FORS_HEIGHT 12
-#define PQCLEAN_SPHINCSSHAKE256128SROBUST_AVX2_FORS_TREES 10
+#define PQCLEAN_SPHINCSSHAKE256128SROBUST_AVX2_FORS_TREES 14
 /* Winternitz parameter, */
 #define PQCLEAN_SPHINCSSHAKE256128SROBUST_AVX2_WOTS_W 16
 

src/sign/sphincs/sphincs-shake256-128s-robust/clean/api.h

@@ -10,7 +10,7 @@
 
 #define PQCLEAN_SPHINCSSHAKE256128SROBUST_CLEAN_CRYPTO_SECRETKEYBYTES 64
 #define PQCLEAN_SPHINCSSHAKE256128SROBUST_CLEAN_CRYPTO_PUBLICKEYBYTES 32
-#define PQCLEAN_SPHINCSSHAKE256128SROBUST_CLEAN_CRYPTO_BYTES 8080
+#define PQCLEAN_SPHINCSSHAKE256128SROBUST_CLEAN_CRYPTO_BYTES 7856
 #define PQCLEAN_SPHINCSSHAKE256128SROBUST_CLEAN_CRYPTO_SEEDBYTES 48
 
 

src/sign/sphincs/sphincs-shake256-128s-robust/clean/params.h

@@ -4,12 +4,12 @@
 /* Hash output length in bytes. */
 #define PQCLEAN_SPHINCSSHAKE256128SROBUST_CLEAN_N 16
 /* Height of the hypertree. */
-#define PQCLEAN_SPHINCSSHAKE256128SROBUST_CLEAN_FULL_HEIGHT 64
+#define PQCLEAN_SPHINCSSHAKE256128SROBUST_CLEAN_FULL_HEIGHT 63
 /* Number of subtree layer. */
-#define PQCLEAN_SPHINCSSHAKE256128SROBUST_CLEAN_D 8
+#define PQCLEAN_SPHINCSSHAKE256128SROBUST_CLEAN_D 7
 /* FORS tree dimensions. */
-#define PQCLEAN_SPHINCSSHAKE256128SROBUST_CLEAN_FORS_HEIGHT 15
+#define PQCLEAN_SPHINCSSHAKE256128SROBUST_CLEAN_FORS_HEIGHT 12
-#define PQCLEAN_SPHINCSSHAKE256128SROBUST_CLEAN_FORS_TREES 10
+#define PQCLEAN_SPHINCSSHAKE256128SROBUST_CLEAN_FORS_TREES 14
 /* Winternitz parameter, */
 #define PQCLEAN_SPHINCSSHAKE256128SROBUST_CLEAN_WOTS_W 16
 

src/sign/sphincs/sphincs-shake256-128s-simple/avx2/api.h

@@ -10,7 +10,7 @@
 
 #define PQCLEAN_SPHINCSSHAKE256128SSIMPLE_AVX2_CRYPTO_SECRETKEYBYTES 64
 #define PQCLEAN_SPHINCSSHAKE256128SSIMPLE_AVX2_CRYPTO_PUBLICKEYBYTES 32
-#define PQCLEAN_SPHINCSSHAKE256128SSIMPLE_AVX2_CRYPTO_BYTES 8080
+#define PQCLEAN_SPHINCSSHAKE256128SSIMPLE_AVX2_CRYPTO_BYTES 7856
 #define PQCLEAN_SPHINCSSHAKE256128SSIMPLE_AVX2_CRYPTO_SEEDBYTES 48
 
 

src/sign/sphincs/sphincs-shake256-128s-simple/avx2/params.h

@@ -4,12 +4,12 @@
 /* Hash output length in bytes. */
 #define PQCLEAN_SPHINCSSHAKE256128SSIMPLE_AVX2_N 16
 /* Height of the hypertree. */
-#define PQCLEAN_SPHINCSSHAKE256128SSIMPLE_AVX2_FULL_HEIGHT 64
+#define PQCLEAN_SPHINCSSHAKE256128SSIMPLE_AVX2_FULL_HEIGHT 63
 /* Number of subtree layer. */
-#define PQCLEAN_SPHINCSSHAKE256128SSIMPLE_AVX2_D 8
+#define PQCLEAN_SPHINCSSHAKE256128SSIMPLE_AVX2_D 7
 /* FORS tree dimensions. */
-#define PQCLEAN_SPHINCSSHAKE256128SSIMPLE_AVX2_FORS_HEIGHT 15
+#define PQCLEAN_SPHINCSSHAKE256128SSIMPLE_AVX2_FORS_HEIGHT 12
-#define PQCLEAN_SPHINCSSHAKE256128SSIMPLE_AVX2_FORS_TREES 10
+#define PQCLEAN_SPHINCSSHAKE256128SSIMPLE_AVX2_FORS_TREES 14
 /* Winternitz parameter, */
 #define PQCLEAN_SPHINCSSHAKE256128SSIMPLE_AVX2_WOTS_W 16
 

src/sign/sphincs/sphincs-shake256-128s-simple/clean/api.h

@@ -10,7 +10,7 @@
 
 #define PQCLEAN_SPHINCSSHAKE256128SSIMPLE_CLEAN_CRYPTO_SECRETKEYBYTES 64
 #define PQCLEAN_SPHINCSSHAKE256128SSIMPLE_CLEAN_CRYPTO_PUBLICKEYBYTES 32
-#define PQCLEAN_SPHINCSSHAKE256128SSIMPLE_CLEAN_CRYPTO_BYTES 8080
+#define PQCLEAN_SPHINCSSHAKE256128SSIMPLE_CLEAN_CRYPTO_BYTES 7856
 #define PQCLEAN_SPHINCSSHAKE256128SSIMPLE_CLEAN_CRYPTO_SEEDBYTES 48
 
 

src/sign/sphincs/sphincs-shake256-128s-simple/clean/params.h

@@ -4,12 +4,12 @@
 /* Hash output length in bytes. */
 #define PQCLEAN_SPHINCSSHAKE256128SSIMPLE_CLEAN_N 16
 /* Height of the hypertree. */
-#define PQCLEAN_SPHINCSSHAKE256128SSIMPLE_CLEAN_FULL_HEIGHT 64
+#define PQCLEAN_SPHINCSSHAKE256128SSIMPLE_CLEAN_FULL_HEIGHT 63
 /* Number of subtree layer. */
-#define PQCLEAN_SPHINCSSHAKE256128SSIMPLE_CLEAN_D 8
+#define PQCLEAN_SPHINCSSHAKE256128SSIMPLE_CLEAN_D 7
 /* FORS tree dimensions. */
-#define PQCLEAN_SPHINCSSHAKE256128SSIMPLE_CLEAN_FORS_HEIGHT 15
+#define PQCLEAN_SPHINCSSHAKE256128SSIMPLE_CLEAN_FORS_HEIGHT 12
-#define PQCLEAN_SPHINCSSHAKE256128SSIMPLE_CLEAN_FORS_TREES 10
+#define PQCLEAN_SPHINCSSHAKE256128SSIMPLE_CLEAN_FORS_TREES 14
 /* Winternitz parameter, */
 #define PQCLEAN_SPHINCSSHAKE256128SSIMPLE_CLEAN_WOTS_W 16
 

src/sign/sphincs/sphincs-shake256-192s-robust/avx2/api.h

@@ -10,7 +10,7 @@
 
 #define PQCLEAN_SPHINCSSHAKE256192SROBUST_AVX2_CRYPTO_SECRETKEYBYTES 96
 #define PQCLEAN_SPHINCSSHAKE256192SROBUST_AVX2_CRYPTO_PUBLICKEYBYTES 48
-#define PQCLEAN_SPHINCSSHAKE256192SROBUST_AVX2_CRYPTO_BYTES 17064
+#define PQCLEAN_SPHINCSSHAKE256192SROBUST_AVX2_CRYPTO_BYTES 16224
 #define PQCLEAN_SPHINCSSHAKE256192SROBUST_AVX2_CRYPTO_SEEDBYTES 72
 
 

src/sign/sphincs/sphincs-shake256-192s-robust/avx2/params.h

@@ -4,12 +4,12 @@
 /* Hash output length in bytes. */
 #define PQCLEAN_SPHINCSSHAKE256192SROBUST_AVX2_N 24
 /* Height of the hypertree. */
-#define PQCLEAN_SPHINCSSHAKE256192SROBUST_AVX2_FULL_HEIGHT 64
+#define PQCLEAN_SPHINCSSHAKE256192SROBUST_AVX2_FULL_HEIGHT 63
 /* Number of subtree layer. */
-#define PQCLEAN_SPHINCSSHAKE256192SROBUST_AVX2_D 8
+#define PQCLEAN_SPHINCSSHAKE256192SROBUST_AVX2_D 7
 /* FORS tree dimensions. */
-#define PQCLEAN_SPHINCSSHAKE256192SROBUST_AVX2_FORS_HEIGHT 16
+#define PQCLEAN_SPHINCSSHAKE256192SROBUST_AVX2_FORS_HEIGHT 14
-#define PQCLEAN_SPHINCSSHAKE256192SROBUST_AVX2_FORS_TREES 14
+#define PQCLEAN_SPHINCSSHAKE256192SROBUST_AVX2_FORS_TREES 17
 /* Winternitz parameter, */
 #define PQCLEAN_SPHINCSSHAKE256192SROBUST_AVX2_WOTS_W 16
 

src/sign/sphincs/sphincs-shake256-192s-robust/clean/api.h

@@ -10,7 +10,7 @@
 
 #define PQCLEAN_SPHINCSSHAKE256192SROBUST_CLEAN_CRYPTO_SECRETKEYBYTES 96
 #define PQCLEAN_SPHINCSSHAKE256192SROBUST_CLEAN_CRYPTO_PUBLICKEYBYTES 48
-#define PQCLEAN_SPHINCSSHAKE256192SROBUST_CLEAN_CRYPTO_BYTES 17064
+#define PQCLEAN_SPHINCSSHAKE256192SROBUST_CLEAN_CRYPTO_BYTES 16224
 #define PQCLEAN_SPHINCSSHAKE256192SROBUST_CLEAN_CRYPTO_SEEDBYTES 72
 
 

src/sign/sphincs/sphincs-shake256-192s-robust/clean/params.h

@@ -4,12 +4,12 @@
 /* Hash output length in bytes. */
 #define PQCLEAN_SPHINCSSHAKE256192SROBUST_CLEAN_N 24
 /* Height of the hypertree. */
-#define PQCLEAN_SPHINCSSHAKE256192SROBUST_CLEAN_FULL_HEIGHT 64
+#define PQCLEAN_SPHINCSSHAKE256192SROBUST_CLEAN_FULL_HEIGHT 63
 /* Number of subtree layer. */
-#define PQCLEAN_SPHINCSSHAKE256192SROBUST_CLEAN_D 8
+#define PQCLEAN_SPHINCSSHAKE256192SROBUST_CLEAN_D 7
 /* FORS tree dimensions. */
-#define PQCLEAN_SPHINCSSHAKE256192SROBUST_CLEAN_FORS_HEIGHT 16
+#define PQCLEAN_SPHINCSSHAKE256192SROBUST_CLEAN_FORS_HEIGHT 14
-#define PQCLEAN_SPHINCSSHAKE256192SROBUST_CLEAN_FORS_TREES 14
+#define PQCLEAN_SPHINCSSHAKE256192SROBUST_CLEAN_FORS_TREES 17
 /* Winternitz parameter, */
 #define PQCLEAN_SPHINCSSHAKE256192SROBUST_CLEAN_WOTS_W 16
 

src/sign/sphincs/sphincs-shake256-192s-simple/avx2/api.h

@@ -10,7 +10,7 @@
 
 #define PQCLEAN_SPHINCSSHAKE256192SSIMPLE_AVX2_CRYPTO_SECRETKEYBYTES 96
 #define PQCLEAN_SPHINCSSHAKE256192SSIMPLE_AVX2_CRYPTO_PUBLICKEYBYTES 48
-#define PQCLEAN_SPHINCSSHAKE256192SSIMPLE_AVX2_CRYPTO_BYTES 17064
+#define PQCLEAN_SPHINCSSHAKE256192SSIMPLE_AVX2_CRYPTO_BYTES 16224
 #define PQCLEAN_SPHINCSSHAKE256192SSIMPLE_AVX2_CRYPTO_SEEDBYTES 72
 
 

src/sign/sphincs/sphincs-shake256-192s-simple/avx2/params.h

@@ -4,12 +4,12 @@
 /* Hash output length in bytes. */
 #define PQCLEAN_SPHINCSSHAKE256192SSIMPLE_AVX2_N 24
 /* Height of the hypertree. */
-#define PQCLEAN_SPHINCSSHAKE256192SSIMPLE_AVX2_FULL_HEIGHT 64
+#define PQCLEAN_SPHINCSSHAKE256192SSIMPLE_AVX2_FULL_HEIGHT 63
 /* Number of subtree layer. */
-#define PQCLEAN_SPHINCSSHAKE256192SSIMPLE_AVX2_D 8
+#define PQCLEAN_SPHINCSSHAKE256192SSIMPLE_AVX2_D 7
 /* FORS tree dimensions. */
-#define PQCLEAN_SPHINCSSHAKE256192SSIMPLE_AVX2_FORS_HEIGHT 16
+#define PQCLEAN_SPHINCSSHAKE256192SSIMPLE_AVX2_FORS_HEIGHT 14
-#define PQCLEAN_SPHINCSSHAKE256192SSIMPLE_AVX2_FORS_TREES 14
+#define PQCLEAN_SPHINCSSHAKE256192SSIMPLE_AVX2_FORS_TREES 17
 /* Winternitz parameter, */
 #define PQCLEAN_SPHINCSSHAKE256192SSIMPLE_AVX2_WOTS_W 16
 

src/sign/sphincs/sphincs-shake256-192s-simple/clean/api.h

@@ -10,7 +10,7 @@
 
 #define PQCLEAN_SPHINCSSHAKE256192SSIMPLE_CLEAN_CRYPTO_SECRETKEYBYTES 96
 #define PQCLEAN_SPHINCSSHAKE256192SSIMPLE_CLEAN_CRYPTO_PUBLICKEYBYTES 48
-#define PQCLEAN_SPHINCSSHAKE256192SSIMPLE_CLEAN_CRYPTO_BYTES 17064
+#define PQCLEAN_SPHINCSSHAKE256192SSIMPLE_CLEAN_CRYPTO_BYTES 16224
 #define PQCLEAN_SPHINCSSHAKE256192SSIMPLE_CLEAN_CRYPTO_SEEDBYTES 72
 
 

src/sign/sphincs/sphincs-shake256-192s-simple/clean/params.h

@@ -4,12 +4,12 @@
 /* Hash output length in bytes. */
 #define PQCLEAN_SPHINCSSHAKE256192SSIMPLE_CLEAN_N 24
 /* Height of the hypertree. */
-#define PQCLEAN_SPHINCSSHAKE256192SSIMPLE_CLEAN_FULL_HEIGHT 64
+#define PQCLEAN_SPHINCSSHAKE256192SSIMPLE_CLEAN_FULL_HEIGHT 63
 /* Number of subtree layer. */
-#define PQCLEAN_SPHINCSSHAKE256192SSIMPLE_CLEAN_D 8
+#define PQCLEAN_SPHINCSSHAKE256192SSIMPLE_CLEAN_D 7
 /* FORS tree dimensions. */
-#define PQCLEAN_SPHINCSSHAKE256192SSIMPLE_CLEAN_FORS_HEIGHT 16
+#define PQCLEAN_SPHINCSSHAKE256192SSIMPLE_CLEAN_FORS_HEIGHT 14
-#define PQCLEAN_SPHINCSSHAKE256192SSIMPLE_CLEAN_FORS_TREES 14
+#define PQCLEAN_SPHINCSSHAKE256192SSIMPLE_CLEAN_FORS_TREES 17
 /* Winternitz parameter, */
 #define PQCLEAN_SPHINCSSHAKE256192SSIMPLE_CLEAN_WOTS_W 16
 

src/sign/sphincs/sphincs-shake256-256f-robust/avx2/api.h

@@ -10,7 +10,7 @@
 
 #define PQCLEAN_SPHINCSSHAKE256256FROBUST_AVX2_CRYPTO_SECRETKEYBYTES 128
 #define PQCLEAN_SPHINCSSHAKE256256FROBUST_AVX2_CRYPTO_PUBLICKEYBYTES 64
-#define PQCLEAN_SPHINCSSHAKE256256FROBUST_AVX2_CRYPTO_BYTES 49216
+#define PQCLEAN_SPHINCSSHAKE256256FROBUST_AVX2_CRYPTO_BYTES 49856
 #define PQCLEAN_SPHINCSSHAKE256256FROBUST_AVX2_CRYPTO_SEEDBYTES 96
 
 

src/sign/sphincs/sphincs-shake256-256f-robust/avx2/params.h

@@ -8,8 +8,8 @@
 /* Number of subtree layer. */
 #define PQCLEAN_SPHINCSSHAKE256256FROBUST_AVX2_D 17
 /* FORS tree dimensions. */
-#define PQCLEAN_SPHINCSSHAKE256256FROBUST_AVX2_FORS_HEIGHT 10
+#define PQCLEAN_SPHINCSSHAKE256256FROBUST_AVX2_FORS_HEIGHT 9
-#define PQCLEAN_SPHINCSSHAKE256256FROBUST_AVX2_FORS_TREES 30
+#define PQCLEAN_SPHINCSSHAKE256256FROBUST_AVX2_FORS_TREES 35
 /* Winternitz parameter, */
 #define PQCLEAN_SPHINCSSHAKE256256FROBUST_AVX2_WOTS_W 16
 

src/sign/sphincs/sphincs-shake256-256f-robust/clean/api.h

@@ -10,7 +10,7 @@
 
 #define PQCLEAN_SPHINCSSHAKE256256FROBUST_CLEAN_CRYPTO_SECRETKEYBYTES 128
 #define PQCLEAN_SPHINCSSHAKE256256FROBUST_CLEAN_CRYPTO_PUBLICKEYBYTES 64
-#define PQCLEAN_SPHINCSSHAKE256256FROBUST_CLEAN_CRYPTO_BYTES 49216
+#define PQCLEAN_SPHINCSSHAKE256256FROBUST_CLEAN_CRYPTO_BYTES 49856
 #define PQCLEAN_SPHINCSSHAKE256256FROBUST_CLEAN_CRYPTO_SEEDBYTES 96
 
 

src/sign/sphincs/sphincs-shake256-256f-robust/clean/params.h

@@ -8,8 +8,8 @@
 /* Number of subtree layer. */
 #define PQCLEAN_SPHINCSSHAKE256256FROBUST_CLEAN_D 17
 /* FORS tree dimensions. */
-#define PQCLEAN_SPHINCSSHAKE256256FROBUST_CLEAN_FORS_HEIGHT 10
+#define PQCLEAN_SPHINCSSHAKE256256FROBUST_CLEAN_FORS_HEIGHT 9
-#define PQCLEAN_SPHINCSSHAKE256256FROBUST_CLEAN_FORS_TREES 30
+#define PQCLEAN_SPHINCSSHAKE256256FROBUST_CLEAN_FORS_TREES 35
 /* Winternitz parameter, */
 #define PQCLEAN_SPHINCSSHAKE256256FROBUST_CLEAN_WOTS_W 16
 

src/sign/sphincs/sphincs-shake256-256f-simple/avx2/api.h

@@ -10,7 +10,7 @@
 
 #define PQCLEAN_SPHINCSSHAKE256256FSIMPLE_AVX2_CRYPTO_SECRETKEYBYTES 128
 #define PQCLEAN_SPHINCSSHAKE256256FSIMPLE_AVX2_CRYPTO_PUBLICKEYBYTES 64
-#define PQCLEAN_SPHINCSSHAKE256256FSIMPLE_AVX2_CRYPTO_BYTES 49216
+#define PQCLEAN_SPHINCSSHAKE256256FSIMPLE_AVX2_CRYPTO_BYTES 49856
 #define PQCLEAN_SPHINCSSHAKE256256FSIMPLE_AVX2_CRYPTO_SEEDBYTES 96
 
 

src/sign/sphincs/sphincs-shake256-256f-simple/avx2/params.h

@@ -8,8 +8,8 @@
 /* Number of subtree layer. */
 #define PQCLEAN_SPHINCSSHAKE256256FSIMPLE_AVX2_D 17
 /* FORS tree dimensions. */
-#define PQCLEAN_SPHINCSSHAKE256256FSIMPLE_AVX2_FORS_HEIGHT 10
+#define PQCLEAN_SPHINCSSHAKE256256FSIMPLE_AVX2_FORS_HEIGHT 9
-#define PQCLEAN_SPHINCSSHAKE256256FSIMPLE_AVX2_FORS_TREES 30
+#define PQCLEAN_SPHINCSSHAKE256256FSIMPLE_AVX2_FORS_TREES 35
 /* Winternitz parameter, */
 #define PQCLEAN_SPHINCSSHAKE256256FSIMPLE_AVX2_WOTS_W 16
 

src/sign/sphincs/sphincs-shake256-256f-simple/clean/api.h

@@ -10,7 +10,7 @@
 
 #define PQCLEAN_SPHINCSSHAKE256256FSIMPLE_CLEAN_CRYPTO_SECRETKEYBYTES 128
 #define PQCLEAN_SPHINCSSHAKE256256FSIMPLE_CLEAN_CRYPTO_PUBLICKEYBYTES 64
-#define PQCLEAN_SPHINCSSHAKE256256FSIMPLE_CLEAN_CRYPTO_BYTES 49216
+#define PQCLEAN_SPHINCSSHAKE256256FSIMPLE_CLEAN_CRYPTO_BYTES 49856
 #define PQCLEAN_SPHINCSSHAKE256256FSIMPLE_CLEAN_CRYPTO_SEEDBYTES 96
 
 

src/sign/sphincs/sphincs-shake256-256f-simple/clean/params.h

@@ -8,8 +8,8 @@
 /* Number of subtree layer. */
 #define PQCLEAN_SPHINCSSHAKE256256FSIMPLE_CLEAN_D 17
 /* FORS tree dimensions. */
-#define PQCLEAN_SPHINCSSHAKE256256FSIMPLE_CLEAN_FORS_HEIGHT 10
+#define PQCLEAN_SPHINCSSHAKE256256FSIMPLE_CLEAN_FORS_HEIGHT 9
-#define PQCLEAN_SPHINCSSHAKE256256FSIMPLE_CLEAN_FORS_TREES 30
+#define PQCLEAN_SPHINCSSHAKE256256FSIMPLE_CLEAN_FORS_TREES 35
 /* Winternitz parameter, */
 #define PQCLEAN_SPHINCSSHAKE256256FSIMPLE_CLEAN_WOTS_W 16