Rename sphincs algs to follow upstream

This also adds new keys for SPHINCS+. The reason is that SPHINCS+
was updated to 3.1 in liboqs (open-quantum-safe/liboqs/pull/1420),
and old keys are incompatible with the new implementation.

Keys were generated using the oqs-provider for OpenSSL 3

openssl genpkey \
    -provider default -provider oqsprovider \
    -algorithm sphincsshake128fsimple \
    -outform der \
    -out bench_sphincs_fast_level1_key.der

And certs_test.h was updated using xxd

xxd -i -c 10 -u bench_sphincs_fast_level1_key.der

This was repeated for the 6 variants of SPHINCS+ that wolfSSL supports.

wolfcrypt/benchmark/benchmark.c

@@ -892,17 +892,17 @@ static const bench_pq_alg bench_pq_asym_opt[] = {
 static const bench_pq_alg bench_pq_asym_opt2[] = {
     { "-pq",                 0xffffffff, NULL},
     { "-sphincs_fast_level1", BENCH_SPHINCS_FAST_LEVEL1_SIGN,
-      OQS_SIG_alg_sphincs_shake256_128f_simple },
+      OQS_SIG_alg_sphincs_shake_128f_simple },
     { "-sphincs_fast_level3", BENCH_SPHINCS_FAST_LEVEL3_SIGN,
-      OQS_SIG_alg_sphincs_shake256_192f_simple },
+      OQS_SIG_alg_sphincs_shake_192f_simple },
     { "-sphincs_fast_level5", BENCH_SPHINCS_FAST_LEVEL5_SIGN,
-      OQS_SIG_alg_sphincs_shake256_256f_simple },
+      OQS_SIG_alg_sphincs_shake_256f_simple },
     { "-sphincs_small_level1", BENCH_SPHINCS_SMALL_LEVEL1_SIGN,
-      OQS_SIG_alg_sphincs_shake256_128s_simple },
+      OQS_SIG_alg_sphincs_shake_128s_simple },
     { "-sphincs_small_level3", BENCH_SPHINCS_SMALL_LEVEL3_SIGN,
-      OQS_SIG_alg_sphincs_shake256_192s_simple },
+      OQS_SIG_alg_sphincs_shake_192s_simple },
     { "-sphincs_small_level5", BENCH_SPHINCS_SMALL_LEVEL5_SIGN,
-      OQS_SIG_alg_sphincs_shake256_256s_simple },
+      OQS_SIG_alg_sphincs_shake_256s_simple },
     { NULL, 0, NULL }
 };
 #endif /* HAVE_LIBOQS */

wolfcrypt/src/sphincs.c

