diff --git a/CMakeLists.txt b/CMakeLists.txt index 1d0179d5d..bbfcbf107 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,7 +23,7 @@ set(CMAKE_C_STANDARD 11) set(CMAKE_C_STANDARD_REQUIRED ON) set(CMAKE_POSITION_INDEPENDENT_CODE ON) set(CMAKE_C_VISIBILITY_PRESET hidden) -set(OQS_VERSION_TEXT "0.5.1-dev") +set(OQS_VERSION_TEXT "0.6.0-dev") set(OQS_COMPILE_BUILD_TARGET "${CMAKE_SYSTEM_PROCESSOR}-${CMAKE_HOST_SYSTEM}") set(CMAKE_EXPORT_COMPILE_COMMANDS ON) diff --git a/RELEASE.md b/RELEASE.md index b06cc7e65..b212866b2 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,4 +1,4 @@ -liboqs version 0.5.1-dev +liboqs version 0.6.0-dev ======================== About @@ -29,15 +29,14 @@ liboqs can also be used in the following programming languages via language-spec Release notes ============= -This is the development track for version 0.5.1 of liboqs. It was released on XXX. +This is the development track for version 0.6.0 of liboqs. It was released on XXX. What's New ---------- -This release continues from the 0.5.0 release of liboqs. - ### Key encapsulation mechanisms ### Digital signature schemes +This release includes the NIST PQC round 3 parameters for SPHINCS. ### Other changes diff --git a/docs/algorithms/sig/sphincs.md b/docs/algorithms/sig/sphincs.md index 2652703ee..72ebb3366 100644 --- a/docs/algorithms/sig/sphincs.md +++ b/docs/algorithms/sig/sphincs.md @@ -9,7 +9,7 @@ ## Implementation - **Source of implementation**: https://github.com/sphincs/sphincsplus -- **Implementation version**: https://github.com/PQClean/PQClean.git, master, ebcc71c51a30b6e5db4f1fade22999b346fdafce +- **Implementation version**: https://github.com/PQClean/PQClean.git, master, 865f0bd1d1dceb6624fc27e6395b14d2d03261ad - **License**: CC0 1.0 Universal - **Constant-time**: Yes - **Optimizations**: Portable C with AES, AVX2 instructions (if available at run-time) @@ -18,39 +18,39 @@ | Parameter set | Security model | Claimed NIST security level | Public key size (bytes) | Secret key size (bytes) | Signature size (bytes) | | ----------------------------- | -------------- | --------------------------- | ----------------------- | ----------------------- | ---------------------- | -| SPHINCS+-Haraka-128f-robust | EUF-CMA | 1 | 32 | 64 | 16976 | -| SPHINCS+-Haraka-128f-simple | EUF-CMA | 1 | 32 | 64 | 16976 | -| SPHINCS+-Haraka-128s-robust | EUF-CMA | 1 | 32 | 64 | 8080 | -| SPHINCS+-Haraka-128s-simple | EUF-CMA | 1 | 32 | 64 | 8080 | +| SPHINCS+-Haraka-128f-robust | EUF-CMA | 1 | 32 | 64 | 17088 | +| SPHINCS+-Haraka-128f-simple | EUF-CMA | 1 | 32 | 64 | 17088 | +| SPHINCS+-Haraka-128s-robust | EUF-CMA | 1 | 32 | 64 | 7856 | +| SPHINCS+-Haraka-128s-simple | EUF-CMA | 1 | 32 | 64 | 7856 | | SPHINCS+-Haraka-192f-robust | EUF-CMA | 3 | 48 | 96 | 35664 | | SPHINCS+-Haraka-192f-simple | EUF-CMA | 3 | 48 | 96 | 35664 | -| SPHINCS+-Haraka-192s-robust | EUF-CMA | 3 | 48 | 96 | 17064 | -| SPHINCS+-Haraka-192s-simple | EUF-CMA | 3 | 48 | 96 | 17064 | -| SPHINCS+-Haraka-256f-robust | EUF-CMA | 5 | 64 | 128 | 49216 | -| SPHINCS+-Haraka-256f-simple | EUF-CMA | 5 | 64 | 128 | 49216 | +| SPHINCS+-Haraka-192s-robust | EUF-CMA | 3 | 48 | 96 | 16224 | +| SPHINCS+-Haraka-192s-simple | EUF-CMA | 3 | 48 | 96 | 16224 | +| SPHINCS+-Haraka-256f-robust | EUF-CMA | 5 | 64 | 128 | 49856 | +| SPHINCS+-Haraka-256f-simple | EUF-CMA | 5 | 64 | 128 | 49856 | | SPHINCS+-Haraka-256s-robust | EUF-CMA | 5 | 64 | 128 | 29792 | | SPHINCS+-Haraka-256s-simple | EUF-CMA | 5 | 64 | 128 | 29792 | -| SPHINCS+-SHA256-128f-robust | EUF-CMA | 1 | 32 | 64 | 16976 | -| SPHINCS+-SHA256-128f-simple | EUF-CMA | 1 | 32 | 64 | 16976 | -| SPHINCS+-SHA256-128s-robust | EUF-CMA | 1 | 32 | 64 | 8080 | -| SPHINCS+-SHA256-128s-simple | EUF-CMA | 1 | 32 | 64 | 8080 | +| SPHINCS+-SHA256-128f-robust | EUF-CMA | 1 | 32 | 64 | 17088 | +| SPHINCS+-SHA256-128f-simple | EUF-CMA | 1 | 32 | 64 | 17088 | +| SPHINCS+-SHA256-128s-robust | EUF-CMA | 1 | 32 | 64 | 7856 | +| SPHINCS+-SHA256-128s-simple | EUF-CMA | 1 | 32 | 64 | 7856 | | SPHINCS+-SHA256-192f-robust | EUF-CMA | 3 | 48 | 96 | 35664 | | SPHINCS+-SHA256-192f-simple | EUF-CMA | 3 | 48 | 96 | 35664 | -| SPHINCS+-SHA256-192s-robust | EUF-CMA | 3 | 48 | 96 | 17064 | -| SPHINCS+-SHA256-192s-simple | EUF-CMA | 3 | 48 | 96 | 17064 | -| SPHINCS+-SHA256-256f-robust | EUF-CMA | 5 | 64 | 128 | 49216 | -| SPHINCS+-SHA256-256f-simple | EUF-CMA | 5 | 64 | 128 | 49216 | +| SPHINCS+-SHA256-192s-robust | EUF-CMA | 3 | 48 | 96 | 16224 | +| SPHINCS+-SHA256-192s-simple | EUF-CMA | 3 | 48 | 96 | 16224 | +| SPHINCS+-SHA256-256f-robust | EUF-CMA | 5 | 64 | 128 | 49856 | +| SPHINCS+-SHA256-256f-simple | EUF-CMA | 5 | 64 | 128 | 49856 | | SPHINCS+-SHA256-256s-robust | EUF-CMA | 5 | 64 | 128 | 29792 | | SPHINCS+-SHA256-256s-simple | EUF-CMA | 5 | 64 | 128 | 29792 | -| SPHINCS+-SHAKE256-128f-robust | EUF-CMA | 1 | 32 | 64 | 16976 | -| SPHINCS+-SHAKE256-128f-simple | EUF-CMA | 1 | 32 | 64 | 16976 | -| SPHINCS+-SHAKE256-128s-robust | EUF-CMA | 1 | 32 | 64 | 8080 | -| SPHINCS+-SHAKE256-128s-simple | EUF-CMA | 1 | 32 | 64 | 8080 | +| SPHINCS+-SHAKE256-128f-robust | EUF-CMA | 1 | 32 | 64 | 17088 | +| SPHINCS+-SHAKE256-128f-simple | EUF-CMA | 1 | 32 | 64 | 17088 | +| SPHINCS+-SHAKE256-128s-robust | EUF-CMA | 1 | 32 | 64 | 7856 | +| SPHINCS+-SHAKE256-128s-simple | EUF-CMA | 1 | 32 | 64 | 7856 | | SPHINCS+-SHAKE256-192f-robust | EUF-CMA | 3 | 48 | 96 | 35664 | | SPHINCS+-SHAKE256-192f-simple | EUF-CMA | 3 | 48 | 96 | 35664 | -| SPHINCS+-SHAKE256-192s-robust | EUF-CMA | 3 | 48 | 96 | 17064 | -| SPHINCS+-SHAKE256-192s-simple | EUF-CMA | 3 | 48 | 96 | 17064 | -| SPHINCS+-SHAKE256-256f-robust | EUF-CMA | 5 | 64 | 128 | 49216 | -| SPHINCS+-SHAKE256-256f-simple | EUF-CMA | 5 | 64 | 128 | 49216 | +| SPHINCS+-SHAKE256-192s-robust | EUF-CMA | 3 | 48 | 96 | 16224 | +| SPHINCS+-SHAKE256-192s-simple | EUF-CMA | 3 | 48 | 96 | 16224 | +| SPHINCS+-SHAKE256-256f-robust | EUF-CMA | 5 | 64 | 128 | 49856 | +| SPHINCS+-SHAKE256-256f-simple | EUF-CMA | 5 | 64 | 128 | 49856 | | SPHINCS+-SHAKE256-256s-robust | EUF-CMA | 5 | 64 | 128 | 29792 | | SPHINCS+-SHAKE256-256s-simple | EUF-CMA | 5 | 64 | 128 | 29792 | diff --git a/src/sig/sphincs/pqclean_sphincs-haraka-128f-robust_aesni/api.h b/src/sig/sphincs/pqclean_sphincs-haraka-128f-robust_aesni/api.h index 1ec301eb6..a5919f14f 100644 --- a/src/sig/sphincs/pqclean_sphincs-haraka-128f-robust_aesni/api.h +++ b/src/sig/sphincs/pqclean_sphincs-haraka-128f-robust_aesni/api.h @@ -10,7 +10,7 @@ #define PQCLEAN_SPHINCSHARAKA128FROBUST_AESNI_CRYPTO_SECRETKEYBYTES 64 #define PQCLEAN_SPHINCSHARAKA128FROBUST_AESNI_CRYPTO_PUBLICKEYBYTES 32 -#define PQCLEAN_SPHINCSHARAKA128FROBUST_AESNI_CRYPTO_BYTES 16976 +#define PQCLEAN_SPHINCSHARAKA128FROBUST_AESNI_CRYPTO_BYTES 17088 #define PQCLEAN_SPHINCSHARAKA128FROBUST_AESNI_CRYPTO_SEEDBYTES 48 diff --git a/src/sig/sphincs/pqclean_sphincs-haraka-128f-robust_aesni/params.h b/src/sig/sphincs/pqclean_sphincs-haraka-128f-robust_aesni/params.h index 48ec695a3..1b2ce946f 100644 --- a/src/sig/sphincs/pqclean_sphincs-haraka-128f-robust_aesni/params.h +++ b/src/sig/sphincs/pqclean_sphincs-haraka-128f-robust_aesni/params.h @@ -4,12 +4,12 @@ /* Hash output length in bytes. */ #define PQCLEAN_SPHINCSHARAKA128FROBUST_AESNI_N 16 /* Height of the hypertree. */ -#define PQCLEAN_SPHINCSHARAKA128FROBUST_AESNI_FULL_HEIGHT 60 +#define PQCLEAN_SPHINCSHARAKA128FROBUST_AESNI_FULL_HEIGHT 66 /* Number of subtree layer. */ -#define PQCLEAN_SPHINCSHARAKA128FROBUST_AESNI_D 20 +#define PQCLEAN_SPHINCSHARAKA128FROBUST_AESNI_D 22 /* FORS tree dimensions. */ -#define PQCLEAN_SPHINCSHARAKA128FROBUST_AESNI_FORS_HEIGHT 9 -#define PQCLEAN_SPHINCSHARAKA128FROBUST_AESNI_FORS_TREES 30 +#define PQCLEAN_SPHINCSHARAKA128FROBUST_AESNI_FORS_HEIGHT 6 +#define PQCLEAN_SPHINCSHARAKA128FROBUST_AESNI_FORS_TREES 33 /* Winternitz parameter, */ #define PQCLEAN_SPHINCSHARAKA128FROBUST_AESNI_WOTS_W 16 diff --git a/src/sig/sphincs/pqclean_sphincs-haraka-128f-robust_clean/api.h b/src/sig/sphincs/pqclean_sphincs-haraka-128f-robust_clean/api.h index 24892aaa8..581ad5ad0 100644 --- a/src/sig/sphincs/pqclean_sphincs-haraka-128f-robust_clean/api.h +++ b/src/sig/sphincs/pqclean_sphincs-haraka-128f-robust_clean/api.h @@ -10,7 +10,7 @@ #define PQCLEAN_SPHINCSHARAKA128FROBUST_CLEAN_CRYPTO_SECRETKEYBYTES 64 #define PQCLEAN_SPHINCSHARAKA128FROBUST_CLEAN_CRYPTO_PUBLICKEYBYTES 32 -#define PQCLEAN_SPHINCSHARAKA128FROBUST_CLEAN_CRYPTO_BYTES 16976 +#define PQCLEAN_SPHINCSHARAKA128FROBUST_CLEAN_CRYPTO_BYTES 17088 #define PQCLEAN_SPHINCSHARAKA128FROBUST_CLEAN_CRYPTO_SEEDBYTES 48 diff --git a/src/sig/sphincs/pqclean_sphincs-haraka-128f-robust_clean/params.h b/src/sig/sphincs/pqclean_sphincs-haraka-128f-robust_clean/params.h index 71b945199..ec4b39be0 100644 --- a/src/sig/sphincs/pqclean_sphincs-haraka-128f-robust_clean/params.h +++ b/src/sig/sphincs/pqclean_sphincs-haraka-128f-robust_clean/params.h @@ -4,12 +4,12 @@ /* Hash output length in bytes. */ #define PQCLEAN_SPHINCSHARAKA128FROBUST_CLEAN_N 16 /* Height of the hypertree. */ -#define PQCLEAN_SPHINCSHARAKA128FROBUST_CLEAN_FULL_HEIGHT 60 +#define PQCLEAN_SPHINCSHARAKA128FROBUST_CLEAN_FULL_HEIGHT 66 /* Number of subtree layer. */ -#define PQCLEAN_SPHINCSHARAKA128FROBUST_CLEAN_D 20 +#define PQCLEAN_SPHINCSHARAKA128FROBUST_CLEAN_D 22 /* FORS tree dimensions. */ -#define PQCLEAN_SPHINCSHARAKA128FROBUST_CLEAN_FORS_HEIGHT 9 -#define PQCLEAN_SPHINCSHARAKA128FROBUST_CLEAN_FORS_TREES 30 +#define PQCLEAN_SPHINCSHARAKA128FROBUST_CLEAN_FORS_HEIGHT 6 +#define PQCLEAN_SPHINCSHARAKA128FROBUST_CLEAN_FORS_TREES 33 /* Winternitz parameter, */ #define PQCLEAN_SPHINCSHARAKA128FROBUST_CLEAN_WOTS_W 16 diff --git a/src/sig/sphincs/pqclean_sphincs-haraka-128f-simple_aesni/api.h b/src/sig/sphincs/pqclean_sphincs-haraka-128f-simple_aesni/api.h index 63d46ed5e..eb2090e02 100644 --- a/src/sig/sphincs/pqclean_sphincs-haraka-128f-simple_aesni/api.h +++ b/src/sig/sphincs/pqclean_sphincs-haraka-128f-simple_aesni/api.h @@ -10,7 +10,7 @@ #define PQCLEAN_SPHINCSHARAKA128FSIMPLE_AESNI_CRYPTO_SECRETKEYBYTES 64 #define PQCLEAN_SPHINCSHARAKA128FSIMPLE_AESNI_CRYPTO_PUBLICKEYBYTES 32 -#define PQCLEAN_SPHINCSHARAKA128FSIMPLE_AESNI_CRYPTO_BYTES 16976 +#define PQCLEAN_SPHINCSHARAKA128FSIMPLE_AESNI_CRYPTO_BYTES 17088 #define PQCLEAN_SPHINCSHARAKA128FSIMPLE_AESNI_CRYPTO_SEEDBYTES 48 diff --git a/src/sig/sphincs/pqclean_sphincs-haraka-128f-simple_aesni/params.h b/src/sig/sphincs/pqclean_sphincs-haraka-128f-simple_aesni/params.h index 9054fb9e5..2f7fb17b5 100644 --- a/src/sig/sphincs/pqclean_sphincs-haraka-128f-simple_aesni/params.h +++ b/src/sig/sphincs/pqclean_sphincs-haraka-128f-simple_aesni/params.h @@ -4,12 +4,12 @@ /* Hash output length in bytes. */ #define PQCLEAN_SPHINCSHARAKA128FSIMPLE_AESNI_N 16 /* Height of the hypertree. */ -#define PQCLEAN_SPHINCSHARAKA128FSIMPLE_AESNI_FULL_HEIGHT 60 +#define PQCLEAN_SPHINCSHARAKA128FSIMPLE_AESNI_FULL_HEIGHT 66 /* Number of subtree layer. */ -#define PQCLEAN_SPHINCSHARAKA128FSIMPLE_AESNI_D 20 +#define PQCLEAN_SPHINCSHARAKA128FSIMPLE_AESNI_D 22 /* FORS tree dimensions. */ -#define PQCLEAN_SPHINCSHARAKA128FSIMPLE_AESNI_FORS_HEIGHT 9 -#define PQCLEAN_SPHINCSHARAKA128FSIMPLE_AESNI_FORS_TREES 30 +#define PQCLEAN_SPHINCSHARAKA128FSIMPLE_AESNI_FORS_HEIGHT 6 +#define PQCLEAN_SPHINCSHARAKA128FSIMPLE_AESNI_FORS_TREES 33 /* Winternitz parameter, */ #define PQCLEAN_SPHINCSHARAKA128FSIMPLE_AESNI_WOTS_W 16 diff --git a/src/sig/sphincs/pqclean_sphincs-haraka-128f-simple_clean/api.h b/src/sig/sphincs/pqclean_sphincs-haraka-128f-simple_clean/api.h index edf32d17b..0b14992b7 100644 --- a/src/sig/sphincs/pqclean_sphincs-haraka-128f-simple_clean/api.h +++ b/src/sig/sphincs/pqclean_sphincs-haraka-128f-simple_clean/api.h @@ -10,7 +10,7 @@ #define PQCLEAN_SPHINCSHARAKA128FSIMPLE_CLEAN_CRYPTO_SECRETKEYBYTES 64 #define PQCLEAN_SPHINCSHARAKA128FSIMPLE_CLEAN_CRYPTO_PUBLICKEYBYTES 32 -#define PQCLEAN_SPHINCSHARAKA128FSIMPLE_CLEAN_CRYPTO_BYTES 16976 +#define PQCLEAN_SPHINCSHARAKA128FSIMPLE_CLEAN_CRYPTO_BYTES 17088 #define PQCLEAN_SPHINCSHARAKA128FSIMPLE_CLEAN_CRYPTO_SEEDBYTES 48 diff --git a/src/sig/sphincs/pqclean_sphincs-haraka-128f-simple_clean/params.h b/src/sig/sphincs/pqclean_sphincs-haraka-128f-simple_clean/params.h index 3587d902b..6f17b1f7a 100644 --- a/src/sig/sphincs/pqclean_sphincs-haraka-128f-simple_clean/params.h +++ b/src/sig/sphincs/pqclean_sphincs-haraka-128f-simple_clean/params.h @@ -4,12 +4,12 @@ /* Hash output length in bytes. */ #define PQCLEAN_SPHINCSHARAKA128FSIMPLE_CLEAN_N 16 /* Height of the hypertree. */ -#define PQCLEAN_SPHINCSHARAKA128FSIMPLE_CLEAN_FULL_HEIGHT 60 +#define PQCLEAN_SPHINCSHARAKA128FSIMPLE_CLEAN_FULL_HEIGHT 66 /* Number of subtree layer. */ -#define PQCLEAN_SPHINCSHARAKA128FSIMPLE_CLEAN_D 20 +#define PQCLEAN_SPHINCSHARAKA128FSIMPLE_CLEAN_D 22 /* FORS tree dimensions. */ -#define PQCLEAN_SPHINCSHARAKA128FSIMPLE_CLEAN_FORS_HEIGHT 9 -#define PQCLEAN_SPHINCSHARAKA128FSIMPLE_CLEAN_FORS_TREES 30 +#define PQCLEAN_SPHINCSHARAKA128FSIMPLE_CLEAN_FORS_HEIGHT 6 +#define PQCLEAN_SPHINCSHARAKA128FSIMPLE_CLEAN_FORS_TREES 33 /* Winternitz parameter, */ #define PQCLEAN_SPHINCSHARAKA128FSIMPLE_CLEAN_WOTS_W 16 diff --git a/src/sig/sphincs/pqclean_sphincs-haraka-128s-robust_aesni/api.h b/src/sig/sphincs/pqclean_sphincs-haraka-128s-robust_aesni/api.h index 54e4264e5..bdf18264f 100644 --- a/src/sig/sphincs/pqclean_sphincs-haraka-128s-robust_aesni/api.h +++ b/src/sig/sphincs/pqclean_sphincs-haraka-128s-robust_aesni/api.h @@ -10,7 +10,7 @@ #define PQCLEAN_SPHINCSHARAKA128SROBUST_AESNI_CRYPTO_SECRETKEYBYTES 64 #define PQCLEAN_SPHINCSHARAKA128SROBUST_AESNI_CRYPTO_PUBLICKEYBYTES 32 -#define PQCLEAN_SPHINCSHARAKA128SROBUST_AESNI_CRYPTO_BYTES 8080 +#define PQCLEAN_SPHINCSHARAKA128SROBUST_AESNI_CRYPTO_BYTES 7856 #define PQCLEAN_SPHINCSHARAKA128SROBUST_AESNI_CRYPTO_SEEDBYTES 48 diff --git a/src/sig/sphincs/pqclean_sphincs-haraka-128s-robust_aesni/params.h b/src/sig/sphincs/pqclean_sphincs-haraka-128s-robust_aesni/params.h index 9781caed1..4008d557a 100644 --- a/src/sig/sphincs/pqclean_sphincs-haraka-128s-robust_aesni/params.h +++ b/src/sig/sphincs/pqclean_sphincs-haraka-128s-robust_aesni/params.h @@ -4,12 +4,12 @@ /* Hash output length in bytes. */ #define PQCLEAN_SPHINCSHARAKA128SROBUST_AESNI_N 16 /* Height of the hypertree. */ -#define PQCLEAN_SPHINCSHARAKA128SROBUST_AESNI_FULL_HEIGHT 64 +#define PQCLEAN_SPHINCSHARAKA128SROBUST_AESNI_FULL_HEIGHT 63 /* Number of subtree layer. */ -#define PQCLEAN_SPHINCSHARAKA128SROBUST_AESNI_D 8 +#define PQCLEAN_SPHINCSHARAKA128SROBUST_AESNI_D 7 /* FORS tree dimensions. */ -#define PQCLEAN_SPHINCSHARAKA128SROBUST_AESNI_FORS_HEIGHT 15 -#define PQCLEAN_SPHINCSHARAKA128SROBUST_AESNI_FORS_TREES 10 +#define PQCLEAN_SPHINCSHARAKA128SROBUST_AESNI_FORS_HEIGHT 12 +#define PQCLEAN_SPHINCSHARAKA128SROBUST_AESNI_FORS_TREES 14 /* Winternitz parameter, */ #define PQCLEAN_SPHINCSHARAKA128SROBUST_AESNI_WOTS_W 16 diff --git a/src/sig/sphincs/pqclean_sphincs-haraka-128s-robust_clean/api.h b/src/sig/sphincs/pqclean_sphincs-haraka-128s-robust_clean/api.h index c7e263317..fc12fc00d 100644 --- a/src/sig/sphincs/pqclean_sphincs-haraka-128s-robust_clean/api.h +++ b/src/sig/sphincs/pqclean_sphincs-haraka-128s-robust_clean/api.h @@ -10,7 +10,7 @@ #define PQCLEAN_SPHINCSHARAKA128SROBUST_CLEAN_CRYPTO_SECRETKEYBYTES 64 #define PQCLEAN_SPHINCSHARAKA128SROBUST_CLEAN_CRYPTO_PUBLICKEYBYTES 32 -#define PQCLEAN_SPHINCSHARAKA128SROBUST_CLEAN_CRYPTO_BYTES 8080 +#define PQCLEAN_SPHINCSHARAKA128SROBUST_CLEAN_CRYPTO_BYTES 7856 #define PQCLEAN_SPHINCSHARAKA128SROBUST_CLEAN_CRYPTO_SEEDBYTES 48 diff --git a/src/sig/sphincs/pqclean_sphincs-haraka-128s-robust_clean/params.h b/src/sig/sphincs/pqclean_sphincs-haraka-128s-robust_clean/params.h index bef5e86c4..70f544aba 100644 --- a/src/sig/sphincs/pqclean_sphincs-haraka-128s-robust_clean/params.h +++ b/src/sig/sphincs/pqclean_sphincs-haraka-128s-robust_clean/params.h @@ -4,12 +4,12 @@ /* Hash output length in bytes. */ #define PQCLEAN_SPHINCSHARAKA128SROBUST_CLEAN_N 16 /* Height of the hypertree. */ -#define PQCLEAN_SPHINCSHARAKA128SROBUST_CLEAN_FULL_HEIGHT 64 +#define PQCLEAN_SPHINCSHARAKA128SROBUST_CLEAN_FULL_HEIGHT 63 /* Number of subtree layer. */ -#define PQCLEAN_SPHINCSHARAKA128SROBUST_CLEAN_D 8 +#define PQCLEAN_SPHINCSHARAKA128SROBUST_CLEAN_D 7 /* FORS tree dimensions. */ -#define PQCLEAN_SPHINCSHARAKA128SROBUST_CLEAN_FORS_HEIGHT 15 -#define PQCLEAN_SPHINCSHARAKA128SROBUST_CLEAN_FORS_TREES 10 +#define PQCLEAN_SPHINCSHARAKA128SROBUST_CLEAN_FORS_HEIGHT 12 +#define PQCLEAN_SPHINCSHARAKA128SROBUST_CLEAN_FORS_TREES 14 /* Winternitz parameter, */ #define PQCLEAN_SPHINCSHARAKA128SROBUST_CLEAN_WOTS_W 16 diff --git a/src/sig/sphincs/pqclean_sphincs-haraka-128s-simple_aesni/api.h b/src/sig/sphincs/pqclean_sphincs-haraka-128s-simple_aesni/api.h index e9f786a7e..32ca77c64 100644 --- a/src/sig/sphincs/pqclean_sphincs-haraka-128s-simple_aesni/api.h +++ b/src/sig/sphincs/pqclean_sphincs-haraka-128s-simple_aesni/api.h @@ -10,7 +10,7 @@ #define PQCLEAN_SPHINCSHARAKA128SSIMPLE_AESNI_CRYPTO_SECRETKEYBYTES 64 #define PQCLEAN_SPHINCSHARAKA128SSIMPLE_AESNI_CRYPTO_PUBLICKEYBYTES 32 -#define PQCLEAN_SPHINCSHARAKA128SSIMPLE_AESNI_CRYPTO_BYTES 8080 +#define PQCLEAN_SPHINCSHARAKA128SSIMPLE_AESNI_CRYPTO_BYTES 7856 #define PQCLEAN_SPHINCSHARAKA128SSIMPLE_AESNI_CRYPTO_SEEDBYTES 48 diff --git a/src/sig/sphincs/pqclean_sphincs-haraka-128s-simple_aesni/params.h b/src/sig/sphincs/pqclean_sphincs-haraka-128s-simple_aesni/params.h index 71f823156..378e1329a 100644 --- a/src/sig/sphincs/pqclean_sphincs-haraka-128s-simple_aesni/params.h +++ b/src/sig/sphincs/pqclean_sphincs-haraka-128s-simple_aesni/params.h @@ -4,12 +4,12 @@ /* Hash output length in bytes. */ #define PQCLEAN_SPHINCSHARAKA128SSIMPLE_AESNI_N 16 /* Height of the hypertree. */ -#define PQCLEAN_SPHINCSHARAKA128SSIMPLE_AESNI_FULL_HEIGHT 64 +#define PQCLEAN_SPHINCSHARAKA128SSIMPLE_AESNI_FULL_HEIGHT 63 /* Number of subtree layer. */ -#define PQCLEAN_SPHINCSHARAKA128SSIMPLE_AESNI_D 8 +#define PQCLEAN_SPHINCSHARAKA128SSIMPLE_AESNI_D 7 /* FORS tree dimensions. */ -#define PQCLEAN_SPHINCSHARAKA128SSIMPLE_AESNI_FORS_HEIGHT 15 -#define PQCLEAN_SPHINCSHARAKA128SSIMPLE_AESNI_FORS_TREES 10 +#define PQCLEAN_SPHINCSHARAKA128SSIMPLE_AESNI_FORS_HEIGHT 12 +#define PQCLEAN_SPHINCSHARAKA128SSIMPLE_AESNI_FORS_TREES 14 /* Winternitz parameter, */ #define PQCLEAN_SPHINCSHARAKA128SSIMPLE_AESNI_WOTS_W 16 diff --git a/src/sig/sphincs/pqclean_sphincs-haraka-128s-simple_clean/api.h b/src/sig/sphincs/pqclean_sphincs-haraka-128s-simple_clean/api.h index 4d3a7ece7..679b1c28e 100644 --- a/src/sig/sphincs/pqclean_sphincs-haraka-128s-simple_clean/api.h +++ b/src/sig/sphincs/pqclean_sphincs-haraka-128s-simple_clean/api.h @@ -10,7 +10,7 @@ #define PQCLEAN_SPHINCSHARAKA128SSIMPLE_CLEAN_CRYPTO_SECRETKEYBYTES 64 #define PQCLEAN_SPHINCSHARAKA128SSIMPLE_CLEAN_CRYPTO_PUBLICKEYBYTES 32 -#define PQCLEAN_SPHINCSHARAKA128SSIMPLE_CLEAN_CRYPTO_BYTES 8080 +#define PQCLEAN_SPHINCSHARAKA128SSIMPLE_CLEAN_CRYPTO_BYTES 7856 #define PQCLEAN_SPHINCSHARAKA128SSIMPLE_CLEAN_CRYPTO_SEEDBYTES 48 diff --git a/src/sig/sphincs/pqclean_sphincs-haraka-128s-simple_clean/params.h b/src/sig/sphincs/pqclean_sphincs-haraka-128s-simple_clean/params.h index eb2f5c3e9..7130d0a7c 100644 --- a/src/sig/sphincs/pqclean_sphincs-haraka-128s-simple_clean/params.h +++ b/src/sig/sphincs/pqclean_sphincs-haraka-128s-simple_clean/params.h @@ -4,12 +4,12 @@ /* Hash output length in bytes. */ #define PQCLEAN_SPHINCSHARAKA128SSIMPLE_CLEAN_N 16 /* Height of the hypertree. */ -#define PQCLEAN_SPHINCSHARAKA128SSIMPLE_CLEAN_FULL_HEIGHT 64 +#define PQCLEAN_SPHINCSHARAKA128SSIMPLE_CLEAN_FULL_HEIGHT 63 /* Number of subtree layer. */ -#define PQCLEAN_SPHINCSHARAKA128SSIMPLE_CLEAN_D 8 +#define PQCLEAN_SPHINCSHARAKA128SSIMPLE_CLEAN_D 7 /* FORS tree dimensions. */ -#define PQCLEAN_SPHINCSHARAKA128SSIMPLE_CLEAN_FORS_HEIGHT 15 -#define PQCLEAN_SPHINCSHARAKA128SSIMPLE_CLEAN_FORS_TREES 10 +#define PQCLEAN_SPHINCSHARAKA128SSIMPLE_CLEAN_FORS_HEIGHT 12 +#define PQCLEAN_SPHINCSHARAKA128SSIMPLE_CLEAN_FORS_TREES 14 /* Winternitz parameter, */ #define PQCLEAN_SPHINCSHARAKA128SSIMPLE_CLEAN_WOTS_W 16 diff --git a/src/sig/sphincs/pqclean_sphincs-haraka-192s-robust_aesni/api.h b/src/sig/sphincs/pqclean_sphincs-haraka-192s-robust_aesni/api.h index ff14b0a6b..e2b352559 100644 --- a/src/sig/sphincs/pqclean_sphincs-haraka-192s-robust_aesni/api.h +++ b/src/sig/sphincs/pqclean_sphincs-haraka-192s-robust_aesni/api.h @@ -10,7 +10,7 @@ #define PQCLEAN_SPHINCSHARAKA192SROBUST_AESNI_CRYPTO_SECRETKEYBYTES 96 #define PQCLEAN_SPHINCSHARAKA192SROBUST_AESNI_CRYPTO_PUBLICKEYBYTES 48 -#define PQCLEAN_SPHINCSHARAKA192SROBUST_AESNI_CRYPTO_BYTES 17064 +#define PQCLEAN_SPHINCSHARAKA192SROBUST_AESNI_CRYPTO_BYTES 16224 #define PQCLEAN_SPHINCSHARAKA192SROBUST_AESNI_CRYPTO_SEEDBYTES 72 diff --git a/src/sig/sphincs/pqclean_sphincs-haraka-192s-robust_aesni/params.h b/src/sig/sphincs/pqclean_sphincs-haraka-192s-robust_aesni/params.h index 2103a2b64..b33b0c10a 100644 --- a/src/sig/sphincs/pqclean_sphincs-haraka-192s-robust_aesni/params.h +++ b/src/sig/sphincs/pqclean_sphincs-haraka-192s-robust_aesni/params.h @@ -4,12 +4,12 @@ /* Hash output length in bytes. */ #define PQCLEAN_SPHINCSHARAKA192SROBUST_AESNI_N 24 /* Height of the hypertree. */ -#define PQCLEAN_SPHINCSHARAKA192SROBUST_AESNI_FULL_HEIGHT 64 +#define PQCLEAN_SPHINCSHARAKA192SROBUST_AESNI_FULL_HEIGHT 63 /* Number of subtree layer. */ -#define PQCLEAN_SPHINCSHARAKA192SROBUST_AESNI_D 8 +#define PQCLEAN_SPHINCSHARAKA192SROBUST_AESNI_D 7 /* FORS tree dimensions. */ -#define PQCLEAN_SPHINCSHARAKA192SROBUST_AESNI_FORS_HEIGHT 16 -#define PQCLEAN_SPHINCSHARAKA192SROBUST_AESNI_FORS_TREES 14 +#define PQCLEAN_SPHINCSHARAKA192SROBUST_AESNI_FORS_HEIGHT 14 +#define PQCLEAN_SPHINCSHARAKA192SROBUST_AESNI_FORS_TREES 17 /* Winternitz parameter, */ #define PQCLEAN_SPHINCSHARAKA192SROBUST_AESNI_WOTS_W 16 diff --git a/src/sig/sphincs/pqclean_sphincs-haraka-192s-robust_clean/api.h b/src/sig/sphincs/pqclean_sphincs-haraka-192s-robust_clean/api.h index d3064370a..94aa4e1ba 100644 --- a/src/sig/sphincs/pqclean_sphincs-haraka-192s-robust_clean/api.h +++ b/src/sig/sphincs/pqclean_sphincs-haraka-192s-robust_clean/api.h @@ -10,7 +10,7 @@ #define PQCLEAN_SPHINCSHARAKA192SROBUST_CLEAN_CRYPTO_SECRETKEYBYTES 96 #define PQCLEAN_SPHINCSHARAKA192SROBUST_CLEAN_CRYPTO_PUBLICKEYBYTES 48 -#define PQCLEAN_SPHINCSHARAKA192SROBUST_CLEAN_CRYPTO_BYTES 17064 +#define PQCLEAN_SPHINCSHARAKA192SROBUST_CLEAN_CRYPTO_BYTES 16224 #define PQCLEAN_SPHINCSHARAKA192SROBUST_CLEAN_CRYPTO_SEEDBYTES 72 diff --git a/src/sig/sphincs/pqclean_sphincs-haraka-192s-robust_clean/params.h b/src/sig/sphincs/pqclean_sphincs-haraka-192s-robust_clean/params.h index 6d5ad7450..92f4fca29 100644 --- a/src/sig/sphincs/pqclean_sphincs-haraka-192s-robust_clean/params.h +++ b/src/sig/sphincs/pqclean_sphincs-haraka-192s-robust_clean/params.h @@ -4,12 +4,12 @@ /* Hash output length in bytes. */ #define PQCLEAN_SPHINCSHARAKA192SROBUST_CLEAN_N 24 /* Height of the hypertree. */ -#define PQCLEAN_SPHINCSHARAKA192SROBUST_CLEAN_FULL_HEIGHT 64 +#define PQCLEAN_SPHINCSHARAKA192SROBUST_CLEAN_FULL_HEIGHT 63 /* Number of subtree layer. */ -#define PQCLEAN_SPHINCSHARAKA192SROBUST_CLEAN_D 8 +#define PQCLEAN_SPHINCSHARAKA192SROBUST_CLEAN_D 7 /* FORS tree dimensions. */ -#define PQCLEAN_SPHINCSHARAKA192SROBUST_CLEAN_FORS_HEIGHT 16 -#define PQCLEAN_SPHINCSHARAKA192SROBUST_CLEAN_FORS_TREES 14 +#define PQCLEAN_SPHINCSHARAKA192SROBUST_CLEAN_FORS_HEIGHT 14 +#define PQCLEAN_SPHINCSHARAKA192SROBUST_CLEAN_FORS_TREES 17 /* Winternitz parameter, */ #define PQCLEAN_SPHINCSHARAKA192SROBUST_CLEAN_WOTS_W 16 diff --git a/src/sig/sphincs/pqclean_sphincs-haraka-192s-simple_aesni/api.h b/src/sig/sphincs/pqclean_sphincs-haraka-192s-simple_aesni/api.h index 4f502429d..a82f2f275 100644 --- a/src/sig/sphincs/pqclean_sphincs-haraka-192s-simple_aesni/api.h +++ b/src/sig/sphincs/pqclean_sphincs-haraka-192s-simple_aesni/api.h @@ -10,7 +10,7 @@ #define PQCLEAN_SPHINCSHARAKA192SSIMPLE_AESNI_CRYPTO_SECRETKEYBYTES 96 #define PQCLEAN_SPHINCSHARAKA192SSIMPLE_AESNI_CRYPTO_PUBLICKEYBYTES 48 -#define PQCLEAN_SPHINCSHARAKA192SSIMPLE_AESNI_CRYPTO_BYTES 17064 +#define PQCLEAN_SPHINCSHARAKA192SSIMPLE_AESNI_CRYPTO_BYTES 16224 #define PQCLEAN_SPHINCSHARAKA192SSIMPLE_AESNI_CRYPTO_SEEDBYTES 72 diff --git a/src/sig/sphincs/pqclean_sphincs-haraka-192s-simple_aesni/params.h b/src/sig/sphincs/pqclean_sphincs-haraka-192s-simple_aesni/params.h index 0f8d79184..cfea7f491 100644 --- a/src/sig/sphincs/pqclean_sphincs-haraka-192s-simple_aesni/params.h +++ b/src/sig/sphincs/pqclean_sphincs-haraka-192s-simple_aesni/params.h @@ -4,12 +4,12 @@ /* Hash output length in bytes. */ #define PQCLEAN_SPHINCSHARAKA192SSIMPLE_AESNI_N 24 /* Height of the hypertree. */ -#define PQCLEAN_SPHINCSHARAKA192SSIMPLE_AESNI_FULL_HEIGHT 64 +#define PQCLEAN_SPHINCSHARAKA192SSIMPLE_AESNI_FULL_HEIGHT 63 /* Number of subtree layer. */ -#define PQCLEAN_SPHINCSHARAKA192SSIMPLE_AESNI_D 8 +#define PQCLEAN_SPHINCSHARAKA192SSIMPLE_AESNI_D 7 /* FORS tree dimensions. */ -#define PQCLEAN_SPHINCSHARAKA192SSIMPLE_AESNI_FORS_HEIGHT 16 -#define PQCLEAN_SPHINCSHARAKA192SSIMPLE_AESNI_FORS_TREES 14 +#define PQCLEAN_SPHINCSHARAKA192SSIMPLE_AESNI_FORS_HEIGHT 14 +#define PQCLEAN_SPHINCSHARAKA192SSIMPLE_AESNI_FORS_TREES 17 /* Winternitz parameter, */ #define PQCLEAN_SPHINCSHARAKA192SSIMPLE_AESNI_WOTS_W 16 diff --git a/src/sig/sphincs/pqclean_sphincs-haraka-192s-simple_clean/api.h b/src/sig/sphincs/pqclean_sphincs-haraka-192s-simple_clean/api.h index 30b02cd76..a95a4f476 100644 --- a/src/sig/sphincs/pqclean_sphincs-haraka-192s-simple_clean/api.h +++ b/src/sig/sphincs/pqclean_sphincs-haraka-192s-simple_clean/api.h @@ -10,7 +10,7 @@ #define PQCLEAN_SPHINCSHARAKA192SSIMPLE_CLEAN_CRYPTO_SECRETKEYBYTES 96 #define PQCLEAN_SPHINCSHARAKA192SSIMPLE_CLEAN_CRYPTO_PUBLICKEYBYTES 48 -#define PQCLEAN_SPHINCSHARAKA192SSIMPLE_CLEAN_CRYPTO_BYTES 17064 +#define PQCLEAN_SPHINCSHARAKA192SSIMPLE_CLEAN_CRYPTO_BYTES 16224 #define PQCLEAN_SPHINCSHARAKA192SSIMPLE_CLEAN_CRYPTO_SEEDBYTES 72 diff --git a/src/sig/sphincs/pqclean_sphincs-haraka-192s-simple_clean/params.h b/src/sig/sphincs/pqclean_sphincs-haraka-192s-simple_clean/params.h index 73d58e372..7601b7ba1 100644 --- a/src/sig/sphincs/pqclean_sphincs-haraka-192s-simple_clean/params.h +++ b/src/sig/sphincs/pqclean_sphincs-haraka-192s-simple_clean/params.h @@ -4,12 +4,12 @@ /* Hash output length in bytes. */ #define PQCLEAN_SPHINCSHARAKA192SSIMPLE_CLEAN_N 24 /* Height of the hypertree. */ -#define PQCLEAN_SPHINCSHARAKA192SSIMPLE_CLEAN_FULL_HEIGHT 64 +#define PQCLEAN_SPHINCSHARAKA192SSIMPLE_CLEAN_FULL_HEIGHT 63 /* Number of subtree layer. */ -#define PQCLEAN_SPHINCSHARAKA192SSIMPLE_CLEAN_D 8 +#define PQCLEAN_SPHINCSHARAKA192SSIMPLE_CLEAN_D 7 /* FORS tree dimensions. */ -#define PQCLEAN_SPHINCSHARAKA192SSIMPLE_CLEAN_FORS_HEIGHT 16 -#define PQCLEAN_SPHINCSHARAKA192SSIMPLE_CLEAN_FORS_TREES 14 +#define PQCLEAN_SPHINCSHARAKA192SSIMPLE_CLEAN_FORS_HEIGHT 14 +#define PQCLEAN_SPHINCSHARAKA192SSIMPLE_CLEAN_FORS_TREES 17 /* Winternitz parameter, */ #define PQCLEAN_SPHINCSHARAKA192SSIMPLE_CLEAN_WOTS_W 16 diff --git a/src/sig/sphincs/pqclean_sphincs-haraka-256f-robust_aesni/api.h b/src/sig/sphincs/pqclean_sphincs-haraka-256f-robust_aesni/api.h index 64a49ea57..ad341ab6e 100644 --- a/src/sig/sphincs/pqclean_sphincs-haraka-256f-robust_aesni/api.h +++ b/src/sig/sphincs/pqclean_sphincs-haraka-256f-robust_aesni/api.h @@ -10,7 +10,7 @@ #define PQCLEAN_SPHINCSHARAKA256FROBUST_AESNI_CRYPTO_SECRETKEYBYTES 128 #define PQCLEAN_SPHINCSHARAKA256FROBUST_AESNI_CRYPTO_PUBLICKEYBYTES 64 -#define PQCLEAN_SPHINCSHARAKA256FROBUST_AESNI_CRYPTO_BYTES 49216 +#define PQCLEAN_SPHINCSHARAKA256FROBUST_AESNI_CRYPTO_BYTES 49856 #define PQCLEAN_SPHINCSHARAKA256FROBUST_AESNI_CRYPTO_SEEDBYTES 96 diff --git a/src/sig/sphincs/pqclean_sphincs-haraka-256f-robust_aesni/params.h b/src/sig/sphincs/pqclean_sphincs-haraka-256f-robust_aesni/params.h index babfe795c..f61286426 100644 --- a/src/sig/sphincs/pqclean_sphincs-haraka-256f-robust_aesni/params.h +++ b/src/sig/sphincs/pqclean_sphincs-haraka-256f-robust_aesni/params.h @@ -8,8 +8,8 @@ /* Number of subtree layer. */ #define PQCLEAN_SPHINCSHARAKA256FROBUST_AESNI_D 17 /* FORS tree dimensions. */ -#define PQCLEAN_SPHINCSHARAKA256FROBUST_AESNI_FORS_HEIGHT 10 -#define PQCLEAN_SPHINCSHARAKA256FROBUST_AESNI_FORS_TREES 30 +#define PQCLEAN_SPHINCSHARAKA256FROBUST_AESNI_FORS_HEIGHT 9 +#define PQCLEAN_SPHINCSHARAKA256FROBUST_AESNI_FORS_TREES 35 /* Winternitz parameter, */ #define PQCLEAN_SPHINCSHARAKA256FROBUST_AESNI_WOTS_W 16 diff --git a/src/sig/sphincs/pqclean_sphincs-haraka-256f-robust_clean/api.h b/src/sig/sphincs/pqclean_sphincs-haraka-256f-robust_clean/api.h index 1537adeaf..dcdb8850a 100644 --- a/src/sig/sphincs/pqclean_sphincs-haraka-256f-robust_clean/api.h +++ b/src/sig/sphincs/pqclean_sphincs-haraka-256f-robust_clean/api.h @@ -10,7 +10,7 @@ #define PQCLEAN_SPHINCSHARAKA256FROBUST_CLEAN_CRYPTO_SECRETKEYBYTES 128 #define PQCLEAN_SPHINCSHARAKA256FROBUST_CLEAN_CRYPTO_PUBLICKEYBYTES 64 -#define PQCLEAN_SPHINCSHARAKA256FROBUST_CLEAN_CRYPTO_BYTES 49216 +#define PQCLEAN_SPHINCSHARAKA256FROBUST_CLEAN_CRYPTO_BYTES 49856 #define PQCLEAN_SPHINCSHARAKA256FROBUST_CLEAN_CRYPTO_SEEDBYTES 96 diff --git a/src/sig/sphincs/pqclean_sphincs-haraka-256f-robust_clean/params.h b/src/sig/sphincs/pqclean_sphincs-haraka-256f-robust_clean/params.h index 5870e4314..4d457ad84 100644 --- a/src/sig/sphincs/pqclean_sphincs-haraka-256f-robust_clean/params.h +++ b/src/sig/sphincs/pqclean_sphincs-haraka-256f-robust_clean/params.h @@ -8,8 +8,8 @@ /* Number of subtree layer. */ #define PQCLEAN_SPHINCSHARAKA256FROBUST_CLEAN_D 17 /* FORS tree dimensions. */ -#define PQCLEAN_SPHINCSHARAKA256FROBUST_CLEAN_FORS_HEIGHT 10 -#define PQCLEAN_SPHINCSHARAKA256FROBUST_CLEAN_FORS_TREES 30 +#define PQCLEAN_SPHINCSHARAKA256FROBUST_CLEAN_FORS_HEIGHT 9 +#define PQCLEAN_SPHINCSHARAKA256FROBUST_CLEAN_FORS_TREES 35 /* Winternitz parameter, */ #define PQCLEAN_SPHINCSHARAKA256FROBUST_CLEAN_WOTS_W 16 diff --git a/src/sig/sphincs/pqclean_sphincs-haraka-256f-simple_aesni/api.h b/src/sig/sphincs/pqclean_sphincs-haraka-256f-simple_aesni/api.h index c61b6f639..7f3ef8c07 100644 --- a/src/sig/sphincs/pqclean_sphincs-haraka-256f-simple_aesni/api.h +++ b/src/sig/sphincs/pqclean_sphincs-haraka-256f-simple_aesni/api.h @@ -10,7 +10,7 @@ #define PQCLEAN_SPHINCSHARAKA256FSIMPLE_AESNI_CRYPTO_SECRETKEYBYTES 128 #define PQCLEAN_SPHINCSHARAKA256FSIMPLE_AESNI_CRYPTO_PUBLICKEYBYTES 64 -#define PQCLEAN_SPHINCSHARAKA256FSIMPLE_AESNI_CRYPTO_BYTES 49216 +#define PQCLEAN_SPHINCSHARAKA256FSIMPLE_AESNI_CRYPTO_BYTES 49856 #define PQCLEAN_SPHINCSHARAKA256FSIMPLE_AESNI_CRYPTO_SEEDBYTES 96 diff --git a/src/sig/sphincs/pqclean_sphincs-haraka-256f-simple_aesni/params.h b/src/sig/sphincs/pqclean_sphincs-haraka-256f-simple_aesni/params.h index 1e12a2681..c64f0330e 100644 --- a/src/sig/sphincs/pqclean_sphincs-haraka-256f-simple_aesni/params.h +++ b/src/sig/sphincs/pqclean_sphincs-haraka-256f-simple_aesni/params.h @@ -8,8 +8,8 @@ /* Number of subtree layer. */ #define PQCLEAN_SPHINCSHARAKA256FSIMPLE_AESNI_D 17 /* FORS tree dimensions. */ -#define PQCLEAN_SPHINCSHARAKA256FSIMPLE_AESNI_FORS_HEIGHT 10 -#define PQCLEAN_SPHINCSHARAKA256FSIMPLE_AESNI_FORS_TREES 30 +#define PQCLEAN_SPHINCSHARAKA256FSIMPLE_AESNI_FORS_HEIGHT 9 +#define PQCLEAN_SPHINCSHARAKA256FSIMPLE_AESNI_FORS_TREES 35 /* Winternitz parameter, */ #define PQCLEAN_SPHINCSHARAKA256FSIMPLE_AESNI_WOTS_W 16 diff --git a/src/sig/sphincs/pqclean_sphincs-haraka-256f-simple_clean/api.h b/src/sig/sphincs/pqclean_sphincs-haraka-256f-simple_clean/api.h index bc39e1c78..135cc297c 100644 --- a/src/sig/sphincs/pqclean_sphincs-haraka-256f-simple_clean/api.h +++ b/src/sig/sphincs/pqclean_sphincs-haraka-256f-simple_clean/api.h @@ -10,7 +10,7 @@ #define PQCLEAN_SPHINCSHARAKA256FSIMPLE_CLEAN_CRYPTO_SECRETKEYBYTES 128 #define PQCLEAN_SPHINCSHARAKA256FSIMPLE_CLEAN_CRYPTO_PUBLICKEYBYTES 64 -#define PQCLEAN_SPHINCSHARAKA256FSIMPLE_CLEAN_CRYPTO_BYTES 49216 +#define PQCLEAN_SPHINCSHARAKA256FSIMPLE_CLEAN_CRYPTO_BYTES 49856 #define PQCLEAN_SPHINCSHARAKA256FSIMPLE_CLEAN_CRYPTO_SEEDBYTES 96 diff --git a/src/sig/sphincs/pqclean_sphincs-haraka-256f-simple_clean/params.h b/src/sig/sphincs/pqclean_sphincs-haraka-256f-simple_clean/params.h index d14d3d9a7..ccd14efda 100644 --- a/src/sig/sphincs/pqclean_sphincs-haraka-256f-simple_clean/params.h +++ b/src/sig/sphincs/pqclean_sphincs-haraka-256f-simple_clean/params.h @@ -8,8 +8,8 @@ /* Number of subtree layer. */ #define PQCLEAN_SPHINCSHARAKA256FSIMPLE_CLEAN_D 17 /* FORS tree dimensions. */ -#define PQCLEAN_SPHINCSHARAKA256FSIMPLE_CLEAN_FORS_HEIGHT 10 -#define PQCLEAN_SPHINCSHARAKA256FSIMPLE_CLEAN_FORS_TREES 30 +#define PQCLEAN_SPHINCSHARAKA256FSIMPLE_CLEAN_FORS_HEIGHT 9 +#define PQCLEAN_SPHINCSHARAKA256FSIMPLE_CLEAN_FORS_TREES 35 /* Winternitz parameter, */ #define PQCLEAN_SPHINCSHARAKA256FSIMPLE_CLEAN_WOTS_W 16 diff --git a/src/sig/sphincs/pqclean_sphincs-sha256-128f-robust_avx2/api.h b/src/sig/sphincs/pqclean_sphincs-sha256-128f-robust_avx2/api.h index a62b3a1f9..7eee4673d 100644 --- a/src/sig/sphincs/pqclean_sphincs-sha256-128f-robust_avx2/api.h +++ b/src/sig/sphincs/pqclean_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 diff --git a/src/sig/sphincs/pqclean_sphincs-sha256-128f-robust_avx2/params.h b/src/sig/sphincs/pqclean_sphincs-sha256-128f-robust_avx2/params.h index 14a7ed472..69ab9a2e4 100644 --- a/src/sig/sphincs/pqclean_sphincs-sha256-128f-robust_avx2/params.h +++ b/src/sig/sphincs/pqclean_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_TREES 30 +#define PQCLEAN_SPHINCSSHA256128FROBUST_AVX2_FORS_HEIGHT 6 +#define PQCLEAN_SPHINCSSHA256128FROBUST_AVX2_FORS_TREES 33 /* Winternitz parameter, */ #define PQCLEAN_SPHINCSSHA256128FROBUST_AVX2_WOTS_W 16 diff --git a/src/sig/sphincs/pqclean_sphincs-sha256-128f-robust_clean/api.h b/src/sig/sphincs/pqclean_sphincs-sha256-128f-robust_clean/api.h index cda169d10..b446d6d24 100644 --- a/src/sig/sphincs/pqclean_sphincs-sha256-128f-robust_clean/api.h +++ b/src/sig/sphincs/pqclean_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 diff --git a/src/sig/sphincs/pqclean_sphincs-sha256-128f-robust_clean/params.h b/src/sig/sphincs/pqclean_sphincs-sha256-128f-robust_clean/params.h index e071c6b11..497428813 100644 --- a/src/sig/sphincs/pqclean_sphincs-sha256-128f-robust_clean/params.h +++ b/src/sig/sphincs/pqclean_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_TREES 30 +#define PQCLEAN_SPHINCSSHA256128FROBUST_CLEAN_FORS_HEIGHT 6 +#define PQCLEAN_SPHINCSSHA256128FROBUST_CLEAN_FORS_TREES 33 /* Winternitz parameter, */ #define PQCLEAN_SPHINCSSHA256128FROBUST_CLEAN_WOTS_W 16 diff --git a/src/sig/sphincs/pqclean_sphincs-sha256-128f-simple_avx2/api.h b/src/sig/sphincs/pqclean_sphincs-sha256-128f-simple_avx2/api.h index f6deb1624..65a846372 100644 --- a/src/sig/sphincs/pqclean_sphincs-sha256-128f-simple_avx2/api.h +++ b/src/sig/sphincs/pqclean_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 diff --git a/src/sig/sphincs/pqclean_sphincs-sha256-128f-simple_avx2/params.h b/src/sig/sphincs/pqclean_sphincs-sha256-128f-simple_avx2/params.h index b1c866747..07087e08e 100644 --- a/src/sig/sphincs/pqclean_sphincs-sha256-128f-simple_avx2/params.h +++ b/src/sig/sphincs/pqclean_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_TREES 30 +#define PQCLEAN_SPHINCSSHA256128FSIMPLE_AVX2_FORS_HEIGHT 6 +#define PQCLEAN_SPHINCSSHA256128FSIMPLE_AVX2_FORS_TREES 33 /* Winternitz parameter, */ #define PQCLEAN_SPHINCSSHA256128FSIMPLE_AVX2_WOTS_W 16 diff --git a/src/sig/sphincs/pqclean_sphincs-sha256-128f-simple_clean/api.h b/src/sig/sphincs/pqclean_sphincs-sha256-128f-simple_clean/api.h index cdd6b60d7..c586aa23e 100644 --- a/src/sig/sphincs/pqclean_sphincs-sha256-128f-simple_clean/api.h +++ b/src/sig/sphincs/pqclean_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 diff --git a/src/sig/sphincs/pqclean_sphincs-sha256-128f-simple_clean/params.h b/src/sig/sphincs/pqclean_sphincs-sha256-128f-simple_clean/params.h index 2809f0ae6..6e61d9521 100644 --- a/src/sig/sphincs/pqclean_sphincs-sha256-128f-simple_clean/params.h +++ b/src/sig/sphincs/pqclean_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_TREES 30 +#define PQCLEAN_SPHINCSSHA256128FSIMPLE_CLEAN_FORS_HEIGHT 6 +#define PQCLEAN_SPHINCSSHA256128FSIMPLE_CLEAN_FORS_TREES 33 /* Winternitz parameter, */ #define PQCLEAN_SPHINCSSHA256128FSIMPLE_CLEAN_WOTS_W 16 diff --git a/src/sig/sphincs/pqclean_sphincs-sha256-128s-robust_avx2/api.h b/src/sig/sphincs/pqclean_sphincs-sha256-128s-robust_avx2/api.h index 50be23a72..ccb669d56 100644 --- a/src/sig/sphincs/pqclean_sphincs-sha256-128s-robust_avx2/api.h +++ b/src/sig/sphincs/pqclean_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 diff --git a/src/sig/sphincs/pqclean_sphincs-sha256-128s-robust_avx2/params.h b/src/sig/sphincs/pqclean_sphincs-sha256-128s-robust_avx2/params.h index b12cd7411..2a9f01347 100644 --- a/src/sig/sphincs/pqclean_sphincs-sha256-128s-robust_avx2/params.h +++ b/src/sig/sphincs/pqclean_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_TREES 10 +#define PQCLEAN_SPHINCSSHA256128SROBUST_AVX2_FORS_HEIGHT 12 +#define PQCLEAN_SPHINCSSHA256128SROBUST_AVX2_FORS_TREES 14 /* Winternitz parameter, */ #define PQCLEAN_SPHINCSSHA256128SROBUST_AVX2_WOTS_W 16 diff --git a/src/sig/sphincs/pqclean_sphincs-sha256-128s-robust_clean/api.h b/src/sig/sphincs/pqclean_sphincs-sha256-128s-robust_clean/api.h index 9db23cf5e..129c42b73 100644 --- a/src/sig/sphincs/pqclean_sphincs-sha256-128s-robust_clean/api.h +++ b/src/sig/sphincs/pqclean_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 diff --git a/src/sig/sphincs/pqclean_sphincs-sha256-128s-robust_clean/params.h b/src/sig/sphincs/pqclean_sphincs-sha256-128s-robust_clean/params.h index 8690edb1c..27c7c8f35 100644 --- a/src/sig/sphincs/pqclean_sphincs-sha256-128s-robust_clean/params.h +++ b/src/sig/sphincs/pqclean_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_TREES 10 +#define PQCLEAN_SPHINCSSHA256128SROBUST_CLEAN_FORS_HEIGHT 12 +#define PQCLEAN_SPHINCSSHA256128SROBUST_CLEAN_FORS_TREES 14 /* Winternitz parameter, */ #define PQCLEAN_SPHINCSSHA256128SROBUST_CLEAN_WOTS_W 16 diff --git a/src/sig/sphincs/pqclean_sphincs-sha256-128s-simple_avx2/api.h b/src/sig/sphincs/pqclean_sphincs-sha256-128s-simple_avx2/api.h index f676864e8..a0e22a4a7 100644 --- a/src/sig/sphincs/pqclean_sphincs-sha256-128s-simple_avx2/api.h +++ b/src/sig/sphincs/pqclean_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 diff --git a/src/sig/sphincs/pqclean_sphincs-sha256-128s-simple_avx2/params.h b/src/sig/sphincs/pqclean_sphincs-sha256-128s-simple_avx2/params.h index e6b3b5bd8..a9b2caf96 100644 --- a/src/sig/sphincs/pqclean_sphincs-sha256-128s-simple_avx2/params.h +++ b/src/sig/sphincs/pqclean_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_TREES 10 +#define PQCLEAN_SPHINCSSHA256128SSIMPLE_AVX2_FORS_HEIGHT 12 +#define PQCLEAN_SPHINCSSHA256128SSIMPLE_AVX2_FORS_TREES 14 /* Winternitz parameter, */ #define PQCLEAN_SPHINCSSHA256128SSIMPLE_AVX2_WOTS_W 16 diff --git a/src/sig/sphincs/pqclean_sphincs-sha256-128s-simple_clean/api.h b/src/sig/sphincs/pqclean_sphincs-sha256-128s-simple_clean/api.h index 5f39d55cd..126e4fc14 100644 --- a/src/sig/sphincs/pqclean_sphincs-sha256-128s-simple_clean/api.h +++ b/src/sig/sphincs/pqclean_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 diff --git a/src/sig/sphincs/pqclean_sphincs-sha256-128s-simple_clean/params.h b/src/sig/sphincs/pqclean_sphincs-sha256-128s-simple_clean/params.h index d3063cccc..1c922f492 100644 --- a/src/sig/sphincs/pqclean_sphincs-sha256-128s-simple_clean/params.h +++ b/src/sig/sphincs/pqclean_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_TREES 10 +#define PQCLEAN_SPHINCSSHA256128SSIMPLE_CLEAN_FORS_HEIGHT 12 +#define PQCLEAN_SPHINCSSHA256128SSIMPLE_CLEAN_FORS_TREES 14 /* Winternitz parameter, */ #define PQCLEAN_SPHINCSSHA256128SSIMPLE_CLEAN_WOTS_W 16 diff --git a/src/sig/sphincs/pqclean_sphincs-sha256-192s-robust_avx2/api.h b/src/sig/sphincs/pqclean_sphincs-sha256-192s-robust_avx2/api.h index a49c3ad16..6d3e8e671 100644 --- a/src/sig/sphincs/pqclean_sphincs-sha256-192s-robust_avx2/api.h +++ b/src/sig/sphincs/pqclean_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 diff --git a/src/sig/sphincs/pqclean_sphincs-sha256-192s-robust_avx2/params.h b/src/sig/sphincs/pqclean_sphincs-sha256-192s-robust_avx2/params.h index c657073fa..0be7e4d85 100644 --- a/src/sig/sphincs/pqclean_sphincs-sha256-192s-robust_avx2/params.h +++ b/src/sig/sphincs/pqclean_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_TREES 14 +#define PQCLEAN_SPHINCSSHA256192SROBUST_AVX2_FORS_HEIGHT 14 +#define PQCLEAN_SPHINCSSHA256192SROBUST_AVX2_FORS_TREES 17 /* Winternitz parameter, */ #define PQCLEAN_SPHINCSSHA256192SROBUST_AVX2_WOTS_W 16 diff --git a/src/sig/sphincs/pqclean_sphincs-sha256-192s-robust_clean/api.h b/src/sig/sphincs/pqclean_sphincs-sha256-192s-robust_clean/api.h index cbcbd6364..676cf6ded 100644 --- a/src/sig/sphincs/pqclean_sphincs-sha256-192s-robust_clean/api.h +++ b/src/sig/sphincs/pqclean_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 diff --git a/src/sig/sphincs/pqclean_sphincs-sha256-192s-robust_clean/params.h b/src/sig/sphincs/pqclean_sphincs-sha256-192s-robust_clean/params.h index 1d4451ad6..39da76945 100644 --- a/src/sig/sphincs/pqclean_sphincs-sha256-192s-robust_clean/params.h +++ b/src/sig/sphincs/pqclean_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_TREES 14 +#define PQCLEAN_SPHINCSSHA256192SROBUST_CLEAN_FORS_HEIGHT 14 +#define PQCLEAN_SPHINCSSHA256192SROBUST_CLEAN_FORS_TREES 17 /* Winternitz parameter, */ #define PQCLEAN_SPHINCSSHA256192SROBUST_CLEAN_WOTS_W 16 diff --git a/src/sig/sphincs/pqclean_sphincs-sha256-192s-simple_avx2/api.h b/src/sig/sphincs/pqclean_sphincs-sha256-192s-simple_avx2/api.h index 06c958e04..9a553735b 100644 --- a/src/sig/sphincs/pqclean_sphincs-sha256-192s-simple_avx2/api.h +++ b/src/sig/sphincs/pqclean_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 diff --git a/src/sig/sphincs/pqclean_sphincs-sha256-192s-simple_avx2/params.h b/src/sig/sphincs/pqclean_sphincs-sha256-192s-simple_avx2/params.h index 7aae96184..9de35fc02 100644 --- a/src/sig/sphincs/pqclean_sphincs-sha256-192s-simple_avx2/params.h +++ b/src/sig/sphincs/pqclean_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_TREES 14 +#define PQCLEAN_SPHINCSSHA256192SSIMPLE_AVX2_FORS_HEIGHT 14 +#define PQCLEAN_SPHINCSSHA256192SSIMPLE_AVX2_FORS_TREES 17 /* Winternitz parameter, */ #define PQCLEAN_SPHINCSSHA256192SSIMPLE_AVX2_WOTS_W 16 diff --git a/src/sig/sphincs/pqclean_sphincs-sha256-192s-simple_clean/api.h b/src/sig/sphincs/pqclean_sphincs-sha256-192s-simple_clean/api.h index a55e5c04f..6fd0da9b8 100644 --- a/src/sig/sphincs/pqclean_sphincs-sha256-192s-simple_clean/api.h +++ b/src/sig/sphincs/pqclean_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 diff --git a/src/sig/sphincs/pqclean_sphincs-sha256-192s-simple_clean/params.h b/src/sig/sphincs/pqclean_sphincs-sha256-192s-simple_clean/params.h index fe1a82c9e..2ad30041d 100644 --- a/src/sig/sphincs/pqclean_sphincs-sha256-192s-simple_clean/params.h +++ b/src/sig/sphincs/pqclean_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_TREES 14 +#define PQCLEAN_SPHINCSSHA256192SSIMPLE_CLEAN_FORS_HEIGHT 14 +#define PQCLEAN_SPHINCSSHA256192SSIMPLE_CLEAN_FORS_TREES 17 /* Winternitz parameter, */ #define PQCLEAN_SPHINCSSHA256192SSIMPLE_CLEAN_WOTS_W 16 diff --git a/src/sig/sphincs/pqclean_sphincs-sha256-256f-robust_avx2/api.h b/src/sig/sphincs/pqclean_sphincs-sha256-256f-robust_avx2/api.h index 8d570365b..2fd0eddf3 100644 --- a/src/sig/sphincs/pqclean_sphincs-sha256-256f-robust_avx2/api.h +++ b/src/sig/sphincs/pqclean_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 diff --git a/src/sig/sphincs/pqclean_sphincs-sha256-256f-robust_avx2/params.h b/src/sig/sphincs/pqclean_sphincs-sha256-256f-robust_avx2/params.h index 80770eb98..b7a31465f 100644 --- a/src/sig/sphincs/pqclean_sphincs-sha256-256f-robust_avx2/params.h +++ b/src/sig/sphincs/pqclean_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_TREES 30 +#define PQCLEAN_SPHINCSSHA256256FROBUST_AVX2_FORS_HEIGHT 9 +#define PQCLEAN_SPHINCSSHA256256FROBUST_AVX2_FORS_TREES 35 /* Winternitz parameter, */ #define PQCLEAN_SPHINCSSHA256256FROBUST_AVX2_WOTS_W 16 diff --git a/src/sig/sphincs/pqclean_sphincs-sha256-256f-robust_clean/api.h b/src/sig/sphincs/pqclean_sphincs-sha256-256f-robust_clean/api.h index 4380b40dc..be2b9e7bf 100644 --- a/src/sig/sphincs/pqclean_sphincs-sha256-256f-robust_clean/api.h +++ b/src/sig/sphincs/pqclean_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 diff --git a/src/sig/sphincs/pqclean_sphincs-sha256-256f-robust_clean/params.h b/src/sig/sphincs/pqclean_sphincs-sha256-256f-robust_clean/params.h index 0f13fb0cb..eed5f2d29 100644 --- a/src/sig/sphincs/pqclean_sphincs-sha256-256f-robust_clean/params.h +++ b/src/sig/sphincs/pqclean_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_TREES 30 +#define PQCLEAN_SPHINCSSHA256256FROBUST_CLEAN_FORS_HEIGHT 9 +#define PQCLEAN_SPHINCSSHA256256FROBUST_CLEAN_FORS_TREES 35 /* Winternitz parameter, */ #define PQCLEAN_SPHINCSSHA256256FROBUST_CLEAN_WOTS_W 16 diff --git a/src/sig/sphincs/pqclean_sphincs-sha256-256f-simple_avx2/api.h b/src/sig/sphincs/pqclean_sphincs-sha256-256f-simple_avx2/api.h index 1d7945c44..c95d5734f 100644 --- a/src/sig/sphincs/pqclean_sphincs-sha256-256f-simple_avx2/api.h +++ b/src/sig/sphincs/pqclean_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 diff --git a/src/sig/sphincs/pqclean_sphincs-sha256-256f-simple_avx2/params.h b/src/sig/sphincs/pqclean_sphincs-sha256-256f-simple_avx2/params.h index 68350c37f..2e804440a 100644 --- a/src/sig/sphincs/pqclean_sphincs-sha256-256f-simple_avx2/params.h +++ b/src/sig/sphincs/pqclean_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_TREES 30 +#define PQCLEAN_SPHINCSSHA256256FSIMPLE_AVX2_FORS_HEIGHT 9 +#define PQCLEAN_SPHINCSSHA256256FSIMPLE_AVX2_FORS_TREES 35 /* Winternitz parameter, */ #define PQCLEAN_SPHINCSSHA256256FSIMPLE_AVX2_WOTS_W 16 diff --git a/src/sig/sphincs/pqclean_sphincs-sha256-256f-simple_clean/api.h b/src/sig/sphincs/pqclean_sphincs-sha256-256f-simple_clean/api.h index e2c304f3e..57585c80c 100644 --- a/src/sig/sphincs/pqclean_sphincs-sha256-256f-simple_clean/api.h +++ b/src/sig/sphincs/pqclean_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 diff --git a/src/sig/sphincs/pqclean_sphincs-sha256-256f-simple_clean/params.h b/src/sig/sphincs/pqclean_sphincs-sha256-256f-simple_clean/params.h index ee98a9f46..c4dc2f8e1 100644 --- a/src/sig/sphincs/pqclean_sphincs-sha256-256f-simple_clean/params.h +++ b/src/sig/sphincs/pqclean_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_TREES 30 +#define PQCLEAN_SPHINCSSHA256256FSIMPLE_CLEAN_FORS_HEIGHT 9 +#define PQCLEAN_SPHINCSSHA256256FSIMPLE_CLEAN_FORS_TREES 35 /* Winternitz parameter, */ #define PQCLEAN_SPHINCSSHA256256FSIMPLE_CLEAN_WOTS_W 16 diff --git a/src/sig/sphincs/pqclean_sphincs-shake256-128f-robust_avx2/api.h b/src/sig/sphincs/pqclean_sphincs-shake256-128f-robust_avx2/api.h index 590857307..2a38ede1b 100644 --- a/src/sig/sphincs/pqclean_sphincs-shake256-128f-robust_avx2/api.h +++ b/src/sig/sphincs/pqclean_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 diff --git a/src/sig/sphincs/pqclean_sphincs-shake256-128f-robust_avx2/params.h b/src/sig/sphincs/pqclean_sphincs-shake256-128f-robust_avx2/params.h index 5cc9a125e..fb2f1dc4f 100644 --- a/src/sig/sphincs/pqclean_sphincs-shake256-128f-robust_avx2/params.h +++ b/src/sig/sphincs/pqclean_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_TREES 30 +#define PQCLEAN_SPHINCSSHAKE256128FROBUST_AVX2_FORS_HEIGHT 6 +#define PQCLEAN_SPHINCSSHAKE256128FROBUST_AVX2_FORS_TREES 33 /* Winternitz parameter, */ #define PQCLEAN_SPHINCSSHAKE256128FROBUST_AVX2_WOTS_W 16 diff --git a/src/sig/sphincs/pqclean_sphincs-shake256-128f-robust_clean/api.h b/src/sig/sphincs/pqclean_sphincs-shake256-128f-robust_clean/api.h index 7e0254879..cacddd5f4 100644 --- a/src/sig/sphincs/pqclean_sphincs-shake256-128f-robust_clean/api.h +++ b/src/sig/sphincs/pqclean_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 diff --git a/src/sig/sphincs/pqclean_sphincs-shake256-128f-robust_clean/params.h b/src/sig/sphincs/pqclean_sphincs-shake256-128f-robust_clean/params.h index dd72b607e..fd502f7cd 100644 --- a/src/sig/sphincs/pqclean_sphincs-shake256-128f-robust_clean/params.h +++ b/src/sig/sphincs/pqclean_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_TREES 30 +#define PQCLEAN_SPHINCSSHAKE256128FROBUST_CLEAN_FORS_HEIGHT 6 +#define PQCLEAN_SPHINCSSHAKE256128FROBUST_CLEAN_FORS_TREES 33 /* Winternitz parameter, */ #define PQCLEAN_SPHINCSSHAKE256128FROBUST_CLEAN_WOTS_W 16 diff --git a/src/sig/sphincs/pqclean_sphincs-shake256-128f-simple_avx2/api.h b/src/sig/sphincs/pqclean_sphincs-shake256-128f-simple_avx2/api.h index 1a6555c9b..11e99162c 100644 --- a/src/sig/sphincs/pqclean_sphincs-shake256-128f-simple_avx2/api.h +++ b/src/sig/sphincs/pqclean_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 diff --git a/src/sig/sphincs/pqclean_sphincs-shake256-128f-simple_avx2/params.h b/src/sig/sphincs/pqclean_sphincs-shake256-128f-simple_avx2/params.h index f105ab18f..ff33882a7 100644 --- a/src/sig/sphincs/pqclean_sphincs-shake256-128f-simple_avx2/params.h +++ b/src/sig/sphincs/pqclean_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_TREES 30 +#define PQCLEAN_SPHINCSSHAKE256128FSIMPLE_AVX2_FORS_HEIGHT 6 +#define PQCLEAN_SPHINCSSHAKE256128FSIMPLE_AVX2_FORS_TREES 33 /* Winternitz parameter, */ #define PQCLEAN_SPHINCSSHAKE256128FSIMPLE_AVX2_WOTS_W 16 diff --git a/src/sig/sphincs/pqclean_sphincs-shake256-128f-simple_clean/api.h b/src/sig/sphincs/pqclean_sphincs-shake256-128f-simple_clean/api.h index fce0e50b9..512bd9a06 100644 --- a/src/sig/sphincs/pqclean_sphincs-shake256-128f-simple_clean/api.h +++ b/src/sig/sphincs/pqclean_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 diff --git a/src/sig/sphincs/pqclean_sphincs-shake256-128f-simple_clean/params.h b/src/sig/sphincs/pqclean_sphincs-shake256-128f-simple_clean/params.h index c76018b01..9f0030dd8 100644 --- a/src/sig/sphincs/pqclean_sphincs-shake256-128f-simple_clean/params.h +++ b/src/sig/sphincs/pqclean_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_TREES 30 +#define PQCLEAN_SPHINCSSHAKE256128FSIMPLE_CLEAN_FORS_HEIGHT 6 +#define PQCLEAN_SPHINCSSHAKE256128FSIMPLE_CLEAN_FORS_TREES 33 /* Winternitz parameter, */ #define PQCLEAN_SPHINCSSHAKE256128FSIMPLE_CLEAN_WOTS_W 16 diff --git a/src/sig/sphincs/pqclean_sphincs-shake256-128s-robust_avx2/api.h b/src/sig/sphincs/pqclean_sphincs-shake256-128s-robust_avx2/api.h index c0c03a0a0..3a38ae160 100644 --- a/src/sig/sphincs/pqclean_sphincs-shake256-128s-robust_avx2/api.h +++ b/src/sig/sphincs/pqclean_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 diff --git a/src/sig/sphincs/pqclean_sphincs-shake256-128s-robust_avx2/params.h b/src/sig/sphincs/pqclean_sphincs-shake256-128s-robust_avx2/params.h index e589170ba..2f73d47dc 100644 --- a/src/sig/sphincs/pqclean_sphincs-shake256-128s-robust_avx2/params.h +++ b/src/sig/sphincs/pqclean_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_TREES 10 +#define PQCLEAN_SPHINCSSHAKE256128SROBUST_AVX2_FORS_HEIGHT 12 +#define PQCLEAN_SPHINCSSHAKE256128SROBUST_AVX2_FORS_TREES 14 /* Winternitz parameter, */ #define PQCLEAN_SPHINCSSHAKE256128SROBUST_AVX2_WOTS_W 16 diff --git a/src/sig/sphincs/pqclean_sphincs-shake256-128s-robust_clean/api.h b/src/sig/sphincs/pqclean_sphincs-shake256-128s-robust_clean/api.h index 0c84a169b..a176c44d2 100644 --- a/src/sig/sphincs/pqclean_sphincs-shake256-128s-robust_clean/api.h +++ b/src/sig/sphincs/pqclean_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 diff --git a/src/sig/sphincs/pqclean_sphincs-shake256-128s-robust_clean/params.h b/src/sig/sphincs/pqclean_sphincs-shake256-128s-robust_clean/params.h index 52050aa10..17746ed8c 100644 --- a/src/sig/sphincs/pqclean_sphincs-shake256-128s-robust_clean/params.h +++ b/src/sig/sphincs/pqclean_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_TREES 10 +#define PQCLEAN_SPHINCSSHAKE256128SROBUST_CLEAN_FORS_HEIGHT 12 +#define PQCLEAN_SPHINCSSHAKE256128SROBUST_CLEAN_FORS_TREES 14 /* Winternitz parameter, */ #define PQCLEAN_SPHINCSSHAKE256128SROBUST_CLEAN_WOTS_W 16 diff --git a/src/sig/sphincs/pqclean_sphincs-shake256-128s-simple_avx2/api.h b/src/sig/sphincs/pqclean_sphincs-shake256-128s-simple_avx2/api.h index 8fccf5d16..4206b2949 100644 --- a/src/sig/sphincs/pqclean_sphincs-shake256-128s-simple_avx2/api.h +++ b/src/sig/sphincs/pqclean_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 diff --git a/src/sig/sphincs/pqclean_sphincs-shake256-128s-simple_avx2/params.h b/src/sig/sphincs/pqclean_sphincs-shake256-128s-simple_avx2/params.h index 211e4b928..e5eb8b52c 100644 --- a/src/sig/sphincs/pqclean_sphincs-shake256-128s-simple_avx2/params.h +++ b/src/sig/sphincs/pqclean_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_TREES 10 +#define PQCLEAN_SPHINCSSHAKE256128SSIMPLE_AVX2_FORS_HEIGHT 12 +#define PQCLEAN_SPHINCSSHAKE256128SSIMPLE_AVX2_FORS_TREES 14 /* Winternitz parameter, */ #define PQCLEAN_SPHINCSSHAKE256128SSIMPLE_AVX2_WOTS_W 16 diff --git a/src/sig/sphincs/pqclean_sphincs-shake256-128s-simple_clean/api.h b/src/sig/sphincs/pqclean_sphincs-shake256-128s-simple_clean/api.h index 053f985cd..0199d7bcf 100644 --- a/src/sig/sphincs/pqclean_sphincs-shake256-128s-simple_clean/api.h +++ b/src/sig/sphincs/pqclean_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 diff --git a/src/sig/sphincs/pqclean_sphincs-shake256-128s-simple_clean/params.h b/src/sig/sphincs/pqclean_sphincs-shake256-128s-simple_clean/params.h index e4d0ec495..e6b382ff4 100644 --- a/src/sig/sphincs/pqclean_sphincs-shake256-128s-simple_clean/params.h +++ b/src/sig/sphincs/pqclean_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_TREES 10 +#define PQCLEAN_SPHINCSSHAKE256128SSIMPLE_CLEAN_FORS_HEIGHT 12 +#define PQCLEAN_SPHINCSSHAKE256128SSIMPLE_CLEAN_FORS_TREES 14 /* Winternitz parameter, */ #define PQCLEAN_SPHINCSSHAKE256128SSIMPLE_CLEAN_WOTS_W 16 diff --git a/src/sig/sphincs/pqclean_sphincs-shake256-192s-robust_avx2/api.h b/src/sig/sphincs/pqclean_sphincs-shake256-192s-robust_avx2/api.h index 25a193df7..05fca01b7 100644 --- a/src/sig/sphincs/pqclean_sphincs-shake256-192s-robust_avx2/api.h +++ b/src/sig/sphincs/pqclean_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 diff --git a/src/sig/sphincs/pqclean_sphincs-shake256-192s-robust_avx2/params.h b/src/sig/sphincs/pqclean_sphincs-shake256-192s-robust_avx2/params.h index 3a81fd64a..ebfac6eb7 100644 --- a/src/sig/sphincs/pqclean_sphincs-shake256-192s-robust_avx2/params.h +++ b/src/sig/sphincs/pqclean_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_TREES 14 +#define PQCLEAN_SPHINCSSHAKE256192SROBUST_AVX2_FORS_HEIGHT 14 +#define PQCLEAN_SPHINCSSHAKE256192SROBUST_AVX2_FORS_TREES 17 /* Winternitz parameter, */ #define PQCLEAN_SPHINCSSHAKE256192SROBUST_AVX2_WOTS_W 16 diff --git a/src/sig/sphincs/pqclean_sphincs-shake256-192s-robust_clean/api.h b/src/sig/sphincs/pqclean_sphincs-shake256-192s-robust_clean/api.h index d7b4657b1..4b60c9402 100644 --- a/src/sig/sphincs/pqclean_sphincs-shake256-192s-robust_clean/api.h +++ b/src/sig/sphincs/pqclean_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 diff --git a/src/sig/sphincs/pqclean_sphincs-shake256-192s-robust_clean/params.h b/src/sig/sphincs/pqclean_sphincs-shake256-192s-robust_clean/params.h index 99ef148c1..481b506db 100644 --- a/src/sig/sphincs/pqclean_sphincs-shake256-192s-robust_clean/params.h +++ b/src/sig/sphincs/pqclean_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_TREES 14 +#define PQCLEAN_SPHINCSSHAKE256192SROBUST_CLEAN_FORS_HEIGHT 14 +#define PQCLEAN_SPHINCSSHAKE256192SROBUST_CLEAN_FORS_TREES 17 /* Winternitz parameter, */ #define PQCLEAN_SPHINCSSHAKE256192SROBUST_CLEAN_WOTS_W 16 diff --git a/src/sig/sphincs/pqclean_sphincs-shake256-192s-simple_avx2/api.h b/src/sig/sphincs/pqclean_sphincs-shake256-192s-simple_avx2/api.h index 0f6cfe1c8..c15a93cc1 100644 --- a/src/sig/sphincs/pqclean_sphincs-shake256-192s-simple_avx2/api.h +++ b/src/sig/sphincs/pqclean_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 diff --git a/src/sig/sphincs/pqclean_sphincs-shake256-192s-simple_avx2/params.h b/src/sig/sphincs/pqclean_sphincs-shake256-192s-simple_avx2/params.h index 3e3337667..049322c64 100644 --- a/src/sig/sphincs/pqclean_sphincs-shake256-192s-simple_avx2/params.h +++ b/src/sig/sphincs/pqclean_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_TREES 14 +#define PQCLEAN_SPHINCSSHAKE256192SSIMPLE_AVX2_FORS_HEIGHT 14 +#define PQCLEAN_SPHINCSSHAKE256192SSIMPLE_AVX2_FORS_TREES 17 /* Winternitz parameter, */ #define PQCLEAN_SPHINCSSHAKE256192SSIMPLE_AVX2_WOTS_W 16 diff --git a/src/sig/sphincs/pqclean_sphincs-shake256-192s-simple_clean/api.h b/src/sig/sphincs/pqclean_sphincs-shake256-192s-simple_clean/api.h index 102f6ae6e..69490ec3f 100644 --- a/src/sig/sphincs/pqclean_sphincs-shake256-192s-simple_clean/api.h +++ b/src/sig/sphincs/pqclean_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 diff --git a/src/sig/sphincs/pqclean_sphincs-shake256-192s-simple_clean/params.h b/src/sig/sphincs/pqclean_sphincs-shake256-192s-simple_clean/params.h index bb6f8785a..c75842b5b 100644 --- a/src/sig/sphincs/pqclean_sphincs-shake256-192s-simple_clean/params.h +++ b/src/sig/sphincs/pqclean_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_TREES 14 +#define PQCLEAN_SPHINCSSHAKE256192SSIMPLE_CLEAN_FORS_HEIGHT 14 +#define PQCLEAN_SPHINCSSHAKE256192SSIMPLE_CLEAN_FORS_TREES 17 /* Winternitz parameter, */ #define PQCLEAN_SPHINCSSHAKE256192SSIMPLE_CLEAN_WOTS_W 16 diff --git a/src/sig/sphincs/pqclean_sphincs-shake256-256f-robust_avx2/api.h b/src/sig/sphincs/pqclean_sphincs-shake256-256f-robust_avx2/api.h index 8689745da..e11cd6140 100644 --- a/src/sig/sphincs/pqclean_sphincs-shake256-256f-robust_avx2/api.h +++ b/src/sig/sphincs/pqclean_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 diff --git a/src/sig/sphincs/pqclean_sphincs-shake256-256f-robust_avx2/params.h b/src/sig/sphincs/pqclean_sphincs-shake256-256f-robust_avx2/params.h index 534826caa..29811afde 100644 --- a/src/sig/sphincs/pqclean_sphincs-shake256-256f-robust_avx2/params.h +++ b/src/sig/sphincs/pqclean_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_TREES 30 +#define PQCLEAN_SPHINCSSHAKE256256FROBUST_AVX2_FORS_HEIGHT 9 +#define PQCLEAN_SPHINCSSHAKE256256FROBUST_AVX2_FORS_TREES 35 /* Winternitz parameter, */ #define PQCLEAN_SPHINCSSHAKE256256FROBUST_AVX2_WOTS_W 16 diff --git a/src/sig/sphincs/pqclean_sphincs-shake256-256f-robust_clean/api.h b/src/sig/sphincs/pqclean_sphincs-shake256-256f-robust_clean/api.h index 6387b0545..8c87a6be3 100644 --- a/src/sig/sphincs/pqclean_sphincs-shake256-256f-robust_clean/api.h +++ b/src/sig/sphincs/pqclean_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 diff --git a/src/sig/sphincs/pqclean_sphincs-shake256-256f-robust_clean/params.h b/src/sig/sphincs/pqclean_sphincs-shake256-256f-robust_clean/params.h index 15ce3dad4..d92758579 100644 --- a/src/sig/sphincs/pqclean_sphincs-shake256-256f-robust_clean/params.h +++ b/src/sig/sphincs/pqclean_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_TREES 30 +#define PQCLEAN_SPHINCSSHAKE256256FROBUST_CLEAN_FORS_HEIGHT 9 +#define PQCLEAN_SPHINCSSHAKE256256FROBUST_CLEAN_FORS_TREES 35 /* Winternitz parameter, */ #define PQCLEAN_SPHINCSSHAKE256256FROBUST_CLEAN_WOTS_W 16 diff --git a/src/sig/sphincs/pqclean_sphincs-shake256-256f-simple_avx2/api.h b/src/sig/sphincs/pqclean_sphincs-shake256-256f-simple_avx2/api.h index 007dfef26..1e82f9988 100644 --- a/src/sig/sphincs/pqclean_sphincs-shake256-256f-simple_avx2/api.h +++ b/src/sig/sphincs/pqclean_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 diff --git a/src/sig/sphincs/pqclean_sphincs-shake256-256f-simple_avx2/params.h b/src/sig/sphincs/pqclean_sphincs-shake256-256f-simple_avx2/params.h index 9dba4c5da..7aab103a3 100644 --- a/src/sig/sphincs/pqclean_sphincs-shake256-256f-simple_avx2/params.h +++ b/src/sig/sphincs/pqclean_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_TREES 30 +#define PQCLEAN_SPHINCSSHAKE256256FSIMPLE_AVX2_FORS_HEIGHT 9 +#define PQCLEAN_SPHINCSSHAKE256256FSIMPLE_AVX2_FORS_TREES 35 /* Winternitz parameter, */ #define PQCLEAN_SPHINCSSHAKE256256FSIMPLE_AVX2_WOTS_W 16 diff --git a/src/sig/sphincs/pqclean_sphincs-shake256-256f-simple_clean/api.h b/src/sig/sphincs/pqclean_sphincs-shake256-256f-simple_clean/api.h index fa6dac079..fd59721e3 100644 --- a/src/sig/sphincs/pqclean_sphincs-shake256-256f-simple_clean/api.h +++ b/src/sig/sphincs/pqclean_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 diff --git a/src/sig/sphincs/pqclean_sphincs-shake256-256f-simple_clean/params.h b/src/sig/sphincs/pqclean_sphincs-shake256-256f-simple_clean/params.h index ad979313a..dac379d3f 100644 --- a/src/sig/sphincs/pqclean_sphincs-shake256-256f-simple_clean/params.h +++ b/src/sig/sphincs/pqclean_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_TREES 30 +#define PQCLEAN_SPHINCSSHAKE256256FSIMPLE_CLEAN_FORS_HEIGHT 9 +#define PQCLEAN_SPHINCSSHAKE256256FSIMPLE_CLEAN_FORS_TREES 35 /* Winternitz parameter, */ #define PQCLEAN_SPHINCSSHAKE256256FSIMPLE_CLEAN_WOTS_W 16 diff --git a/src/sig/sphincs/sig_sphincs.h b/src/sig/sphincs/sig_sphincs.h index 26d3603c0..15c079030 100644 --- a/src/sig/sphincs/sig_sphincs.h +++ b/src/sig/sphincs/sig_sphincs.h @@ -8,7 +8,7 @@ #ifdef OQS_ENABLE_SIG_sphincs_haraka_128f_robust #define OQS_SIG_sphincs_haraka_128f_robust_length_public_key 32 #define OQS_SIG_sphincs_haraka_128f_robust_length_secret_key 64 -#define OQS_SIG_sphincs_haraka_128f_robust_length_signature 16976 +#define OQS_SIG_sphincs_haraka_128f_robust_length_signature 17088 OQS_SIG *OQS_SIG_sphincs_haraka_128f_robust_new(void); OQS_API OQS_STATUS OQS_SIG_sphincs_haraka_128f_robust_keypair(uint8_t *public_key, uint8_t *secret_key); @@ -19,7 +19,7 @@ OQS_API OQS_STATUS OQS_SIG_sphincs_haraka_128f_robust_verify(const uint8_t *mess #ifdef OQS_ENABLE_SIG_sphincs_haraka_128f_simple #define OQS_SIG_sphincs_haraka_128f_simple_length_public_key 32 #define OQS_SIG_sphincs_haraka_128f_simple_length_secret_key 64 -#define OQS_SIG_sphincs_haraka_128f_simple_length_signature 16976 +#define OQS_SIG_sphincs_haraka_128f_simple_length_signature 17088 OQS_SIG *OQS_SIG_sphincs_haraka_128f_simple_new(void); OQS_API OQS_STATUS OQS_SIG_sphincs_haraka_128f_simple_keypair(uint8_t *public_key, uint8_t *secret_key); @@ -30,7 +30,7 @@ OQS_API OQS_STATUS OQS_SIG_sphincs_haraka_128f_simple_verify(const uint8_t *mess #ifdef OQS_ENABLE_SIG_sphincs_haraka_128s_robust #define OQS_SIG_sphincs_haraka_128s_robust_length_public_key 32 #define OQS_SIG_sphincs_haraka_128s_robust_length_secret_key 64 -#define OQS_SIG_sphincs_haraka_128s_robust_length_signature 8080 +#define OQS_SIG_sphincs_haraka_128s_robust_length_signature 7856 OQS_SIG *OQS_SIG_sphincs_haraka_128s_robust_new(void); OQS_API OQS_STATUS OQS_SIG_sphincs_haraka_128s_robust_keypair(uint8_t *public_key, uint8_t *secret_key); @@ -41,7 +41,7 @@ OQS_API OQS_STATUS OQS_SIG_sphincs_haraka_128s_robust_verify(const uint8_t *mess #ifdef OQS_ENABLE_SIG_sphincs_haraka_128s_simple #define OQS_SIG_sphincs_haraka_128s_simple_length_public_key 32 #define OQS_SIG_sphincs_haraka_128s_simple_length_secret_key 64 -#define OQS_SIG_sphincs_haraka_128s_simple_length_signature 8080 +#define OQS_SIG_sphincs_haraka_128s_simple_length_signature 7856 OQS_SIG *OQS_SIG_sphincs_haraka_128s_simple_new(void); OQS_API OQS_STATUS OQS_SIG_sphincs_haraka_128s_simple_keypair(uint8_t *public_key, uint8_t *secret_key); @@ -74,7 +74,7 @@ OQS_API OQS_STATUS OQS_SIG_sphincs_haraka_192f_simple_verify(const uint8_t *mess #ifdef OQS_ENABLE_SIG_sphincs_haraka_192s_robust #define OQS_SIG_sphincs_haraka_192s_robust_length_public_key 48 #define OQS_SIG_sphincs_haraka_192s_robust_length_secret_key 96 -#define OQS_SIG_sphincs_haraka_192s_robust_length_signature 17064 +#define OQS_SIG_sphincs_haraka_192s_robust_length_signature 16224 OQS_SIG *OQS_SIG_sphincs_haraka_192s_robust_new(void); OQS_API OQS_STATUS OQS_SIG_sphincs_haraka_192s_robust_keypair(uint8_t *public_key, uint8_t *secret_key); @@ -85,7 +85,7 @@ OQS_API OQS_STATUS OQS_SIG_sphincs_haraka_192s_robust_verify(const uint8_t *mess #ifdef OQS_ENABLE_SIG_sphincs_haraka_192s_simple #define OQS_SIG_sphincs_haraka_192s_simple_length_public_key 48 #define OQS_SIG_sphincs_haraka_192s_simple_length_secret_key 96 -#define OQS_SIG_sphincs_haraka_192s_simple_length_signature 17064 +#define OQS_SIG_sphincs_haraka_192s_simple_length_signature 16224 OQS_SIG *OQS_SIG_sphincs_haraka_192s_simple_new(void); OQS_API OQS_STATUS OQS_SIG_sphincs_haraka_192s_simple_keypair(uint8_t *public_key, uint8_t *secret_key); @@ -96,7 +96,7 @@ OQS_API OQS_STATUS OQS_SIG_sphincs_haraka_192s_simple_verify(const uint8_t *mess #ifdef OQS_ENABLE_SIG_sphincs_haraka_256f_robust #define OQS_SIG_sphincs_haraka_256f_robust_length_public_key 64 #define OQS_SIG_sphincs_haraka_256f_robust_length_secret_key 128 -#define OQS_SIG_sphincs_haraka_256f_robust_length_signature 49216 +#define OQS_SIG_sphincs_haraka_256f_robust_length_signature 49856 OQS_SIG *OQS_SIG_sphincs_haraka_256f_robust_new(void); OQS_API OQS_STATUS OQS_SIG_sphincs_haraka_256f_robust_keypair(uint8_t *public_key, uint8_t *secret_key); @@ -107,7 +107,7 @@ OQS_API OQS_STATUS OQS_SIG_sphincs_haraka_256f_robust_verify(const uint8_t *mess #ifdef OQS_ENABLE_SIG_sphincs_haraka_256f_simple #define OQS_SIG_sphincs_haraka_256f_simple_length_public_key 64 #define OQS_SIG_sphincs_haraka_256f_simple_length_secret_key 128 -#define OQS_SIG_sphincs_haraka_256f_simple_length_signature 49216 +#define OQS_SIG_sphincs_haraka_256f_simple_length_signature 49856 OQS_SIG *OQS_SIG_sphincs_haraka_256f_simple_new(void); OQS_API OQS_STATUS OQS_SIG_sphincs_haraka_256f_simple_keypair(uint8_t *public_key, uint8_t *secret_key); @@ -140,7 +140,7 @@ OQS_API OQS_STATUS OQS_SIG_sphincs_haraka_256s_simple_verify(const uint8_t *mess #ifdef OQS_ENABLE_SIG_sphincs_sha256_128f_robust #define OQS_SIG_sphincs_sha256_128f_robust_length_public_key 32 #define OQS_SIG_sphincs_sha256_128f_robust_length_secret_key 64 -#define OQS_SIG_sphincs_sha256_128f_robust_length_signature 16976 +#define OQS_SIG_sphincs_sha256_128f_robust_length_signature 17088 OQS_SIG *OQS_SIG_sphincs_sha256_128f_robust_new(void); OQS_API OQS_STATUS OQS_SIG_sphincs_sha256_128f_robust_keypair(uint8_t *public_key, uint8_t *secret_key); @@ -151,7 +151,7 @@ OQS_API OQS_STATUS OQS_SIG_sphincs_sha256_128f_robust_verify(const uint8_t *mess #ifdef OQS_ENABLE_SIG_sphincs_sha256_128f_simple #define OQS_SIG_sphincs_sha256_128f_simple_length_public_key 32 #define OQS_SIG_sphincs_sha256_128f_simple_length_secret_key 64 -#define OQS_SIG_sphincs_sha256_128f_simple_length_signature 16976 +#define OQS_SIG_sphincs_sha256_128f_simple_length_signature 17088 OQS_SIG *OQS_SIG_sphincs_sha256_128f_simple_new(void); OQS_API OQS_STATUS OQS_SIG_sphincs_sha256_128f_simple_keypair(uint8_t *public_key, uint8_t *secret_key); @@ -162,7 +162,7 @@ OQS_API OQS_STATUS OQS_SIG_sphincs_sha256_128f_simple_verify(const uint8_t *mess #ifdef OQS_ENABLE_SIG_sphincs_sha256_128s_robust #define OQS_SIG_sphincs_sha256_128s_robust_length_public_key 32 #define OQS_SIG_sphincs_sha256_128s_robust_length_secret_key 64 -#define OQS_SIG_sphincs_sha256_128s_robust_length_signature 8080 +#define OQS_SIG_sphincs_sha256_128s_robust_length_signature 7856 OQS_SIG *OQS_SIG_sphincs_sha256_128s_robust_new(void); OQS_API OQS_STATUS OQS_SIG_sphincs_sha256_128s_robust_keypair(uint8_t *public_key, uint8_t *secret_key); @@ -173,7 +173,7 @@ OQS_API OQS_STATUS OQS_SIG_sphincs_sha256_128s_robust_verify(const uint8_t *mess #ifdef OQS_ENABLE_SIG_sphincs_sha256_128s_simple #define OQS_SIG_sphincs_sha256_128s_simple_length_public_key 32 #define OQS_SIG_sphincs_sha256_128s_simple_length_secret_key 64 -#define OQS_SIG_sphincs_sha256_128s_simple_length_signature 8080 +#define OQS_SIG_sphincs_sha256_128s_simple_length_signature 7856 OQS_SIG *OQS_SIG_sphincs_sha256_128s_simple_new(void); OQS_API OQS_STATUS OQS_SIG_sphincs_sha256_128s_simple_keypair(uint8_t *public_key, uint8_t *secret_key); @@ -206,7 +206,7 @@ OQS_API OQS_STATUS OQS_SIG_sphincs_sha256_192f_simple_verify(const uint8_t *mess #ifdef OQS_ENABLE_SIG_sphincs_sha256_192s_robust #define OQS_SIG_sphincs_sha256_192s_robust_length_public_key 48 #define OQS_SIG_sphincs_sha256_192s_robust_length_secret_key 96 -#define OQS_SIG_sphincs_sha256_192s_robust_length_signature 17064 +#define OQS_SIG_sphincs_sha256_192s_robust_length_signature 16224 OQS_SIG *OQS_SIG_sphincs_sha256_192s_robust_new(void); OQS_API OQS_STATUS OQS_SIG_sphincs_sha256_192s_robust_keypair(uint8_t *public_key, uint8_t *secret_key); @@ -217,7 +217,7 @@ OQS_API OQS_STATUS OQS_SIG_sphincs_sha256_192s_robust_verify(const uint8_t *mess #ifdef OQS_ENABLE_SIG_sphincs_sha256_192s_simple #define OQS_SIG_sphincs_sha256_192s_simple_length_public_key 48 #define OQS_SIG_sphincs_sha256_192s_simple_length_secret_key 96 -#define OQS_SIG_sphincs_sha256_192s_simple_length_signature 17064 +#define OQS_SIG_sphincs_sha256_192s_simple_length_signature 16224 OQS_SIG *OQS_SIG_sphincs_sha256_192s_simple_new(void); OQS_API OQS_STATUS OQS_SIG_sphincs_sha256_192s_simple_keypair(uint8_t *public_key, uint8_t *secret_key); @@ -228,7 +228,7 @@ OQS_API OQS_STATUS OQS_SIG_sphincs_sha256_192s_simple_verify(const uint8_t *mess #ifdef OQS_ENABLE_SIG_sphincs_sha256_256f_robust #define OQS_SIG_sphincs_sha256_256f_robust_length_public_key 64 #define OQS_SIG_sphincs_sha256_256f_robust_length_secret_key 128 -#define OQS_SIG_sphincs_sha256_256f_robust_length_signature 49216 +#define OQS_SIG_sphincs_sha256_256f_robust_length_signature 49856 OQS_SIG *OQS_SIG_sphincs_sha256_256f_robust_new(void); OQS_API OQS_STATUS OQS_SIG_sphincs_sha256_256f_robust_keypair(uint8_t *public_key, uint8_t *secret_key); @@ -239,7 +239,7 @@ OQS_API OQS_STATUS OQS_SIG_sphincs_sha256_256f_robust_verify(const uint8_t *mess #ifdef OQS_ENABLE_SIG_sphincs_sha256_256f_simple #define OQS_SIG_sphincs_sha256_256f_simple_length_public_key 64 #define OQS_SIG_sphincs_sha256_256f_simple_length_secret_key 128 -#define OQS_SIG_sphincs_sha256_256f_simple_length_signature 49216 +#define OQS_SIG_sphincs_sha256_256f_simple_length_signature 49856 OQS_SIG *OQS_SIG_sphincs_sha256_256f_simple_new(void); OQS_API OQS_STATUS OQS_SIG_sphincs_sha256_256f_simple_keypair(uint8_t *public_key, uint8_t *secret_key); @@ -272,7 +272,7 @@ OQS_API OQS_STATUS OQS_SIG_sphincs_sha256_256s_simple_verify(const uint8_t *mess #ifdef OQS_ENABLE_SIG_sphincs_shake256_128f_robust #define OQS_SIG_sphincs_shake256_128f_robust_length_public_key 32 #define OQS_SIG_sphincs_shake256_128f_robust_length_secret_key 64 -#define OQS_SIG_sphincs_shake256_128f_robust_length_signature 16976 +#define OQS_SIG_sphincs_shake256_128f_robust_length_signature 17088 OQS_SIG *OQS_SIG_sphincs_shake256_128f_robust_new(void); OQS_API OQS_STATUS OQS_SIG_sphincs_shake256_128f_robust_keypair(uint8_t *public_key, uint8_t *secret_key); @@ -283,7 +283,7 @@ OQS_API OQS_STATUS OQS_SIG_sphincs_shake256_128f_robust_verify(const uint8_t *me #ifdef OQS_ENABLE_SIG_sphincs_shake256_128f_simple #define OQS_SIG_sphincs_shake256_128f_simple_length_public_key 32 #define OQS_SIG_sphincs_shake256_128f_simple_length_secret_key 64 -#define OQS_SIG_sphincs_shake256_128f_simple_length_signature 16976 +#define OQS_SIG_sphincs_shake256_128f_simple_length_signature 17088 OQS_SIG *OQS_SIG_sphincs_shake256_128f_simple_new(void); OQS_API OQS_STATUS OQS_SIG_sphincs_shake256_128f_simple_keypair(uint8_t *public_key, uint8_t *secret_key); @@ -294,7 +294,7 @@ OQS_API OQS_STATUS OQS_SIG_sphincs_shake256_128f_simple_verify(const uint8_t *me #ifdef OQS_ENABLE_SIG_sphincs_shake256_128s_robust #define OQS_SIG_sphincs_shake256_128s_robust_length_public_key 32 #define OQS_SIG_sphincs_shake256_128s_robust_length_secret_key 64 -#define OQS_SIG_sphincs_shake256_128s_robust_length_signature 8080 +#define OQS_SIG_sphincs_shake256_128s_robust_length_signature 7856 OQS_SIG *OQS_SIG_sphincs_shake256_128s_robust_new(void); OQS_API OQS_STATUS OQS_SIG_sphincs_shake256_128s_robust_keypair(uint8_t *public_key, uint8_t *secret_key); @@ -305,7 +305,7 @@ OQS_API OQS_STATUS OQS_SIG_sphincs_shake256_128s_robust_verify(const uint8_t *me #ifdef OQS_ENABLE_SIG_sphincs_shake256_128s_simple #define OQS_SIG_sphincs_shake256_128s_simple_length_public_key 32 #define OQS_SIG_sphincs_shake256_128s_simple_length_secret_key 64 -#define OQS_SIG_sphincs_shake256_128s_simple_length_signature 8080 +#define OQS_SIG_sphincs_shake256_128s_simple_length_signature 7856 OQS_SIG *OQS_SIG_sphincs_shake256_128s_simple_new(void); OQS_API OQS_STATUS OQS_SIG_sphincs_shake256_128s_simple_keypair(uint8_t *public_key, uint8_t *secret_key); @@ -338,7 +338,7 @@ OQS_API OQS_STATUS OQS_SIG_sphincs_shake256_192f_simple_verify(const uint8_t *me #ifdef OQS_ENABLE_SIG_sphincs_shake256_192s_robust #define OQS_SIG_sphincs_shake256_192s_robust_length_public_key 48 #define OQS_SIG_sphincs_shake256_192s_robust_length_secret_key 96 -#define OQS_SIG_sphincs_shake256_192s_robust_length_signature 17064 +#define OQS_SIG_sphincs_shake256_192s_robust_length_signature 16224 OQS_SIG *OQS_SIG_sphincs_shake256_192s_robust_new(void); OQS_API OQS_STATUS OQS_SIG_sphincs_shake256_192s_robust_keypair(uint8_t *public_key, uint8_t *secret_key); @@ -349,7 +349,7 @@ OQS_API OQS_STATUS OQS_SIG_sphincs_shake256_192s_robust_verify(const uint8_t *me #ifdef OQS_ENABLE_SIG_sphincs_shake256_192s_simple #define OQS_SIG_sphincs_shake256_192s_simple_length_public_key 48 #define OQS_SIG_sphincs_shake256_192s_simple_length_secret_key 96 -#define OQS_SIG_sphincs_shake256_192s_simple_length_signature 17064 +#define OQS_SIG_sphincs_shake256_192s_simple_length_signature 16224 OQS_SIG *OQS_SIG_sphincs_shake256_192s_simple_new(void); OQS_API OQS_STATUS OQS_SIG_sphincs_shake256_192s_simple_keypair(uint8_t *public_key, uint8_t *secret_key); @@ -360,7 +360,7 @@ OQS_API OQS_STATUS OQS_SIG_sphincs_shake256_192s_simple_verify(const uint8_t *me #ifdef OQS_ENABLE_SIG_sphincs_shake256_256f_robust #define OQS_SIG_sphincs_shake256_256f_robust_length_public_key 64 #define OQS_SIG_sphincs_shake256_256f_robust_length_secret_key 128 -#define OQS_SIG_sphincs_shake256_256f_robust_length_signature 49216 +#define OQS_SIG_sphincs_shake256_256f_robust_length_signature 49856 OQS_SIG *OQS_SIG_sphincs_shake256_256f_robust_new(void); OQS_API OQS_STATUS OQS_SIG_sphincs_shake256_256f_robust_keypair(uint8_t *public_key, uint8_t *secret_key); @@ -371,7 +371,7 @@ OQS_API OQS_STATUS OQS_SIG_sphincs_shake256_256f_robust_verify(const uint8_t *me #ifdef OQS_ENABLE_SIG_sphincs_shake256_256f_simple #define OQS_SIG_sphincs_shake256_256f_simple_length_public_key 64 #define OQS_SIG_sphincs_shake256_256f_simple_length_secret_key 128 -#define OQS_SIG_sphincs_shake256_256f_simple_length_signature 49216 +#define OQS_SIG_sphincs_shake256_256f_simple_length_signature 49856 OQS_SIG *OQS_SIG_sphincs_shake256_256f_simple_new(void); OQS_API OQS_STATUS OQS_SIG_sphincs_shake256_256f_simple_keypair(uint8_t *public_key, uint8_t *secret_key); diff --git a/tests/KATs/sig/kats.json b/tests/KATs/sig/kats.json index 83338beff..327c12772 100644 --- a/tests/KATs/sig/kats.json +++ b/tests/KATs/sig/kats.json @@ -16,40 +16,40 @@ "Rainbow-V-Circumzenithal": "fba7a186c7f809da0d7ee0dcbc64d2573d824b44e539539b30c7ef1a36911760", "Rainbow-V-Classic": "3b13607b2761cd4b5ccf3206d3fec04f2568e0b01d6f370a336d0de7c70051ff", "Rainbow-V-Compressed": "452159bbc353bcb8e209d466df8c2ba3816d66a8dcf2059aa96185e10016feec", - "SPHINCS+-Haraka-128f-robust": "22afe9a2b538742f99fbf02293024de6424726eebddb3cac456534055689a4c3", - "SPHINCS+-Haraka-128f-simple": "d0161f60f8bdd26fa2f03a881eb517adf7d3e9a44f5cc337cb9c0d8acf82c145", - "SPHINCS+-Haraka-128s-robust": "de504b1aa6ee3cc6513a0da3511414b5d2472c5bd9efa780239518876c4e9fb2", - "SPHINCS+-Haraka-128s-simple": "a83a6512c773b1f305f07a383ececf607ecfbd0e5ad49b4ab444faed019f66c8", + "SPHINCS+-Haraka-128f-robust": "a8b966844b0c9bb2d954d95d25777bd548ee3dcb78e0833de8333a033d24cacb", + "SPHINCS+-Haraka-128f-simple": "266fb0a5e65ba0183fe4e462d48ff814842a389fb0785d30f89fa1c126df518b", + "SPHINCS+-Haraka-128s-robust": "ffad452b5ec3217d204ed13f5af76009ce265dd61ce9097714d941fec106dd01", + "SPHINCS+-Haraka-128s-simple": "625422a71b884ecf4d42e21f96091a18635e4862b68d0627e21a4a0033819603", "SPHINCS+-Haraka-192f-robust": "1d32cab46df0d4e6678a06a9eae7b187c80eaedf56b1e7d221035d7c6f08ef06", "SPHINCS+-Haraka-192f-simple": "4888059ed11c192b3a07e227e3befc967819d05f85723a7740bbc31eadc37f37", - "SPHINCS+-Haraka-192s-robust": "3bb2c0ea5d4b7c39d1c63b424493ab9b739c64adf511abf7e4107ad750a46273", - "SPHINCS+-Haraka-192s-simple": "c8e823fe6b03f35a0d9996dea1559e6924b86e2631e945a3ab9bb4e55c22c068", - "SPHINCS+-Haraka-256f-robust": "b31c6a00604e5f1eed1534c0f8ab29ceb0c831397075ca93c43c5a2a73e2649c", - "SPHINCS+-Haraka-256f-simple": "73d4172d95d0e668f7ac535a67f6ab26a963a604391053c9a2ce62cba88f2220", + "SPHINCS+-Haraka-192s-robust": "3d6f746167b234c7e689dff201558ac6ce6883b0c545517fe29c33fd24bfe619", + "SPHINCS+-Haraka-192s-simple": "ce6e8ff33f0264027bfe874c4265dc84de981b5fcb1d8ead2459c85a37f49cbf", + "SPHINCS+-Haraka-256f-robust": "7e346ad1ab94be33b757d833f1a934e23af6251e7aac7072d098ef15dc3264fd", + "SPHINCS+-Haraka-256f-simple": "b7bfc3a28daf35cd4110628c70294d1bcbd2a5da066bdc459891b7684432e037", "SPHINCS+-Haraka-256s-robust": "a419bdba92da2d07f99c3c3ba4f776b955244a7c3b565816c7fd2151f6c3363f", "SPHINCS+-Haraka-256s-simple": "0b8c7d3d8001eec6ddb317e0301fef4adc4f5b03301e5f4b93d09881b1a5ba7a", - "SPHINCS+-SHA256-128f-robust": "cf7935fc0277099a7453f6c5dc54e40d5cf34fbe989909940a77a3fbbab6c42e", - "SPHINCS+-SHA256-128f-simple": "4375bc4276fa44654979db0da886ba5cf754011db268fc63fa7584d50f5dfb63", - "SPHINCS+-SHA256-128s-robust": "4ddcad5141217340f9f28afdcf25cc236d7975bcfb41b39660e84568a9a461fe", - "SPHINCS+-SHA256-128s-simple": "8ae7a91b321cd18bd855710eea9d13deea1a53bb7858baee5f77d0237d1897eb", + "SPHINCS+-SHA256-128f-robust": "99c5e790fd3e2afb33b4b7b3666247368b3aa6d8c216c8537626a7fd8a680430", + "SPHINCS+-SHA256-128f-simple": "d08e30ae626e0c203cd66f51fb3a6f39f353e26bd1532ce437c1a428383fbc00", + "SPHINCS+-SHA256-128s-robust": "78c5432a5acc8f01ef5aeebc6659f15641b5dbe66ee7327ab86a1541ce1672ae", + "SPHINCS+-SHA256-128s-simple": "f398be19cd856c2fd5c894e9c6b7f872ce5db63b874b7160cb6efb40a9628773", "SPHINCS+-SHA256-192f-robust": "9d0898cb264172c31d0fb4901dd56d46728e83e0bf008abccb8b0912c2ebbc52", "SPHINCS+-SHA256-192f-simple": "306fef951d07b17b27c67ffe9e63185ae5d5fde87619b76872a3ca969299d47c", - "SPHINCS+-SHA256-192s-robust": "23374b2ece45c8ec7272473d70eb424894324702616b8456343dbd79f109b675", - "SPHINCS+-SHA256-192s-simple": "02b192ff93bc8977a80e9efc8fa6814ae85c2ad939f7185a959b428c1eb77150", - "SPHINCS+-SHA256-256f-robust": "e6fafb97dc3575d5dcd79183a4d7faad4f2c986745c63e61ddae3648559664f7", - "SPHINCS+-SHA256-256f-simple": "88fa150041ce9c305a971cef8ec444881afc14c4590637fa4b91c1deb15bb215", + "SPHINCS+-SHA256-192s-robust": "37cb7031fbd4436d3b4724fe4147af3a23e2e8240174a2eef99ec17dd3e5a5c9", + "SPHINCS+-SHA256-192s-simple": "45c9c28e85bb3f3b90b16f6deb25a32862613f4f3fcd17de9a46d83b7ff27745", + "SPHINCS+-SHA256-256f-robust": "8006df7b3bf31e1c8a262d2d7fd2279d2fa4b0edb10bcb36c72ecc8a6ada03f5", + "SPHINCS+-SHA256-256f-simple": "a563c2870fc6cb7c4b84b7cd5cd271ccd7bedf741d35592370fc9aea517f366d", "SPHINCS+-SHA256-256s-robust": "da28ff350ac552f100b35b01ecb494dc02f9dcf542fa2d88439cd427985e9581", "SPHINCS+-SHA256-256s-simple": "768d61c537b3abacca3ab468623edafb33d28a33dc5a9859f803679a3020b639", - "SPHINCS+-SHAKE256-128f-robust": "e7789df37278d1e147996bd9bf4cda55d5ec5cbe921e64b0766927af4b02decd", - "SPHINCS+-SHAKE256-128f-simple": "c99700873ca6914944fcef3b649270c86c056dcd11ce6e8f22580b193a136e6f", - "SPHINCS+-SHAKE256-128s-robust": "e9c31937277677d1cb387ce76408c76b0128938f3af047f60fb5d073a3c788b3", - "SPHINCS+-SHAKE256-128s-simple": "5d23c9f334e9bd99d5294cf40c6b2c096ee668076e809b44b928ca146d2c5e3a", + "SPHINCS+-SHAKE256-128f-robust": "39af7b5cee0e03dfa61070d0ac8dcae358a3d9b9a5d0eebb356cb25051a6b4b7", + "SPHINCS+-SHAKE256-128f-simple": "ebebf1a5da339c6e2073f41d7b499b7e5a456ac91c68ef5d15d18643c89d8e7d", + "SPHINCS+-SHAKE256-128s-robust": "094df7ed9198f66c0dfa02429d48320dc942f01bc2f90289519c4fbd37085ad6", + "SPHINCS+-SHAKE256-128s-simple": "260c24c6de710d81f86184fc034d382abe5d705b5352d7329ca662f6def392a4", "SPHINCS+-SHAKE256-192f-robust": "5cfcf998ad0bedf8e6b961c8891048f456d6422d3b4a26fcb095a913c9efd03e", "SPHINCS+-SHAKE256-192f-simple": "28528adef75a728d013bb493d85e358a75344c72000792419f1f539c16f24f10", - "SPHINCS+-SHAKE256-192s-robust": "619ce596575f52ed8fd3e5b0501db21985e505c95f0f595faa4d6a6f0a2fd81c", - "SPHINCS+-SHAKE256-192s-simple": "31b341c25230f8524e123db8a5dc29e8dd952cd11a63a821ac488b97d5106597", - "SPHINCS+-SHAKE256-256f-robust": "d5410edbaa120cf24f0bcf8cb834fdb08b4b5652809ee17c026d37212f4a4934", - "SPHINCS+-SHAKE256-256f-simple": "5a8959fc0436a66d6d69cc8adb2f24936b763ae324bc97ed139ae92f9f7e03c3", + "SPHINCS+-SHAKE256-192s-robust": "92eed523fc2f48b66826929b49a58d44c46aaa2c286a6d0e822a8d1e34555121", + "SPHINCS+-SHAKE256-192s-simple": "3cb0a4fccbb8d204aaa5c06e5be66a53e8c4ba1cbf1aefef8fdfaa5c63d60094", + "SPHINCS+-SHAKE256-256f-robust": "4bd4c9610754bb66530f492cf2e98e81b0d525339bae56038034e692f46f7927", + "SPHINCS+-SHAKE256-256f-simple": "1ec2691198f9a5c29c45a2bb72b3e04c9127f8e1df19d6c874d8b5bdfab89ef7", "SPHINCS+-SHAKE256-256s-robust": "09004dba03b2a190a327b5404a4d75c663f025703253b78946d0a99ca1492d6f", "SPHINCS+-SHAKE256-256s-simple": "f704deaf990987c306082bb28258cfb8c6f03b49940c06df582ef3fb86958e8a", "picnic3_L1": "b2c5f70eb9db08ee3cf97caf0d2cd1063a2dfd3a61ef5c33577a96c6b40bc678",