@@ -76,22 +76,22 @@ int wc_sphincs_sign_msg(const byte* in, word32 inLen, byte* out, word32 *outLen,
 
     if (ret == 0) {
         if ((key->optim == FAST_VARIANT) && (key->level == 1)) {
-            oqssig = OQS_SIG_new(OQS_SIG_alg_sphincs_shake256_128f_simple);
+            oqssig = OQS_SIG_new(OQS_SIG_alg_sphincs_shake_128f_simple);
         }
         else if ((key->optim == FAST_VARIANT) && (key->level == 3)) {
-            oqssig = OQS_SIG_new(OQS_SIG_alg_sphincs_shake256_192f_simple);
+            oqssig = OQS_SIG_new(OQS_SIG_alg_sphincs_shake_192f_simple);
         }
         else if ((key->optim == FAST_VARIANT) && (key->level == 5)) {
-            oqssig = OQS_SIG_new(OQS_SIG_alg_sphincs_shake256_256f_simple);
+            oqssig = OQS_SIG_new(OQS_SIG_alg_sphincs_shake_256f_simple);
         }
         else if ((key->optim == SMALL_VARIANT) && (key->level == 1)) {
-            oqssig = OQS_SIG_new(OQS_SIG_alg_sphincs_shake256_128s_simple);
+            oqssig = OQS_SIG_new(OQS_SIG_alg_sphincs_shake_128s_simple);
         }
         else if ((key->optim == SMALL_VARIANT) && (key->level == 3)) {
-            oqssig = OQS_SIG_new(OQS_SIG_alg_sphincs_shake256_192s_simple);
+            oqssig = OQS_SIG_new(OQS_SIG_alg_sphincs_shake_192s_simple);
         }
         else if ((key->optim == SMALL_VARIANT) && (key->level == 5)) {
-            oqssig = OQS_SIG_new(OQS_SIG_alg_sphincs_shake256_256s_simple);
+            oqssig = OQS_SIG_new(OQS_SIG_alg_sphincs_shake_256s_simple);
         }
 
         if (oqssig == NULL) {
@@ -183,22 +183,22 @@ int wc_sphincs_verify_msg(const byte* sig, word32 sigLen, const byte* msg,
 
     if (ret == 0) {
         if ((key->optim == FAST_VARIANT) && (key->level == 1)) {
-            oqssig = OQS_SIG_new(OQS_SIG_alg_sphincs_shake256_128f_simple);
+            oqssig = OQS_SIG_new(OQS_SIG_alg_sphincs_shake_128f_simple);
         }
         else if ((key->optim == FAST_VARIANT) && (key->level == 3)) {
-            oqssig = OQS_SIG_new(OQS_SIG_alg_sphincs_shake256_192f_simple);
+            oqssig = OQS_SIG_new(OQS_SIG_alg_sphincs_shake_192f_simple);
         }
         else if ((key->optim == FAST_VARIANT) && (key->level == 5)) {
-            oqssig = OQS_SIG_new(OQS_SIG_alg_sphincs_shake256_256f_simple);
+            oqssig = OQS_SIG_new(OQS_SIG_alg_sphincs_shake_256f_simple);
         }
         else if ((key->optim == SMALL_VARIANT) && (key->level == 1)) {
-            oqssig = OQS_SIG_new(OQS_SIG_alg_sphincs_shake256_128s_simple);
+            oqssig = OQS_SIG_new(OQS_SIG_alg_sphincs_shake_128s_simple);
         }
         else if ((key->optim == SMALL_VARIANT) && (key->level == 3)) {
-            oqssig = OQS_SIG_new(OQS_SIG_alg_sphincs_shake256_192s_simple);
+            oqssig = OQS_SIG_new(OQS_SIG_alg_sphincs_shake_192s_simple);
         }
         else if ((key->optim == SMALL_VARIANT) && (key->level == 5)) {
-            oqssig = OQS_SIG_new(OQS_SIG_alg_sphincs_shake256_256s_simple);
+            oqssig = OQS_SIG_new(OQS_SIG_alg_sphincs_shake_256s_simple);
         }
 
         if (oqssig == NULL) {
@@ -244,7 +244,7 @@ int wc_sphincs_init(sphincs_key* key)
 /* Set the level of the sphincs private/public key.
  *
  * key   [out]  Sphincs key.
- * level [in]   Either 2,3 or 5.
+ * level [in]   Either 1, 3 or 5.
  * optim [in]   Either FAST_VARIANT or SMALL_VARIANT.
  * returns BAD_FUNC_ARG when key is NULL or level or optim are bad values.
  */

wolfssl/certs_test.h

@@ -5864,138 +5864,138 @@ static const int sizeof_bench_dilithium_level5_key = sizeof(bench_dilithium_leve
 /* certs/sphincs/bench_sphincs_fast_level1_key.der */
 static const unsigned char bench_sphincs_fast_level1_key[] =
 {
-        0x30, 0x71, 0x02, 0x01, 0x00, 0x30, 0x08, 0x06, 0x06, 0x2B,
-        0xCE, 0x0F, 0x06, 0x07, 0x04, 0x04, 0x62, 0x04, 0x60, 0x59,
-        0xE0, 0xD4, 0x1F, 0x22, 0x74, 0xBD, 0xAC, 0x46, 0x01, 0xE4,
-        0x8C, 0x89, 0xB7, 0x39, 0x20, 0x9F, 0x6F, 0x96, 0xC4, 0xE7,
-        0x78, 0x0F, 0xA1, 0x7D, 0xEC, 0xE8, 0xD5, 0xC3, 0xDD, 0x45,
-        0x13, 0x56, 0xCF, 0xEA, 0x68, 0x70, 0x2A, 0xFF, 0xDA, 0x9A,
-        0xA3, 0x2B, 0xEC, 0x4D, 0xBF, 0x7D, 0x09, 0xC0, 0xCC, 0xF4,
-        0x2F, 0xF2, 0xAC, 0x74, 0xDF, 0x0E, 0x20, 0x9D, 0xC2, 0x9E,
-        0xD1, 0xB4, 0x12, 0x56, 0xCF, 0xEA, 0x68, 0x70, 0x2A, 0xFF,
-        0xDA, 0x9A, 0xA3, 0x2B, 0xEC, 0x4D, 0xBF, 0x7D, 0x09, 0xC0,
-        0xCC, 0xF4, 0x2F, 0xF2, 0xAC, 0x74, 0xDF, 0x0E, 0x20, 0x9D,
-        0xC2, 0x9E, 0xD1, 0xB4, 0x12
+        0X30, 0X71, 0X02, 0X01, 0X00, 0X30, 0X08, 0X06, 0X06, 0X2B,
+        0XCE, 0X0F, 0X06, 0X07, 0X0D, 0X04, 0X62, 0X04, 0X60, 0XD8,
+        0XC4, 0X6E, 0X8D, 0X3B, 0XB7, 0XE7, 0X48, 0X8D, 0X6F, 0X0C,
+        0X3D, 0XDF, 0XAB, 0X79, 0XB6, 0X62, 0XAE, 0X89, 0X19, 0X6F,
+        0X5E, 0XF9, 0XD3, 0X3A, 0X69, 0XBA, 0XFF, 0X4C, 0X46, 0XDE,
+        0XAA, 0X7C, 0X40, 0X79, 0X8C, 0XE1, 0XE5, 0X30, 0XE6, 0XDF,
+        0X4E, 0X23, 0X5E, 0X14, 0XDB, 0X0A, 0X48, 0X4E, 0XF6, 0X57,
+        0XCE, 0X45, 0X8F, 0X8B, 0X1D, 0X68, 0X63, 0XAA, 0X24, 0XA4,
+        0XE1, 0X0D, 0XFB, 0X7C, 0X40, 0X79, 0X8C, 0XE1, 0XE5, 0X30,
+        0XE6, 0XDF, 0X4E, 0X23, 0X5E, 0X14, 0XDB, 0X0A, 0X48, 0X4E,
+        0XF6, 0X57, 0XCE, 0X45, 0X8F, 0X8B, 0X1D, 0X68, 0X63, 0XAA,
+        0X24, 0XA4, 0XE1, 0X0D, 0XFB
 };
 static const int sizeof_bench_sphincs_fast_level1_key = sizeof(bench_sphincs_fast_level1_key);
 
 /* certs/sphincs/bench_sphincs_fast_level3_key.der */
 static const unsigned char bench_sphincs_fast_level3_key[] =
 {
-        0x30, 0x81, 0xA3, 0x02, 0x01, 0x00, 0x30, 0x08, 0x06, 0x06,
-        0x2B, 0xCE, 0x0F, 0x06, 0x08, 0x03, 0x04, 0x81, 0x93, 0x04,
-        0x81, 0x90, 0x00, 0x8E, 0xB0, 0x75, 0x2E, 0xC5, 0x61, 0x66,
-        0xEE, 0x01, 0xEE, 0x97, 0x13, 0xD7, 0x65, 0x69, 0xEA, 0x5C,
-        0x23, 0xAA, 0x6E, 0x86, 0x04, 0xE9, 0x2A, 0xEC, 0x8C, 0xA3,
-        0xB7, 0x28, 0xEB, 0xDF, 0x0E, 0x77, 0x07, 0x59, 0x3F, 0xB6,
-        0x10, 0xB3, 0xCC, 0xE1, 0x09, 0x64, 0xC4, 0x42, 0x37, 0x71,
-        0xDC, 0xB4, 0x20, 0x2D, 0x03, 0x00, 0x6C, 0x4C, 0x3F, 0xE3,
-        0x80, 0x28, 0xEC, 0x90, 0xF9, 0xDB, 0x50, 0xFC, 0x0A, 0x58,
-        0xC2, 0x81, 0xE2, 0x17, 0x06, 0x7A, 0x58, 0xBB, 0x21, 0x90,
-        0xC8, 0xE6, 0x64, 0x8B, 0xF4, 0x68, 0x70, 0x1D, 0xE2, 0xAB,
-        0x8F, 0x50, 0x4D, 0xEE, 0x29, 0xD7, 0x15, 0x5E, 0xDC, 0xB4,
-        0x20, 0x2D, 0x03, 0x00, 0x6C, 0x4C, 0x3F, 0xE3, 0x80, 0x28,
-        0xEC, 0x90, 0xF9, 0xDB, 0x50, 0xFC, 0x0A, 0x58, 0xC2, 0x81,
-        0xE2, 0x17, 0x06, 0x7A, 0x58, 0xBB, 0x21, 0x90, 0xC8, 0xE6,
-        0x64, 0x8B, 0xF4, 0x68, 0x70, 0x1D, 0xE2, 0xAB, 0x8F, 0x50,
-        0x4D, 0xEE, 0x29, 0xD7, 0x15, 0x5E
+        0X30, 0X81, 0XA3, 0X02, 0X01, 0X00, 0X30, 0X08, 0X06, 0X06,
+        0X2B, 0XCE, 0X0F, 0X06, 0X08, 0X0A, 0X04, 0X81, 0X93, 0X04,
+        0X81, 0X90, 0XB2, 0X3A, 0X67, 0XA6, 0X4B, 0X8E, 0XB9, 0XEF,
+        0XAD, 0X99, 0XE4, 0X3D, 0X65, 0XE8, 0XEE, 0XCF, 0XAC, 0XCF,
+        0X2F, 0XDE, 0XBC, 0X11, 0X67, 0X8D, 0X8F, 0X8D, 0X3E, 0X99,
+        0X31, 0X67, 0XED, 0X31, 0X6A, 0X05, 0X47, 0XC1, 0XDA, 0XC5,
+        0X14, 0X17, 0XA1, 0X93, 0X83, 0X44, 0X58, 0X09, 0X80, 0X3A,
+        0X47, 0X67, 0X42, 0X6D, 0X4C, 0XB7, 0XC8, 0X7D, 0X37, 0XF3,
+        0X90, 0XF7, 0X46, 0X92, 0XB6, 0X26, 0XF7, 0X4E, 0X0D, 0X8D,
+        0XB8, 0XCA, 0X8B, 0XA8, 0X20, 0X5D, 0X67, 0X85, 0XD2, 0X83,
+        0X2C, 0X2A, 0X38, 0X1F, 0X57, 0X89, 0X76, 0X8C, 0X6D, 0X88,
+        0XCE, 0X18, 0X4F, 0XA7, 0X88, 0X48, 0X7C, 0X0D, 0X47, 0X67,
+        0X42, 0X6D, 0X4C, 0XB7, 0XC8, 0X7D, 0X37, 0XF3, 0X90, 0XF7,
+        0X46, 0X92, 0XB6, 0X26, 0XF7, 0X4E, 0X0D, 0X8D, 0XB8, 0XCA,
+        0X8B, 0XA8, 0X20, 0X5D, 0X67, 0X85, 0XD2, 0X83, 0X2C, 0X2A,
+        0X38, 0X1F, 0X57, 0X89, 0X76, 0X8C, 0X6D, 0X88, 0XCE, 0X18,
+        0X4F, 0XA7, 0X88, 0X48, 0X7C, 0X0D
 };
 static const int sizeof_bench_sphincs_fast_level3_key = sizeof(bench_sphincs_fast_level3_key);
 
 /* certs/sphincs/bench_sphincs_fast_level5_key.der */
 static const unsigned char bench_sphincs_fast_level5_key[] =
 {
-        0x30, 0x81, 0xD3, 0x02, 0x01, 0x00, 0x30, 0x08, 0x06, 0x06,
-        0x2B, 0xCE, 0x0F, 0x06, 0x09, 0x03, 0x04, 0x81, 0xC3, 0x04,
-        0x81, 0xC0, 0x91, 0x8B, 0xB7, 0x1A, 0x08, 0x61, 0x50, 0x70,
-        0x26, 0x71, 0xCD, 0x36, 0x10, 0xE2, 0xB8, 0x95, 0x0D, 0xA7,
-        0x57, 0xC7, 0x18, 0xFF, 0x55, 0xA4, 0x16, 0x9D, 0x3C, 0xF8,
-        0xA3, 0x48, 0xB0, 0x9B, 0xFD, 0x22, 0xBE, 0x20, 0x3D, 0x88,
-        0x96, 0x0B, 0xF1, 0x6D, 0x05, 0x8A, 0x1B, 0x71, 0xCE, 0xCD,
-        0x31, 0x01, 0xEA, 0xAC, 0x62, 0x61, 0x1F, 0x4A, 0xC1, 0x62,
-        0x05, 0x36, 0xBB, 0x7F, 0xEF, 0x5B, 0x42, 0x8B, 0xC6, 0xCD,
-        0xEF, 0xCE, 0xE1, 0x00, 0x39, 0x4F, 0x01, 0xBC, 0x03, 0x94,
-        0x00, 0xA8, 0x7F, 0x22, 0xB9, 0x9F, 0x79, 0x51, 0x25, 0x61,
-        0x1B, 0x43, 0x47, 0x52, 0xD0, 0x39, 0x2B, 0x93, 0xC5, 0xD4,
-        0x2A, 0xE1, 0xEF, 0x0B, 0x01, 0x36, 0xC3, 0x54, 0xC8, 0xDE,
-        0xF4, 0xA2, 0x6F, 0x4C, 0x4B, 0xEC, 0x5D, 0x9D, 0xEE, 0xC9,
-        0xFA, 0xBE, 0xFA, 0x5F, 0xC4, 0x89, 0xC1, 0xFC, 0xEB, 0xA8,
-        0x42, 0x8B, 0xC6, 0xCD, 0xEF, 0xCE, 0xE1, 0x00, 0x39, 0x4F,
-        0x01, 0xBC, 0x03, 0x94, 0x00, 0xA8, 0x7F, 0x22, 0xB9, 0x9F,
-        0x79, 0x51, 0x25, 0x61, 0x1B, 0x43, 0x47, 0x52, 0xD0, 0x39,
-        0x2B, 0x93, 0xC5, 0xD4, 0x2A, 0xE1, 0xEF, 0x0B, 0x01, 0x36,
-        0xC3, 0x54, 0xC8, 0xDE, 0xF4, 0xA2, 0x6F, 0x4C, 0x4B, 0xEC,
-        0x5D, 0x9D, 0xEE, 0xC9, 0xFA, 0xBE, 0xFA, 0x5F, 0xC4, 0x89,
-        0xC1, 0xFC, 0xEB, 0xA8
+        0X30, 0X81, 0XD3, 0X02, 0X01, 0X00, 0X30, 0X08, 0X06, 0X06,
+        0X2B, 0XCE, 0X0F, 0X06, 0X09, 0X0A, 0X04, 0X81, 0XC3, 0X04,
+        0X81, 0XC0, 0XAB, 0XD3, 0XFD, 0X3B, 0X17, 0X00, 0XCD, 0XD5,
+        0XB2, 0XEE, 0XD2, 0X36, 0XE5, 0XF7, 0X1D, 0XDC, 0XC8, 0X42,
+        0XDB, 0X53, 0X6A, 0X8A, 0X0D, 0X6D, 0XD2, 0X3C, 0X1C, 0X7C,
+        0X98, 0X4D, 0X73, 0XC8, 0XAB, 0X2E, 0XAA, 0X7A, 0XC0, 0X26,
+        0XC4, 0X0D, 0X7E, 0XB4, 0XD3, 0XBB, 0X13, 0XF4, 0X6E, 0XFE,
+        0X0E, 0XA5, 0XA4, 0X58, 0X57, 0XA2, 0XDD, 0X99, 0X62, 0XB9,
+        0XBA, 0XC2, 0X5B, 0X26, 0XED, 0X6E, 0X99, 0XFA, 0X11, 0X0E,
+        0XCF, 0X33, 0X54, 0X85, 0X56, 0X0C, 0XEB, 0X2A, 0XB0, 0XAA,
+        0XEB, 0X74, 0X14, 0X89, 0X1A, 0XB9, 0X38, 0XF5, 0X29, 0X66,
+        0X28, 0X28, 0X17, 0XF5, 0X72, 0X42, 0XEE, 0XC0, 0X14, 0X59,
+        0XA0, 0X72, 0X9B, 0X9B, 0X1E, 0X7F, 0X70, 0X70, 0XBB, 0X89,
+        0X0C, 0X7E, 0X87, 0X8B, 0X83, 0X80, 0X2B, 0X66, 0X58, 0X64,
+        0X1D, 0X94, 0XAF, 0X58, 0XB5, 0X23, 0X2C, 0XA1, 0XE9, 0X95,
+        0X99, 0XFA, 0X11, 0X0E, 0XCF, 0X33, 0X54, 0X85, 0X56, 0X0C,
+        0XEB, 0X2A, 0XB0, 0XAA, 0XEB, 0X74, 0X14, 0X89, 0X1A, 0XB9,
+        0X38, 0XF5, 0X29, 0X66, 0X28, 0X28, 0X17, 0XF5, 0X72, 0X42,
+        0XEE, 0XC0, 0X14, 0X59, 0XA0, 0X72, 0X9B, 0X9B, 0X1E, 0X7F,
+        0X70, 0X70, 0XBB, 0X89, 0X0C, 0X7E, 0X87, 0X8B, 0X83, 0X80,
+        0X2B, 0X66, 0X58, 0X64, 0X1D, 0X94, 0XAF, 0X58, 0XB5, 0X23,
+        0X2C, 0XA1, 0XE9, 0X95
 };
 static const int sizeof_bench_sphincs_fast_level5_key = sizeof(bench_sphincs_fast_level5_key);
 
 /* certs/sphincs/bench_sphincs_small_level1_key.der */
 static const unsigned char bench_sphincs_small_level1_key[] =
 {
-        0x30, 0x71, 0x02, 0x01, 0x00, 0x30, 0x08, 0x06, 0x06, 0x2B,
-        0xCE, 0x0F, 0x06, 0x07, 0x0A, 0x04, 0x62, 0x04, 0x60, 0x44,
-        0x7A, 0xCF, 0xB9, 0x03, 0xF2, 0xB2, 0x41, 0xBC, 0x1A, 0xE6,
-        0x75, 0x29, 0x04, 0xDA, 0x6C, 0x6E, 0x08, 0x17, 0x1E, 0x46,
-        0x75, 0xE8, 0x32, 0x23, 0xCD, 0x11, 0xC8, 0x88, 0xF7, 0x00,
-        0x11, 0x4C, 0xBD, 0x14, 0x62, 0xC2, 0x4B, 0x83, 0x36, 0xDE,
-        0x61, 0x78, 0x7F, 0x09, 0x16, 0x97, 0x98, 0x3D, 0x52, 0x70,
-        0x7F, 0xED, 0x86, 0xDB, 0x75, 0x42, 0x52, 0xF3, 0xB1, 0xAE,
-        0x70, 0x7F, 0xD3, 0x4C, 0xBD, 0x14, 0x62, 0xC2, 0x4B, 0x83,
-        0x36, 0xDE, 0x61, 0x78, 0x7F, 0x09, 0x16, 0x97, 0x98, 0x3D,
-        0x52, 0x70, 0x7F, 0xED, 0x86, 0xDB, 0x75, 0x42, 0x52, 0xF3,
-        0xB1, 0xAE, 0x70, 0x7F, 0xD3
+        0X30, 0X71, 0X02, 0X01, 0X00, 0X30, 0X08, 0X06, 0X06, 0X2B,
+        0XCE, 0X0F, 0X06, 0X07, 0X10, 0X04, 0X62, 0X04, 0X60, 0XFF,
+        0X26, 0X56, 0X65, 0XAC, 0X6C, 0X0B, 0X72, 0X2D, 0X8D, 0XB8,
+        0X29, 0X4A, 0X15, 0X7E, 0XEF, 0X55, 0XFD, 0XBE, 0XF4, 0XC0,
+        0XE6, 0X6F, 0X2B, 0X7A, 0X97, 0X60, 0X51, 0X1C, 0XCB, 0X82,
+        0X43, 0X44, 0XDE, 0X14, 0X3D, 0X4F, 0XE7, 0X3C, 0X1C, 0XB3,
+        0XBB, 0X9F, 0XE8, 0X9F, 0X8F, 0XA4, 0XAD, 0XB9, 0X52, 0XC1,
+        0X31, 0XF7, 0XC1, 0X86, 0X7E, 0X73, 0XFB, 0X9E, 0X72, 0X57,
+        0X8A, 0XD7, 0X44, 0X44, 0XDE, 0X14, 0X3D, 0X4F, 0XE7, 0X3C,
+        0X1C, 0XB3, 0XBB, 0X9F, 0XE8, 0X9F, 0X8F, 0XA4, 0XAD, 0XB9,
+        0X52, 0XC1, 0X31, 0XF7, 0XC1, 0X86, 0X7E, 0X73, 0XFB, 0X9E,
+        0X72, 0X57, 0X8A, 0XD7, 0X44
 };
 static const int sizeof_bench_sphincs_small_level1_key = sizeof(bench_sphincs_small_level1_key);
 
 /* certs/sphincs/bench_sphincs_small_level3_key.der */
 static const unsigned char bench_sphincs_small_level3_key[] =
 {
-        0x30, 0x81, 0xA3, 0x02, 0x01, 0x00, 0x30, 0x08, 0x06, 0x06,
-        0x2B, 0xCE, 0x0F, 0x06, 0x08, 0x07, 0x04, 0x81, 0x93, 0x04,
-        0x81, 0x90, 0x7E, 0x80, 0x20, 0x6C, 0x20, 0xAE, 0x7D, 0xAB,
-        0xC1, 0x4E, 0x15, 0x51, 0x0C, 0xDD, 0x96, 0xAC, 0xFB, 0xD2,
-        0x5B, 0xF1, 0xEB, 0x51, 0xDC, 0xC3, 0xB3, 0x92, 0x33, 0xC2,
-        0x54, 0x59, 0x4F, 0xB2, 0x33, 0x7C, 0x10, 0xC6, 0xA3, 0x49,
-        0x8D, 0x07, 0x52, 0xB2, 0xA1, 0x14, 0x0C, 0x54, 0x21, 0xD4,
-        0xB1, 0xCC, 0xBD, 0xB1, 0x20, 0xAC, 0xF1, 0xBD, 0xF5, 0x60,
-        0x2F, 0x07, 0x98, 0x57, 0x4E, 0x31, 0x6F, 0x42, 0x84, 0xCE,
-        0x71, 0x72, 0x74, 0x20, 0xDF, 0x38, 0x39, 0xFB, 0xD3, 0xEE,
-        0xAD, 0xFB, 0xB6, 0x2B, 0x60, 0x61, 0x85, 0xF1, 0x2A, 0x59,
-        0x00, 0xA5, 0xCA, 0xC8, 0xE3, 0x3F, 0x96, 0xE9, 0xB1, 0xCC,
-        0xBD, 0xB1, 0x20, 0xAC, 0xF1, 0xBD, 0xF5, 0x60, 0x2F, 0x07,
-        0x98, 0x57, 0x4E, 0x31, 0x6F, 0x42, 0x84, 0xCE, 0x71, 0x72,
-        0x74, 0x20, 0xDF, 0x38, 0x39, 0xFB, 0xD3, 0xEE, 0xAD, 0xFB,
-        0xB6, 0x2B, 0x60, 0x61, 0x85, 0xF1, 0x2A, 0x59, 0x00, 0xA5,
-        0xCA, 0xC8, 0xE3, 0x3F, 0x96, 0xE9
+        0X30, 0X81, 0XA3, 0X02, 0X01, 0X00, 0X30, 0X08, 0X06, 0X06,
+        0X2B, 0XCE, 0X0F, 0X06, 0X08, 0X0C, 0X04, 0X81, 0X93, 0X04,
+        0X81, 0X90, 0X59, 0XC1, 0X44, 0X8A, 0X5F, 0XF3, 0XF1, 0XB3,
+        0XB8, 0XFF, 0X98, 0X7F, 0X86, 0X4A, 0X4C, 0X19, 0XFC, 0X51,
+        0XB8, 0X12, 0X87, 0X9C, 0X52, 0XD6, 0X7F, 0XD6, 0XB0, 0XA9,
+        0XF7, 0XED, 0X44, 0X26, 0XAF, 0XC2, 0XCE, 0X47, 0XD9, 0XE3,
+        0X95, 0X1A, 0XE6, 0X11, 0XC1, 0X37, 0X67, 0XA5, 0X89, 0XDD,
+        0X37, 0X6A, 0XE9, 0XC3, 0X8C, 0X9B, 0X3E, 0XBA, 0XB1, 0X76,
+        0X4A, 0X5A, 0XEE, 0XCD, 0X96, 0X66, 0XF2, 0X53, 0XDA, 0X8C,
+        0X89, 0X69, 0XBF, 0XBF, 0XF9, 0XA5, 0XBC, 0X7D, 0X80, 0XA8,
+        0X97, 0X63, 0X90, 0X55, 0X58, 0X6C, 0X0A, 0X52, 0X61, 0X0B,
+        0XF3, 0XBC, 0XE1, 0X1F, 0XB4, 0XA6, 0X5F, 0X9F, 0X37, 0X6A,
+        0XE9, 0XC3, 0X8C, 0X9B, 0X3E, 0XBA, 0XB1, 0X76, 0X4A, 0X5A,
+        0XEE, 0XCD, 0X96, 0X66, 0XF2, 0X53, 0XDA, 0X8C, 0X89, 0X69,
+        0XBF, 0XBF, 0XF9, 0XA5, 0XBC, 0X7D, 0X80, 0XA8, 0X97, 0X63,
+        0X90, 0X55, 0X58, 0X6C, 0X0A, 0X52, 0X61, 0X0B, 0XF3, 0XBC,
+        0XE1, 0X1F, 0XB4, 0XA6, 0X5F, 0X9F
 };
 static const int sizeof_bench_sphincs_small_level3_key = sizeof(bench_sphincs_small_level3_key);
 
 /* certs/sphincs/bench_sphincs_small_level5_key.der */
 static const unsigned char bench_sphincs_small_level5_key[] =
 {
-        0x30, 0x81, 0xD3, 0x02, 0x01, 0x00, 0x30, 0x08, 0x06, 0x06,
-        0x2B, 0xCE, 0x0F, 0x06, 0x09, 0x07, 0x04, 0x81, 0xC3, 0x04,
-        0x81, 0xC0, 0x5E, 0xEA, 0x46, 0x6D, 0xE5, 0xA1, 0x70, 0x07,
-        0xF0, 0x5C, 0x59, 0xD5, 0xD7, 0x37, 0x06, 0xC7, 0xD6, 0x1C,
-        0xEA, 0x06, 0x15, 0x6E, 0xB3, 0x07, 0x71, 0x34, 0xE8, 0xD4,
-        0x13, 0x65, 0x58, 0xAE, 0xAC, 0xE9, 0x32, 0x26, 0x76, 0xCD,
-        0x2C, 0x3D, 0x11, 0xF7, 0xAB, 0x8A, 0x84, 0x4F, 0x56, 0x6F,
-        0x2F, 0x63, 0x82, 0x1A, 0x37, 0xAA, 0xAA, 0x49, 0x50, 0xC8,
-        0xA5, 0x92, 0x6E, 0x3F, 0xD6, 0x67, 0xEA, 0x5C, 0x18, 0x8A,
-        0x99, 0xD2, 0xB6, 0xE3, 0xD7, 0x68, 0x9E, 0x65, 0x21, 0xDD,
-        0xE3, 0x44, 0x8B, 0x32, 0x30, 0x31, 0xA8, 0xF2, 0xBB, 0xED,
-        0xC0, 0x3E, 0x1A, 0x7B, 0x36, 0xD8, 0xAD, 0x2A, 0xA4, 0x81,
-        0xAC, 0xD3, 0x08, 0xAC, 0x54, 0x2A, 0xAC, 0xAA, 0x1B, 0x64,
-        0x58, 0x7B, 0x94, 0xE0, 0x16, 0x36, 0xC9, 0x92, 0x09, 0x6A,
-        0x8C, 0x4D, 0xE3, 0xAB, 0x0F, 0x1C, 0xE8, 0x77, 0x1F, 0xE5,
-        0xEA, 0x5C, 0x18, 0x8A, 0x99, 0xD2, 0xB6, 0xE3, 0xD7, 0x68,
-        0x9E, 0x65, 0x21, 0xDD, 0xE3, 0x44, 0x8B, 0x32, 0x30, 0x31,
-        0xA8, 0xF2, 0xBB, 0xED, 0xC0, 0x3E, 0x1A, 0x7B, 0x36, 0xD8,
-        0xAD, 0x2A, 0xA4, 0x81, 0xAC, 0xD3, 0x08, 0xAC, 0x54, 0x2A,
-        0xAC, 0xAA, 0x1B, 0x64, 0x58, 0x7B, 0x94, 0xE0, 0x16, 0x36,
-        0xC9, 0x92, 0x09, 0x6A, 0x8C, 0x4D, 0xE3, 0xAB, 0x0F, 0x1C,
-        0xE8, 0x77, 0x1F, 0xE5
+        0X30, 0X81, 0XD3, 0X02, 0X01, 0X00, 0X30, 0X08, 0X06, 0X06,
+        0X2B, 0XCE, 0X0F, 0X06, 0X09, 0X0C, 0X04, 0X81, 0XC3, 0X04,
+        0X81, 0XC0, 0X53, 0XE5, 0X25, 0X41, 0X1C, 0XCB, 0X8F, 0XAF,
+        0X83, 0XBE, 0X64, 0X43, 0X70, 0X4E, 0X1D, 0X86, 0XF8, 0XFA,
+        0XEA, 0X65, 0X9B, 0X45, 0XBC, 0XF1, 0X79, 0X57, 0X87, 0X51,
+        0X2F, 0X6D, 0X50, 0XB8, 0X0D, 0X9A, 0X9F, 0X8C, 0XE8, 0X9B,
+        0XE8, 0XFA, 0X1E, 0XF0, 0XA1, 0X98, 0XCA, 0X8B, 0X34, 0XD4,
+        0X71, 0X53, 0XF0, 0XA7, 0X1D, 0XD6, 0X0D, 0XDF, 0X63, 0X61,
+        0XA7, 0X12, 0X80, 0X64, 0XF7, 0X73, 0X14, 0X03, 0XD4, 0X54,
+        0X01, 0X9D, 0X9D, 0X5D, 0X42, 0XC1, 0X2B, 0X91, 0XC3, 0XA2,
+        0XD3, 0X12, 0X67, 0X35, 0X3B, 0XD7, 0X67, 0X31, 0XD5, 0XDC,
+        0XDF, 0X4C, 0X4C, 0XAA, 0X45, 0XA8, 0X5D, 0X1E, 0XFB, 0X9E,
+        0X34, 0X5D, 0X4B, 0X83, 0X77, 0XBF, 0X52, 0X8A, 0XDB, 0X67,
+        0X7A, 0X52, 0XA4, 0X02, 0X29, 0XEB, 0X34, 0X9A, 0X4E, 0X86,
+        0X25, 0X66, 0XFF, 0XA0, 0X79, 0X47, 0XBE, 0X94, 0XC2, 0X69,
+        0X14, 0X03, 0XD4, 0X54, 0X01, 0X9D, 0X9D, 0X5D, 0X42, 0XC1,
+        0X2B, 0X91, 0XC3, 0XA2, 0XD3, 0X12, 0X67, 0X35, 0X3B, 0XD7,
+        0X67, 0X31, 0XD5, 0XDC, 0XDF, 0X4C, 0X4C, 0XAA, 0X45, 0XA8,
+        0X5D, 0X1E, 0XFB, 0X9E, 0X34, 0X5D, 0X4B, 0X83, 0X77, 0XBF,
+        0X52, 0X8A, 0XDB, 0X67, 0X7A, 0X52, 0XA4, 0X02, 0X29, 0XEB,
+        0X34, 0X9A, 0X4E, 0X86, 0X25, 0X66, 0XFF, 0XA0, 0X79, 0X47,
+        0XBE, 0X94, 0XC2, 0X69
 };
 static const int sizeof_bench_sphincs_small_level5_key = sizeof(bench_sphincs_small_level5_key);
 

wolfssl/wolfcrypt/sphincs.h

@@ -24,12 +24,12 @@
 */
 
 /* Interfaces for Sphincs:
- *     - SPHINCS_FAST_LEVEL1 (AKA SPHINCS+-SHAKE256-128f-simple)
- *     - SPHINCS_FAST_LEVEL3 (AKA SPHINCS+-SHAKE256-192f-simple)
- *     - SPHINCS_FAST_LEVEL5 (AKA SPHINCS+-SHAKE256-256f-simple)
- *     - SPHINCS_SMALL_LEVEL1 (AKA SPHINCS+-SHAKE256-128s-simple)
- *     - SPHINCS_SMALL_LEVEL3 (AKA SPHINCS+-SHAKE256-192s-simple)
- *     - SPHINCS_SMALL_LEVEL5 (AKA SPHINCS+-SHAKE256-256s-simple)
+ *     - SPHINCS_FAST_LEVEL1 (AKA SPHINCS+-SHAKE-128f-simple)
+ *     - SPHINCS_FAST_LEVEL3 (AKA SPHINCS+-SHAKE-192f-simple)
+ *     - SPHINCS_FAST_LEVEL5 (AKA SPHINCS+-SHAKE-256f-simple)
+ *     - SPHINCS_SMALL_LEVEL1 (AKA SPHINCS+-SHAKE-128s-simple)
+ *     - SPHINCS_SMALL_LEVEL3 (AKA SPHINCS+-SHAKE-192s-simple)
+ *     - SPHINCS_SMALL_LEVEL5 (AKA SPHINCS+-SHAKE-256s-simple)
  */
 
 #ifndef WOLF_CRYPT_SPHINCS_H
@@ -51,23 +51,23 @@
 
 #ifdef HAVE_LIBOQS
 
-#define SPHINCS_FAST_LEVEL1_SIG_SIZE     OQS_SIG_sphincs_shake256_128f_simple_length_signature
-#define SPHINCS_FAST_LEVEL3_SIG_SIZE     OQS_SIG_sphincs_shake256_192f_simple_length_signature
-#define SPHINCS_FAST_LEVEL5_SIG_SIZE     OQS_SIG_sphincs_shake256_256f_simple_length_signature
-#define SPHINCS_SMALL_LEVEL1_SIG_SIZE    OQS_SIG_sphincs_shake256_128s_simple_length_signature
-#define SPHINCS_SMALL_LEVEL3_SIG_SIZE    OQS_SIG_sphincs_shake256_192s_simple_length_signature
-#define SPHINCS_SMALL_LEVEL5_SIG_SIZE    OQS_SIG_sphincs_shake256_256s_simple_length_signature
+#define SPHINCS_FAST_LEVEL1_SIG_SIZE     OQS_SIG_sphincs_shake_128f_simple_length_signature
+#define SPHINCS_FAST_LEVEL3_SIG_SIZE     OQS_SIG_sphincs_shake_192f_simple_length_signature
+#define SPHINCS_FAST_LEVEL5_SIG_SIZE     OQS_SIG_sphincs_shake_256f_simple_length_signature
+#define SPHINCS_SMALL_LEVEL1_SIG_SIZE    OQS_SIG_sphincs_shake_128s_simple_length_signature
+#define SPHINCS_SMALL_LEVEL3_SIG_SIZE    OQS_SIG_sphincs_shake_192s_simple_length_signature
+#define SPHINCS_SMALL_LEVEL5_SIG_SIZE    OQS_SIG_sphincs_shake_256s_simple_length_signature
 
-#define SPHINCS_LEVEL1_KEY_SIZE     OQS_SIG_sphincs_shake256_128f_simple_length_secret_key
-#define SPHINCS_LEVEL1_PUB_KEY_SIZE OQS_SIG_sphincs_shake256_128f_simple_length_public_key
+#define SPHINCS_LEVEL1_KEY_SIZE     OQS_SIG_sphincs_shake_128f_simple_length_secret_key
+#define SPHINCS_LEVEL1_PUB_KEY_SIZE OQS_SIG_sphincs_shake_128f_simple_length_public_key
 #define SPHINCS_LEVEL1_PRV_KEY_SIZE (SPHINCS_LEVEL1_PUB_KEY_SIZE+SPHINCS_LEVEL1_KEY_SIZE)
 
-#define SPHINCS_LEVEL3_KEY_SIZE     OQS_SIG_sphincs_shake256_192f_simple_length_secret_key
-#define SPHINCS_LEVEL3_PUB_KEY_SIZE OQS_SIG_sphincs_shake256_192f_simple_length_public_key
+#define SPHINCS_LEVEL3_KEY_SIZE     OQS_SIG_sphincs_shake_192f_simple_length_secret_key
+#define SPHINCS_LEVEL3_PUB_KEY_SIZE OQS_SIG_sphincs_shake_192f_simple_length_public_key
 #define SPHINCS_LEVEL3_PRV_KEY_SIZE (SPHINCS_LEVEL3_PUB_KEY_SIZE+SPHINCS_LEVEL3_KEY_SIZE)
 
-#define SPHINCS_LEVEL5_KEY_SIZE     OQS_SIG_sphincs_shake256_256f_simple_length_secret_key
-#define SPHINCS_LEVEL5_PUB_KEY_SIZE OQS_SIG_sphincs_shake256_256f_simple_length_public_key
+#define SPHINCS_LEVEL5_KEY_SIZE     OQS_SIG_sphincs_shake_256f_simple_length_secret_key
+#define SPHINCS_LEVEL5_PUB_KEY_SIZE OQS_SIG_sphincs_shake_256f_simple_length_public_key
 #define SPHINCS_LEVEL5_PRV_KEY_SIZE (SPHINCS_LEVEL5_PUB_KEY_SIZE+SPHINCS_LEVEL5_KEY_SIZE)
 #endif