Tweak case of [fs] variant letter in SLH-DSA algorithms

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/26359)

diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h
index ef72ad1c8cbec6f90aeed056b65ee00f41631720..8790de50dd6a52843f4076aa85852cb10d2c5ce0 100644 (file)
--- a/crypto/objects/obj_dat.h
+++ b/crypto/objects/obj_dat.h
@@ -1321,33 +1321,33 @@ static const unsigned char so[9517] = {
     0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x11,  /* [ 9246] OBJ_ML_DSA_44 */
     0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x12,  /* [ 9255] OBJ_ML_DSA_65 */
     0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x13,  /* [ 9264] OBJ_ML_DSA_87 */
-    0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x14,  /* [ 9273] OBJ_SLH_DSA_SHA2_128S */
-    0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x15,  /* [ 9282] OBJ_SLH_DSA_SHA2_128F */
-    0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x16,  /* [ 9291] OBJ_SLH_DSA_SHA2_192S */
-    0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x17,  /* [ 9300] OBJ_SLH_DSA_SHA2_192F */
-    0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x18,  /* [ 9309] OBJ_SLH_DSA_SHA2_256S */
-    0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x19,  /* [ 9318] OBJ_SLH_DSA_SHA2_256F */
-    0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x1A,  /* [ 9327] OBJ_SLH_DSA_SHAKE_128S */
-    0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x1B,  /* [ 9336] OBJ_SLH_DSA_SHAKE_128F */
-    0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x1C,  /* [ 9345] OBJ_SLH_DSA_SHAKE_192S */
-    0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x1D,  /* [ 9354] OBJ_SLH_DSA_SHAKE_192F */
-    0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x1E,  /* [ 9363] OBJ_SLH_DSA_SHAKE_256S */
-    0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x1F,  /* [ 9372] OBJ_SLH_DSA_SHAKE_256F */
+    0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x14,  /* [ 9273] OBJ_SLH_DSA_SHA2_128s */
+    0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x15,  /* [ 9282] OBJ_SLH_DSA_SHA2_128f */
+    0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x16,  /* [ 9291] OBJ_SLH_DSA_SHA2_192s */
+    0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x17,  /* [ 9300] OBJ_SLH_DSA_SHA2_192f */
+    0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x18,  /* [ 9309] OBJ_SLH_DSA_SHA2_256s */
+    0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x19,  /* [ 9318] OBJ_SLH_DSA_SHA2_256f */
+    0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x1A,  /* [ 9327] OBJ_SLH_DSA_SHAKE_128s */
+    0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x1B,  /* [ 9336] OBJ_SLH_DSA_SHAKE_128f */
+    0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x1C,  /* [ 9345] OBJ_SLH_DSA_SHAKE_192s */
+    0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x1D,  /* [ 9354] OBJ_SLH_DSA_SHAKE_192f */
+    0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x1E,  /* [ 9363] OBJ_SLH_DSA_SHAKE_256s */
+    0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x1F,  /* [ 9372] OBJ_SLH_DSA_SHAKE_256f */
     0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x20,  /* [ 9381] OBJ_HASH_ML_DSA_44_WITH_SHA512 */
     0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x21,  /* [ 9390] OBJ_HASH_ML_DSA_65_WITH_SHA512 */
     0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x22,  /* [ 9399] OBJ_HASH_ML_DSA_87_WITH_SHA512 */
-    0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x23,  /* [ 9408] OBJ_SLH_DSA_SHA2_128S_WITH_SHA256 */
-    0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x24,  /* [ 9417] OBJ_SLH_DSA_SHA2_128F_WITH_SHA256 */
-    0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x25,  /* [ 9426] OBJ_SLH_DSA_SHA2_192S_WITH_SHA512 */
-    0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x26,  /* [ 9435] OBJ_SLH_DSA_SHA2_192F_WITH_SHA512 */
-    0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x27,  /* [ 9444] OBJ_SLH_DSA_SHA2_256S_WITH_SHA512 */
-    0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x28,  /* [ 9453] OBJ_SLH_DSA_SHA2_256F_WITH_SHA512 */
-    0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x29,  /* [ 9462] OBJ_SLH_DSA_SHAKE_128S_WITH_SHAKE128 */
-    0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x2A,  /* [ 9471] OBJ_SLH_DSA_SHAKE_128F_WITH_SHAKE128 */
-    0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x2B,  /* [ 9480] OBJ_SLH_DSA_SHAKE_192S_WITH_SHAKE256 */
-    0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x2C,  /* [ 9489] OBJ_SLH_DSA_SHAKE_192F_WITH_SHAKE256 */
-    0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x2D,  /* [ 9498] OBJ_SLH_DSA_SHAKE_256S_WITH_SHAKE256 */
-    0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x2E,  /* [ 9507] OBJ_SLH_DSA_SHAKE_256F_WITH_SHAKE256 */
+    0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x23,  /* [ 9408] OBJ_SLH_DSA_SHA2_128s_WITH_SHA256 */
+    0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x24,  /* [ 9417] OBJ_SLH_DSA_SHA2_128f_WITH_SHA256 */
+    0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x25,  /* [ 9426] OBJ_SLH_DSA_SHA2_192s_WITH_SHA512 */
+    0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x26,  /* [ 9435] OBJ_SLH_DSA_SHA2_192f_WITH_SHA512 */
+    0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x27,  /* [ 9444] OBJ_SLH_DSA_SHA2_256s_WITH_SHA512 */
+    0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x28,  /* [ 9453] OBJ_SLH_DSA_SHA2_256f_WITH_SHA512 */
+    0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x29,  /* [ 9462] OBJ_SLH_DSA_SHAKE_128s_WITH_SHAKE128 */
+    0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x2A,  /* [ 9471] OBJ_SLH_DSA_SHAKE_128f_WITH_SHAKE128 */
+    0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x2B,  /* [ 9480] OBJ_SLH_DSA_SHAKE_192s_WITH_SHAKE256 */
+    0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x2C,  /* [ 9489] OBJ_SLH_DSA_SHAKE_192f_WITH_SHAKE256 */
+    0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x2D,  /* [ 9498] OBJ_SLH_DSA_SHAKE_256s_WITH_SHAKE256 */
+    0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x2E,  /* [ 9507] OBJ_SLH_DSA_SHAKE_256f_WITH_SHAKE256 */
 };
 
 #define NUM_NID 1487
@@ -2812,33 +2812,33 @@ static const ASN1_OBJECT nid_objs[NUM_NID] = {
     {"id-ml-dsa-44", "ML-DSA-44", NID_ML_DSA_44, 9, &so[9246]},
     {"id-ml-dsa-65", "ML-DSA-65", NID_ML_DSA_65, 9, &so[9255]},
     {"id-ml-dsa-87", "ML-DSA-87", NID_ML_DSA_87, 9, &so[9264]},
-    {"id-slh-dsa-sha2-128s", "SLH-DSA-SHA2-128S", NID_SLH_DSA_SHA2_128S, 9, &so[9273]},
-    {"id-slh-dsa-sha2-128f", "SLH-DSA-SHA2-128F", NID_SLH_DSA_SHA2_128F, 9, &so[9282]},
-    {"id-slh-dsa-sha2-192s", "SLH-DSA-SHA2-192S", NID_SLH_DSA_SHA2_192S, 9, &so[9291]},
-    {"id-slh-dsa-sha2-192f", "SLH-DSA-SHA2-192F", NID_SLH_DSA_SHA2_192F, 9, &so[9300]},
-    {"id-slh-dsa-sha2-256s", "SLH-DSA-SHA2-256S", NID_SLH_DSA_SHA2_256S, 9, &so[9309]},
-    {"id-slh-dsa-sha2-256f", "SLH-DSA-SHA2-256F", NID_SLH_DSA_SHA2_256F, 9, &so[9318]},
-    {"id-slh-dsa-shake-128s", "SLH-DSA-SHAKE-128S", NID_SLH_DSA_SHAKE_128S, 9, &so[9327]},
-    {"id-slh-dsa-shake-128f", "SLH-DSA-SHAKE-128F", NID_SLH_DSA_SHAKE_128F, 9, &so[9336]},
-    {"id-slh-dsa-shake-192s", "SLH-DSA-SHAKE-192S", NID_SLH_DSA_SHAKE_192S, 9, &so[9345]},
-    {"id-slh-dsa-shake-192f", "SLH-DSA-SHAKE-192F", NID_SLH_DSA_SHAKE_192F, 9, &so[9354]},
-    {"id-slh-dsa-shake-256s", "SLH-DSA-SHAKE-256S", NID_SLH_DSA_SHAKE_256S, 9, &so[9363]},
-    {"id-slh-dsa-shake-256f", "SLH-DSA-SHAKE-256F", NID_SLH_DSA_SHAKE_256F, 9, &so[9372]},
+    {"id-slh-dsa-sha2-128s", "SLH-DSA-SHA2-128s", NID_SLH_DSA_SHA2_128s, 9, &so[9273]},
+    {"id-slh-dsa-sha2-128f", "SLH-DSA-SHA2-128f", NID_SLH_DSA_SHA2_128f, 9, &so[9282]},
+    {"id-slh-dsa-sha2-192s", "SLH-DSA-SHA2-192s", NID_SLH_DSA_SHA2_192s, 9, &so[9291]},
+    {"id-slh-dsa-sha2-192f", "SLH-DSA-SHA2-192f", NID_SLH_DSA_SHA2_192f, 9, &so[9300]},
+    {"id-slh-dsa-sha2-256s", "SLH-DSA-SHA2-256s", NID_SLH_DSA_SHA2_256s, 9, &so[9309]},
+    {"id-slh-dsa-sha2-256f", "SLH-DSA-SHA2-256f", NID_SLH_DSA_SHA2_256f, 9, &so[9318]},
+    {"id-slh-dsa-shake-128s", "SLH-DSA-SHAKE-128s", NID_SLH_DSA_SHAKE_128s, 9, &so[9327]},
+    {"id-slh-dsa-shake-128f", "SLH-DSA-SHAKE-128f", NID_SLH_DSA_SHAKE_128f, 9, &so[9336]},
+    {"id-slh-dsa-shake-192s", "SLH-DSA-SHAKE-192s", NID_SLH_DSA_SHAKE_192s, 9, &so[9345]},
+    {"id-slh-dsa-shake-192f", "SLH-DSA-SHAKE-192f", NID_SLH_DSA_SHAKE_192f, 9, &so[9354]},
+    {"id-slh-dsa-shake-256s", "SLH-DSA-SHAKE-256s", NID_SLH_DSA_SHAKE_256s, 9, &so[9363]},
+    {"id-slh-dsa-shake-256f", "SLH-DSA-SHAKE-256f", NID_SLH_DSA_SHAKE_256f, 9, &so[9372]},
     {"id-hash-ml-dsa-44-with-sha512", "HASH-ML-DSA-44-WITH-SHA512", NID_HASH_ML_DSA_44_WITH_SHA512, 9, &so[9381]},
     {"id-hash-ml-dsa-65-with-sha512", "HASH-ML-DSA-65-WITH-SHA512", NID_HASH_ML_DSA_65_WITH_SHA512, 9, &so[9390]},
     {"id-hash-ml-dsa-87-with-sha512", "HASH-ML-DSA-87-WITH-SHA512", NID_HASH_ML_DSA_87_WITH_SHA512, 9, &so[9399]},
-    {"id-hash-slh-dsa-sha2-128s-with-sha256", "SLH-DSA-SHA2-128S-WITH-SHA256", NID_SLH_DSA_SHA2_128S_WITH_SHA256, 9, &so[9408]},
-    {"id-hash-slh-dsa-sha2-128f-with-sha256", "SLH-DSA-SHA2-128F-WITH-SHA256", NID_SLH_DSA_SHA2_128F_WITH_SHA256, 9, &so[9417]},
-    {"id-hash-slh-dsa-sha2-192s-with-sha512", "SLH-DSA-SHA2-192S-WITH-SHA512", NID_SLH_DSA_SHA2_192S_WITH_SHA512, 9, &so[9426]},
-    {"id-hash-slh-dsa-sha2-192f-with-sha512", "SLH-DSA-SHA2-192F-WITH-SHA512", NID_SLH_DSA_SHA2_192F_WITH_SHA512, 9, &so[9435]},
-    {"id-hash-slh-dsa-sha2-256s-with-sha512", "SLH-DSA-SHA2-256S-WITH-SHA512", NID_SLH_DSA_SHA2_256S_WITH_SHA512, 9, &so[9444]},
-    {"id-hash-slh-dsa-sha2-256f-with-sha512", "SLH-DSA-SHA2-256F-WITH-SHA512", NID_SLH_DSA_SHA2_256F_WITH_SHA512, 9, &so[9453]},
-    {"id-hash-slh-dsa-shake-128s-with-shake128", "SLH-DSA-SHAKE-128S-WITH-SHAKE128", NID_SLH_DSA_SHAKE_128S_WITH_SHAKE128, 9, &so[9462]},
-    {"id-hash-slh-dsa-shake-128f-with-shake128", "SLH-DSA-SHAKE-128F-WITH-SHAKE128", NID_SLH_DSA_SHAKE_128F_WITH_SHAKE128, 9, &so[9471]},
-    {"id-hash-slh-dsa-shake-192s-with-shake256", "SLH-DSA-SHAKE-192S-WITH-SHAKE256", NID_SLH_DSA_SHAKE_192S_WITH_SHAKE256, 9, &so[9480]},
-    {"id-hash-slh-dsa-shake-192f-with-shake256", "SLH-DSA-SHAKE-192F-WITH-SHAKE256", NID_SLH_DSA_SHAKE_192F_WITH_SHAKE256, 9, &so[9489]},
-    {"id-hash-slh-dsa-shake-256s-with-shake256", "SLH-DSA-SHAKE-256S-WITH-SHAKE256", NID_SLH_DSA_SHAKE_256S_WITH_SHAKE256, 9, &so[9498]},
-    {"id-hash-slh-dsa-shake-256f-with-shake256", "SLH-DSA-SHAKE-256F-WITH-SHAKE256", NID_SLH_DSA_SHAKE_256F_WITH_SHAKE256, 9, &so[9507]},
+    {"id-hash-slh-dsa-sha2-128s-with-sha256", "SLH-DSA-SHA2-128s-WITH-SHA256", NID_SLH_DSA_SHA2_128s_WITH_SHA256, 9, &so[9408]},
+    {"id-hash-slh-dsa-sha2-128f-with-sha256", "SLH-DSA-SHA2-128f-WITH-SHA256", NID_SLH_DSA_SHA2_128f_WITH_SHA256, 9, &so[9417]},
+    {"id-hash-slh-dsa-sha2-192s-with-sha512", "SLH-DSA-SHA2-192s-WITH-SHA512", NID_SLH_DSA_SHA2_192s_WITH_SHA512, 9, &so[9426]},
+    {"id-hash-slh-dsa-sha2-192f-with-sha512", "SLH-DSA-SHA2-192f-WITH-SHA512", NID_SLH_DSA_SHA2_192f_WITH_SHA512, 9, &so[9435]},
+    {"id-hash-slh-dsa-sha2-256s-with-sha512", "SLH-DSA-SHA2-256s-WITH-SHA512", NID_SLH_DSA_SHA2_256s_WITH_SHA512, 9, &so[9444]},
+    {"id-hash-slh-dsa-sha2-256f-with-sha512", "SLH-DSA-SHA2-256f-WITH-SHA512", NID_SLH_DSA_SHA2_256f_WITH_SHA512, 9, &so[9453]},
+    {"id-hash-slh-dsa-shake-128s-with-shake128", "SLH-DSA-SHAKE-128s-WITH-SHAKE128", NID_SLH_DSA_SHAKE_128s_WITH_SHAKE128, 9, &so[9462]},
+    {"id-hash-slh-dsa-shake-128f-with-shake128", "SLH-DSA-SHAKE-128f-WITH-SHAKE128", NID_SLH_DSA_SHAKE_128f_WITH_SHAKE128, 9, &so[9471]},
+    {"id-hash-slh-dsa-shake-192s-with-shake256", "SLH-DSA-SHAKE-192s-WITH-SHAKE256", NID_SLH_DSA_SHAKE_192s_WITH_SHAKE256, 9, &so[9480]},
+    {"id-hash-slh-dsa-shake-192f-with-shake256", "SLH-DSA-SHAKE-192f-WITH-SHAKE256", NID_SLH_DSA_SHAKE_192f_WITH_SHAKE256, 9, &so[9489]},
+    {"id-hash-slh-dsa-shake-256s-with-shake256", "SLH-DSA-SHAKE-256s-WITH-SHAKE256", NID_SLH_DSA_SHAKE_256s_WITH_SHAKE256, 9, &so[9498]},
+    {"id-hash-slh-dsa-shake-256f-with-shake256", "SLH-DSA-SHAKE-256f-WITH-SHAKE256", NID_SLH_DSA_SHAKE_256f_WITH_SHAKE256, 9, &so[9507]},
 };
 
 #define NUM_SN 1478
@@ -4588,30 +4588,30 @@ static const unsigned int ln_objs[NUM_LN] = {
     1452,    /* "Root of Trust of Measurement Trait Category" */
      188,    /* "S/MIME" */
      167,    /* "S/MIME Capabilities" */
-    1461,    /* "SLH-DSA-SHA2-128F" */
-    1476,    /* "SLH-DSA-SHA2-128F-WITH-SHA256" */
-    1460,    /* "SLH-DSA-SHA2-128S" */
-    1475,    /* "SLH-DSA-SHA2-128S-WITH-SHA256" */
-    1463,    /* "SLH-DSA-SHA2-192F" */
-    1478,    /* "SLH-DSA-SHA2-192F-WITH-SHA512" */
-    1462,    /* "SLH-DSA-SHA2-192S" */
-    1477,    /* "SLH-DSA-SHA2-192S-WITH-SHA512" */
-    1465,    /* "SLH-DSA-SHA2-256F" */
-    1480,    /* "SLH-DSA-SHA2-256F-WITH-SHA512" */
-    1464,    /* "SLH-DSA-SHA2-256S" */
-    1479,    /* "SLH-DSA-SHA2-256S-WITH-SHA512" */
-    1467,    /* "SLH-DSA-SHAKE-128F" */
-    1482,    /* "SLH-DSA-SHAKE-128F-WITH-SHAKE128" */
-    1466,    /* "SLH-DSA-SHAKE-128S" */
-    1481,    /* "SLH-DSA-SHAKE-128S-WITH-SHAKE128" */
-    1469,    /* "SLH-DSA-SHAKE-192F" */
-    1484,    /* "SLH-DSA-SHAKE-192F-WITH-SHAKE256" */
-    1468,    /* "SLH-DSA-SHAKE-192S" */
-    1483,    /* "SLH-DSA-SHAKE-192S-WITH-SHAKE256" */
-    1471,    /* "SLH-DSA-SHAKE-256F" */
-    1486,    /* "SLH-DSA-SHAKE-256F-WITH-SHAKE256" */
-    1470,    /* "SLH-DSA-SHAKE-256S" */
-    1485,    /* "SLH-DSA-SHAKE-256S-WITH-SHAKE256" */
+    1461,    /* "SLH-DSA-SHA2-128f" */
+    1476,    /* "SLH-DSA-SHA2-128f-WITH-SHA256" */
+    1460,    /* "SLH-DSA-SHA2-128s" */
+    1475,    /* "SLH-DSA-SHA2-128s-WITH-SHA256" */
+    1463,    /* "SLH-DSA-SHA2-192f" */
+    1478,    /* "SLH-DSA-SHA2-192f-WITH-SHA512" */
+    1462,    /* "SLH-DSA-SHA2-192s" */
+    1477,    /* "SLH-DSA-SHA2-192s-WITH-SHA512" */
+    1465,    /* "SLH-DSA-SHA2-256f" */
+    1480,    /* "SLH-DSA-SHA2-256f-WITH-SHA512" */
+    1464,    /* "SLH-DSA-SHA2-256s" */
+    1479,    /* "SLH-DSA-SHA2-256s-WITH-SHA512" */
+    1467,    /* "SLH-DSA-SHAKE-128f" */
+    1482,    /* "SLH-DSA-SHAKE-128f-WITH-SHAKE128" */
+    1466,    /* "SLH-DSA-SHAKE-128s" */
+    1481,    /* "SLH-DSA-SHAKE-128s-WITH-SHAKE128" */
+    1469,    /* "SLH-DSA-SHAKE-192f" */
+    1484,    /* "SLH-DSA-SHAKE-192f-WITH-SHAKE256" */
+    1468,    /* "SLH-DSA-SHAKE-192s" */
+    1483,    /* "SLH-DSA-SHAKE-192s-WITH-SHAKE256" */
+    1471,    /* "SLH-DSA-SHAKE-256f" */
+    1486,    /* "SLH-DSA-SHAKE-256f-WITH-SHAKE256" */
+    1470,    /* "SLH-DSA-SHAKE-256s" */
+    1485,    /* "SLH-DSA-SHAKE-256s-WITH-SHAKE256" */
     1204,    /* "SM2-with-SM3" */
     1006,    /* "SNILS" */
      387,    /* "SNMPv2" */
@@ -6897,33 +6897,33 @@ static const unsigned int obj_objs[NUM_OBJ] = {
     1457,    /* OBJ_ML_DSA_44                    2 16 840 1 101 3 4 3 17 */
     1458,    /* OBJ_ML_DSA_65                    2 16 840 1 101 3 4 3 18 */
     1459,    /* OBJ_ML_DSA_87                    2 16 840 1 101 3 4 3 19 */
-    1460,    /* OBJ_SLH_DSA_SHA2_128S            2 16 840 1 101 3 4 3 20 */
-    1461,    /* OBJ_SLH_DSA_SHA2_128F            2 16 840 1 101 3 4 3 21 */
-    1462,    /* OBJ_SLH_DSA_SHA2_192S            2 16 840 1 101 3 4 3 22 */
-    1463,    /* OBJ_SLH_DSA_SHA2_192F            2 16 840 1 101 3 4 3 23 */
-    1464,    /* OBJ_SLH_DSA_SHA2_256S            2 16 840 1 101 3 4 3 24 */
-    1465,    /* OBJ_SLH_DSA_SHA2_256F            2 16 840 1 101 3 4 3 25 */
-    1466,    /* OBJ_SLH_DSA_SHAKE_128S           2 16 840 1 101 3 4 3 26 */
-    1467,    /* OBJ_SLH_DSA_SHAKE_128F           2 16 840 1 101 3 4 3 27 */
-    1468,    /* OBJ_SLH_DSA_SHAKE_192S           2 16 840 1 101 3 4 3 28 */
-    1469,    /* OBJ_SLH_DSA_SHAKE_192F           2 16 840 1 101 3 4 3 29 */
-    1470,    /* OBJ_SLH_DSA_SHAKE_256S           2 16 840 1 101 3 4 3 30 */
-    1471,    /* OBJ_SLH_DSA_SHAKE_256F           2 16 840 1 101 3 4 3 31 */
+    1460,    /* OBJ_SLH_DSA_SHA2_128s            2 16 840 1 101 3 4 3 20 */
+    1461,    /* OBJ_SLH_DSA_SHA2_128f            2 16 840 1 101 3 4 3 21 */
+    1462,    /* OBJ_SLH_DSA_SHA2_192s            2 16 840 1 101 3 4 3 22 */
+    1463,    /* OBJ_SLH_DSA_SHA2_192f            2 16 840 1 101 3 4 3 23 */
+    1464,    /* OBJ_SLH_DSA_SHA2_256s            2 16 840 1 101 3 4 3 24 */
+    1465,    /* OBJ_SLH_DSA_SHA2_256f            2 16 840 1 101 3 4 3 25 */
+    1466,    /* OBJ_SLH_DSA_SHAKE_128s           2 16 840 1 101 3 4 3 26 */
+    1467,    /* OBJ_SLH_DSA_SHAKE_128f           2 16 840 1 101 3 4 3 27 */
+    1468,    /* OBJ_SLH_DSA_SHAKE_192s           2 16 840 1 101 3 4 3 28 */
+    1469,    /* OBJ_SLH_DSA_SHAKE_192f           2 16 840 1 101 3 4 3 29 */
+    1470,    /* OBJ_SLH_DSA_SHAKE_256s           2 16 840 1 101 3 4 3 30 */
+    1471,    /* OBJ_SLH_DSA_SHAKE_256f           2 16 840 1 101 3 4 3 31 */
     1472,    /* OBJ_HASH_ML_DSA_44_WITH_SHA512   2 16 840 1 101 3 4 3 32 */
     1473,    /* OBJ_HASH_ML_DSA_65_WITH_SHA512   2 16 840 1 101 3 4 3 33 */
     1474,    /* OBJ_HASH_ML_DSA_87_WITH_SHA512   2 16 840 1 101 3 4 3 34 */
-    1475,    /* OBJ_SLH_DSA_SHA2_128S_WITH_SHA256 2 16 840 1 101 3 4 3 35 */
-    1476,    /* OBJ_SLH_DSA_SHA2_128F_WITH_SHA256 2 16 840 1 101 3 4 3 36 */
-    1477,    /* OBJ_SLH_DSA_SHA2_192S_WITH_SHA512 2 16 840 1 101 3 4 3 37 */
-    1478,    /* OBJ_SLH_DSA_SHA2_192F_WITH_SHA512 2 16 840 1 101 3 4 3 38 */
-    1479,    /* OBJ_SLH_DSA_SHA2_256S_WITH_SHA512 2 16 840 1 101 3 4 3 39 */
-    1480,    /* OBJ_SLH_DSA_SHA2_256F_WITH_SHA512 2 16 840 1 101 3 4 3 40 */
-    1481,    /* OBJ_SLH_DSA_SHAKE_128S_WITH_SHAKE128 2 16 840 1 101 3 4 3 41 */
-    1482,    /* OBJ_SLH_DSA_SHAKE_128F_WITH_SHAKE128 2 16 840 1 101 3 4 3 42 */
-    1483,    /* OBJ_SLH_DSA_SHAKE_192S_WITH_SHAKE256 2 16 840 1 101 3 4 3 43 */
-    1484,    /* OBJ_SLH_DSA_SHAKE_192F_WITH_SHAKE256 2 16 840 1 101 3 4 3 44 */
-    1485,    /* OBJ_SLH_DSA_SHAKE_256S_WITH_SHAKE256 2 16 840 1 101 3 4 3 45 */
-    1486,    /* OBJ_SLH_DSA_SHAKE_256F_WITH_SHAKE256 2 16 840 1 101 3 4 3 46 */
+    1475,    /* OBJ_SLH_DSA_SHA2_128s_WITH_SHA256 2 16 840 1 101 3 4 3 35 */
+    1476,    /* OBJ_SLH_DSA_SHA2_128f_WITH_SHA256 2 16 840 1 101 3 4 3 36 */
+    1477,    /* OBJ_SLH_DSA_SHA2_192s_WITH_SHA512 2 16 840 1 101 3 4 3 37 */
+    1478,    /* OBJ_SLH_DSA_SHA2_192f_WITH_SHA512 2 16 840 1 101 3 4 3 38 */
+    1479,    /* OBJ_SLH_DSA_SHA2_256s_WITH_SHA512 2 16 840 1 101 3 4 3 39 */
+    1480,    /* OBJ_SLH_DSA_SHA2_256f_WITH_SHA512 2 16 840 1 101 3 4 3 40 */
+    1481,    /* OBJ_SLH_DSA_SHAKE_128s_WITH_SHAKE128 2 16 840 1 101 3 4 3 41 */
+    1482,    /* OBJ_SLH_DSA_SHAKE_128f_WITH_SHAKE128 2 16 840 1 101 3 4 3 42 */
+    1483,    /* OBJ_SLH_DSA_SHAKE_192s_WITH_SHAKE256 2 16 840 1 101 3 4 3 43 */
+    1484,    /* OBJ_SLH_DSA_SHAKE_192f_WITH_SHAKE256 2 16 840 1 101 3 4 3 44 */
+    1485,    /* OBJ_SLH_DSA_SHAKE_256s_WITH_SHAKE256 2 16 840 1 101 3 4 3 45 */
+    1486,    /* OBJ_SLH_DSA_SHAKE_256f_WITH_SHAKE256 2 16 840 1 101 3 4 3 46 */
     1454,    /* OBJ_ML_KEM_512                   2 16 840 1 101 3 4 4 1 */
     1455,    /* OBJ_ML_KEM_768                   2 16 840 1 101 3 4 4 2 */
     1456,    /* OBJ_ML_KEM_1024                  2 16 840 1 101 3 4 4 3 */

diff --git a/crypto/objects/obj_mac.num b/crypto/objects/obj_mac.num
index 6f0a992eafb2fa5ab8887ad01b2eaff740c88bfd..80413e087a0969ab4944c4d2dc6837ab8633fe29 100644 (file)
--- a/crypto/objects/obj_mac.num
+++ b/crypto/objects/obj_mac.num
@@ -1457,30 +1457,30 @@ ML_KEM_1024             1456
 ML_DSA_44              1457
 ML_DSA_65              1458
 ML_DSA_87              1459
-SLH_DSA_SHA2_128S              1460
-SLH_DSA_SHA2_128F              1461
-SLH_DSA_SHA2_192S              1462
-SLH_DSA_SHA2_192F              1463
-SLH_DSA_SHA2_256S              1464
-SLH_DSA_SHA2_256F              1465
-SLH_DSA_SHAKE_128S             1466
-SLH_DSA_SHAKE_128F             1467
-SLH_DSA_SHAKE_192S             1468
-SLH_DSA_SHAKE_192F             1469
-SLH_DSA_SHAKE_256S             1470
-SLH_DSA_SHAKE_256F             1471
+SLH_DSA_SHA2_128s              1460
+SLH_DSA_SHA2_128f              1461
+SLH_DSA_SHA2_192s              1462
+SLH_DSA_SHA2_192f              1463
+SLH_DSA_SHA2_256s              1464
+SLH_DSA_SHA2_256f              1465
+SLH_DSA_SHAKE_128s             1466
+SLH_DSA_SHAKE_128f             1467
+SLH_DSA_SHAKE_192s             1468
+SLH_DSA_SHAKE_192f             1469
+SLH_DSA_SHAKE_256s             1470
+SLH_DSA_SHAKE_256f             1471
 HASH_ML_DSA_44_WITH_SHA512             1472
 HASH_ML_DSA_65_WITH_SHA512             1473
 HASH_ML_DSA_87_WITH_SHA512             1474
-SLH_DSA_SHA2_128S_WITH_SHA256          1475
-SLH_DSA_SHA2_128F_WITH_SHA256          1476
-SLH_DSA_SHA2_192S_WITH_SHA512          1477
-SLH_DSA_SHA2_192F_WITH_SHA512          1478
-SLH_DSA_SHA2_256S_WITH_SHA512          1479
-SLH_DSA_SHA2_256F_WITH_SHA512          1480
-SLH_DSA_SHAKE_128S_WITH_SHAKE128               1481
-SLH_DSA_SHAKE_128F_WITH_SHAKE128               1482
-SLH_DSA_SHAKE_192S_WITH_SHAKE256               1483
-SLH_DSA_SHAKE_192F_WITH_SHAKE256               1484
-SLH_DSA_SHAKE_256S_WITH_SHAKE256               1485
-SLH_DSA_SHAKE_256F_WITH_SHAKE256               1486
+SLH_DSA_SHA2_128s_WITH_SHA256          1475
+SLH_DSA_SHA2_128f_WITH_SHA256          1476
+SLH_DSA_SHA2_192s_WITH_SHA512          1477
+SLH_DSA_SHA2_192f_WITH_SHA512          1478
+SLH_DSA_SHA2_256s_WITH_SHA512          1479
+SLH_DSA_SHA2_256f_WITH_SHA512          1480
+SLH_DSA_SHAKE_128s_WITH_SHAKE128               1481
+SLH_DSA_SHAKE_128f_WITH_SHAKE128               1482
+SLH_DSA_SHAKE_192s_WITH_SHAKE256               1483
+SLH_DSA_SHAKE_192f_WITH_SHAKE256               1484
+SLH_DSA_SHAKE_256s_WITH_SHAKE256               1485
+SLH_DSA_SHAKE_256f_WITH_SHAKE256               1486

diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index 407d4777f95db8ce3725660bd02661fc47c3c2bb..06fe6f4bdadf36b1341a951560112e553255c945 100644 (file)
--- a/crypto/objects/objects.txt
+++ b/crypto/objects/objects.txt
@@ -1124,33 +1124,33 @@ sigAlgs 16      : id-rsassa-pkcs1-v1_5-with-sha3-512    : RSA-SHA3-512
 sigAlgs 17      : id-ml-dsa-44      : ML-DSA-44
 sigAlgs 18      : id-ml-dsa-65      : ML-DSA-65
 sigAlgs 19      : id-ml-dsa-87      : ML-DSA-87
-sigAlgs 20      : id-slh-dsa-sha2-128s : SLH-DSA-SHA2-128S
-sigAlgs 21      : id-slh-dsa-sha2-128f : SLH-DSA-SHA2-128F
-sigAlgs 22      : id-slh-dsa-sha2-192s : SLH-DSA-SHA2-192S
-sigAlgs 23      : id-slh-dsa-sha2-192f : SLH-DSA-SHA2-192F
-sigAlgs 24      : id-slh-dsa-sha2-256s : SLH-DSA-SHA2-256S
-sigAlgs 25      : id-slh-dsa-sha2-256f : SLH-DSA-SHA2-256F
-sigAlgs 26      : id-slh-dsa-shake-128s        : SLH-DSA-SHAKE-128S
-sigAlgs 27      : id-slh-dsa-shake-128f        : SLH-DSA-SHAKE-128F
-sigAlgs 28      : id-slh-dsa-shake-192s        : SLH-DSA-SHAKE-192S
-sigAlgs 29      : id-slh-dsa-shake-192f        : SLH-DSA-SHAKE-192F
-sigAlgs 30      : id-slh-dsa-shake-256s        : SLH-DSA-SHAKE-256S
-sigAlgs 31      : id-slh-dsa-shake-256f        : SLH-DSA-SHAKE-256F
+sigAlgs 20      : id-slh-dsa-sha2-128s : SLH-DSA-SHA2-128s
+sigAlgs 21      : id-slh-dsa-sha2-128f : SLH-DSA-SHA2-128f
+sigAlgs 22      : id-slh-dsa-sha2-192s : SLH-DSA-SHA2-192s
+sigAlgs 23      : id-slh-dsa-sha2-192f : SLH-DSA-SHA2-192f
+sigAlgs 24      : id-slh-dsa-sha2-256s : SLH-DSA-SHA2-256s
+sigAlgs 25      : id-slh-dsa-sha2-256f : SLH-DSA-SHA2-256f
+sigAlgs 26      : id-slh-dsa-shake-128s        : SLH-DSA-SHAKE-128s
+sigAlgs 27      : id-slh-dsa-shake-128f        : SLH-DSA-SHAKE-128f
+sigAlgs 28      : id-slh-dsa-shake-192s        : SLH-DSA-SHAKE-192s
+sigAlgs 29      : id-slh-dsa-shake-192f        : SLH-DSA-SHAKE-192f
+sigAlgs 30      : id-slh-dsa-shake-256s        : SLH-DSA-SHAKE-256s
+sigAlgs 31      : id-slh-dsa-shake-256f        : SLH-DSA-SHAKE-256f
 sigAlgs 32      : id-hash-ml-dsa-44-with-sha512 : HASH-ML-DSA-44-WITH-SHA512
 sigAlgs 33      : id-hash-ml-dsa-65-with-sha512 : HASH-ML-DSA-65-WITH-SHA512
 sigAlgs 34      : id-hash-ml-dsa-87-with-sha512 : HASH-ML-DSA-87-WITH-SHA512
-sigAlgs 35      : id-hash-slh-dsa-sha2-128s-with-sha256    : SLH-DSA-SHA2-128S-WITH-SHA256
-sigAlgs 36      : id-hash-slh-dsa-sha2-128f-with-sha256    : SLH-DSA-SHA2-128F-WITH-SHA256
-sigAlgs 37      : id-hash-slh-dsa-sha2-192s-with-sha512    : SLH-DSA-SHA2-192S-WITH-SHA512
-sigAlgs 38      : id-hash-slh-dsa-sha2-192f-with-sha512    : SLH-DSA-SHA2-192F-WITH-SHA512
-sigAlgs 39      : id-hash-slh-dsa-sha2-256s-with-sha512    : SLH-DSA-SHA2-256S-WITH-SHA512
-sigAlgs 40      : id-hash-slh-dsa-sha2-256f-with-sha512    : SLH-DSA-SHA2-256F-WITH-SHA512
-sigAlgs 41      : id-hash-slh-dsa-shake-128s-with-shake128 : SLH-DSA-SHAKE-128S-WITH-SHAKE128
-sigAlgs 42      : id-hash-slh-dsa-shake-128f-with-shake128 : SLH-DSA-SHAKE-128F-WITH-SHAKE128
-sigAlgs 43      : id-hash-slh-dsa-shake-192s-with-shake256 : SLH-DSA-SHAKE-192S-WITH-SHAKE256
-sigAlgs 44      : id-hash-slh-dsa-shake-192f-with-shake256 : SLH-DSA-SHAKE-192F-WITH-SHAKE256
-sigAlgs 45      : id-hash-slh-dsa-shake-256s-with-shake256 : SLH-DSA-SHAKE-256S-WITH-SHAKE256
-sigAlgs 46      : id-hash-slh-dsa-shake-256f-with-shake256 : SLH-DSA-SHAKE-256F-WITH-SHAKE256
+sigAlgs 35      : id-hash-slh-dsa-sha2-128s-with-sha256    : SLH-DSA-SHA2-128s-WITH-SHA256
+sigAlgs 36      : id-hash-slh-dsa-sha2-128f-with-sha256    : SLH-DSA-SHA2-128f-WITH-SHA256
+sigAlgs 37      : id-hash-slh-dsa-sha2-192s-with-sha512    : SLH-DSA-SHA2-192s-WITH-SHA512
+sigAlgs 38      : id-hash-slh-dsa-sha2-192f-with-sha512    : SLH-DSA-SHA2-192f-WITH-SHA512
+sigAlgs 39      : id-hash-slh-dsa-sha2-256s-with-sha512    : SLH-DSA-SHA2-256s-WITH-SHA512
+sigAlgs 40      : id-hash-slh-dsa-sha2-256f-with-sha512    : SLH-DSA-SHA2-256f-WITH-SHA512
+sigAlgs 41      : id-hash-slh-dsa-shake-128s-with-shake128 : SLH-DSA-SHAKE-128s-WITH-SHAKE128
+sigAlgs 42      : id-hash-slh-dsa-shake-128f-with-shake128 : SLH-DSA-SHAKE-128f-WITH-SHAKE128
+sigAlgs 43      : id-hash-slh-dsa-shake-192s-with-shake256 : SLH-DSA-SHAKE-192s-WITH-SHAKE256
+sigAlgs 44      : id-hash-slh-dsa-shake-192f-with-shake256 : SLH-DSA-SHAKE-192f-WITH-SHAKE256
+sigAlgs 45      : id-hash-slh-dsa-shake-256s-with-shake256 : SLH-DSA-SHAKE-256s-WITH-SHAKE256
+sigAlgs 46      : id-hash-slh-dsa-shake-256f-with-shake256 : SLH-DSA-SHAKE-256f-WITH-SHAKE256
 
 # Hold instruction CRL entry extension
 !Cname hold-instruction-code

diff --git a/fuzz/oids.txt b/fuzz/oids.txt
index 904676446c034e16dd2e32a2765a3bca8311b365..307e92ea513d2a3fad63e5b7aee6159ac3bb052d 100644 (file)
--- a/fuzz/oids.txt
+++ b/fuzz/oids.txt
@@ -1317,30 +1317,30 @@ OBJ_ML_KEM_1024="\x60\x86\x48\x01\x65\x03\x04\x04\x03"
 OBJ_ML_DSA_44="\x60\x86\x48\x01\x65\x03\x04\x03\x11"
 OBJ_ML_DSA_65="\x60\x86\x48\x01\x65\x03\x04\x03\x12"
 OBJ_ML_DSA_87="\x60\x86\x48\x01\x65\x03\x04\x03\x13"
-OBJ_SLH_DSA_SHA2_128S="\x60\x86\x48\x01\x65\x03\x04\x03\x14"
-OBJ_SLH_DSA_SHA2_128F="\x60\x86\x48\x01\x65\x03\x04\x03\x15"
-OBJ_SLH_DSA_SHA2_192S="\x60\x86\x48\x01\x65\x03\x04\x03\x16"
-OBJ_SLH_DSA_SHA2_192F="\x60\x86\x48\x01\x65\x03\x04\x03\x17"
-OBJ_SLH_DSA_SHA2_256S="\x60\x86\x48\x01\x65\x03\x04\x03\x18"
-OBJ_SLH_DSA_SHA2_256F="\x60\x86\x48\x01\x65\x03\x04\x03\x19"
-OBJ_SLH_DSA_SHAKE_128S="\x60\x86\x48\x01\x65\x03\x04\x03\x1A"
-OBJ_SLH_DSA_SHAKE_128F="\x60\x86\x48\x01\x65\x03\x04\x03\x1B"
-OBJ_SLH_DSA_SHAKE_192S="\x60\x86\x48\x01\x65\x03\x04\x03\x1C"
-OBJ_SLH_DSA_SHAKE_192F="\x60\x86\x48\x01\x65\x03\x04\x03\x1D"
-OBJ_SLH_DSA_SHAKE_256S="\x60\x86\x48\x01\x65\x03\x04\x03\x1E"
-OBJ_SLH_DSA_SHAKE_256F="\x60\x86\x48\x01\x65\x03\x04\x03\x1F"
+OBJ_SLH_DSA_SHA2_128s="\x60\x86\x48\x01\x65\x03\x04\x03\x14"
+OBJ_SLH_DSA_SHA2_128f="\x60\x86\x48\x01\x65\x03\x04\x03\x15"
+OBJ_SLH_DSA_SHA2_192s="\x60\x86\x48\x01\x65\x03\x04\x03\x16"
+OBJ_SLH_DSA_SHA2_192f="\x60\x86\x48\x01\x65\x03\x04\x03\x17"
+OBJ_SLH_DSA_SHA2_256s="\x60\x86\x48\x01\x65\x03\x04\x03\x18"
+OBJ_SLH_DSA_SHA2_256f="\x60\x86\x48\x01\x65\x03\x04\x03\x19"
+OBJ_SLH_DSA_SHAKE_128s="\x60\x86\x48\x01\x65\x03\x04\x03\x1A"
+OBJ_SLH_DSA_SHAKE_128f="\x60\x86\x48\x01\x65\x03\x04\x03\x1B"
+OBJ_SLH_DSA_SHAKE_192s="\x60\x86\x48\x01\x65\x03\x04\x03\x1C"
+OBJ_SLH_DSA_SHAKE_192f="\x60\x86\x48\x01\x65\x03\x04\x03\x1D"
+OBJ_SLH_DSA_SHAKE_256s="\x60\x86\x48\x01\x65\x03\x04\x03\x1E"
+OBJ_SLH_DSA_SHAKE_256f="\x60\x86\x48\x01\x65\x03\x04\x03\x1F"
 OBJ_HASH_ML_DSA_44_WITH_SHA512="\x60\x86\x48\x01\x65\x03\x04\x03\x20"
 OBJ_HASH_ML_DSA_65_WITH_SHA512="\x60\x86\x48\x01\x65\x03\x04\x03\x21"
 OBJ_HASH_ML_DSA_87_WITH_SHA512="\x60\x86\x48\x01\x65\x03\x04\x03\x22"
-OBJ_SLH_DSA_SHA2_128S_WITH_SHA256="\x60\x86\x48\x01\x65\x03\x04\x03\x23"
-OBJ_SLH_DSA_SHA2_128F_WITH_SHA256="\x60\x86\x48\x01\x65\x03\x04\x03\x24"
-OBJ_SLH_DSA_SHA2_192S_WITH_SHA512="\x60\x86\x48\x01\x65\x03\x04\x03\x25"
-OBJ_SLH_DSA_SHA2_192F_WITH_SHA512="\x60\x86\x48\x01\x65\x03\x04\x03\x26"
-OBJ_SLH_DSA_SHA2_256S_WITH_SHA512="\x60\x86\x48\x01\x65\x03\x04\x03\x27"
-OBJ_SLH_DSA_SHA2_256F_WITH_SHA512="\x60\x86\x48\x01\x65\x03\x04\x03\x28"
-OBJ_SLH_DSA_SHAKE_128S_WITH_SHAKE128="\x60\x86\x48\x01\x65\x03\x04\x03\x29"
-OBJ_SLH_DSA_SHAKE_128F_WITH_SHAKE128="\x60\x86\x48\x01\x65\x03\x04\x03\x2A"
-OBJ_SLH_DSA_SHAKE_192S_WITH_SHAKE256="\x60\x86\x48\x01\x65\x03\x04\x03\x2B"
-OBJ_SLH_DSA_SHAKE_192F_WITH_SHAKE256="\x60\x86\x48\x01\x65\x03\x04\x03\x2C"
-OBJ_SLH_DSA_SHAKE_256S_WITH_SHAKE256="\x60\x86\x48\x01\x65\x03\x04\x03\x2D"
-OBJ_SLH_DSA_SHAKE_256F_WITH_SHAKE256="\x60\x86\x48\x01\x65\x03\x04\x03\x2E"
+OBJ_SLH_DSA_SHA2_128s_WITH_SHA256="\x60\x86\x48\x01\x65\x03\x04\x03\x23"
+OBJ_SLH_DSA_SHA2_128f_WITH_SHA256="\x60\x86\x48\x01\x65\x03\x04\x03\x24"
+OBJ_SLH_DSA_SHA2_192s_WITH_SHA512="\x60\x86\x48\x01\x65\x03\x04\x03\x25"
+OBJ_SLH_DSA_SHA2_192f_WITH_SHA512="\x60\x86\x48\x01\x65\x03\x04\x03\x26"
+OBJ_SLH_DSA_SHA2_256s_WITH_SHA512="\x60\x86\x48\x01\x65\x03\x04\x03\x27"
+OBJ_SLH_DSA_SHA2_256f_WITH_SHA512="\x60\x86\x48\x01\x65\x03\x04\x03\x28"
+OBJ_SLH_DSA_SHAKE_128s_WITH_SHAKE128="\x60\x86\x48\x01\x65\x03\x04\x03\x29"
+OBJ_SLH_DSA_SHAKE_128f_WITH_SHAKE128="\x60\x86\x48\x01\x65\x03\x04\x03\x2A"
+OBJ_SLH_DSA_SHAKE_192s_WITH_SHAKE256="\x60\x86\x48\x01\x65\x03\x04\x03\x2B"
+OBJ_SLH_DSA_SHAKE_192f_WITH_SHAKE256="\x60\x86\x48\x01\x65\x03\x04\x03\x2C"
+OBJ_SLH_DSA_SHAKE_256s_WITH_SHAKE256="\x60\x86\x48\x01\x65\x03\x04\x03\x2D"
+OBJ_SLH_DSA_SHAKE_256f_WITH_SHAKE256="\x60\x86\x48\x01\x65\x03\x04\x03\x2E"

diff --git a/include/openssl/obj_mac.h b/include/openssl/obj_mac.h
index 419860c91df7a322db4a1ced97e4f3949683a213..ee71e26458ff72c64eb9b903186cff5d05a78243 100644 (file)
--- a/include/openssl/obj_mac.h
+++ b/include/openssl/obj_mac.h
@@ -3446,65 +3446,65 @@
 #define NID_ML_DSA_87           1459
 #define OBJ_ML_DSA_87           OBJ_sigAlgs,19L
 
-#define SN_SLH_DSA_SHA2_128S            "id-slh-dsa-sha2-128s"
-#define LN_SLH_DSA_SHA2_128S            "SLH-DSA-SHA2-128S"
-#define NID_SLH_DSA_SHA2_128S           1460
-#define OBJ_SLH_DSA_SHA2_128S           OBJ_sigAlgs,20L
-
-#define SN_SLH_DSA_SHA2_128F            "id-slh-dsa-sha2-128f"
-#define LN_SLH_DSA_SHA2_128F            "SLH-DSA-SHA2-128F"
-#define NID_SLH_DSA_SHA2_128F           1461
-#define OBJ_SLH_DSA_SHA2_128F           OBJ_sigAlgs,21L
-
-#define SN_SLH_DSA_SHA2_192S            "id-slh-dsa-sha2-192s"
-#define LN_SLH_DSA_SHA2_192S            "SLH-DSA-SHA2-192S"
-#define NID_SLH_DSA_SHA2_192S           1462
-#define OBJ_SLH_DSA_SHA2_192S           OBJ_sigAlgs,22L
-
-#define SN_SLH_DSA_SHA2_192F            "id-slh-dsa-sha2-192f"
-#define LN_SLH_DSA_SHA2_192F            "SLH-DSA-SHA2-192F"
-#define NID_SLH_DSA_SHA2_192F           1463
-#define OBJ_SLH_DSA_SHA2_192F           OBJ_sigAlgs,23L
-
-#define SN_SLH_DSA_SHA2_256S            "id-slh-dsa-sha2-256s"
-#define LN_SLH_DSA_SHA2_256S            "SLH-DSA-SHA2-256S"
-#define NID_SLH_DSA_SHA2_256S           1464
-#define OBJ_SLH_DSA_SHA2_256S           OBJ_sigAlgs,24L
-
-#define SN_SLH_DSA_SHA2_256F            "id-slh-dsa-sha2-256f"
-#define LN_SLH_DSA_SHA2_256F            "SLH-DSA-SHA2-256F"
-#define NID_SLH_DSA_SHA2_256F           1465
-#define OBJ_SLH_DSA_SHA2_256F           OBJ_sigAlgs,25L
-
-#define SN_SLH_DSA_SHAKE_128S           "id-slh-dsa-shake-128s"
-#define LN_SLH_DSA_SHAKE_128S           "SLH-DSA-SHAKE-128S"
-#define NID_SLH_DSA_SHAKE_128S          1466
-#define OBJ_SLH_DSA_SHAKE_128S          OBJ_sigAlgs,26L
-
-#define SN_SLH_DSA_SHAKE_128F           "id-slh-dsa-shake-128f"
-#define LN_SLH_DSA_SHAKE_128F           "SLH-DSA-SHAKE-128F"
-#define NID_SLH_DSA_SHAKE_128F          1467
-#define OBJ_SLH_DSA_SHAKE_128F          OBJ_sigAlgs,27L
-
-#define SN_SLH_DSA_SHAKE_192S           "id-slh-dsa-shake-192s"
-#define LN_SLH_DSA_SHAKE_192S           "SLH-DSA-SHAKE-192S"
-#define NID_SLH_DSA_SHAKE_192S          1468
-#define OBJ_SLH_DSA_SHAKE_192S          OBJ_sigAlgs,28L
-
-#define SN_SLH_DSA_SHAKE_192F           "id-slh-dsa-shake-192f"
-#define LN_SLH_DSA_SHAKE_192F           "SLH-DSA-SHAKE-192F"
-#define NID_SLH_DSA_SHAKE_192F          1469
-#define OBJ_SLH_DSA_SHAKE_192F          OBJ_sigAlgs,29L
-
-#define SN_SLH_DSA_SHAKE_256S           "id-slh-dsa-shake-256s"
-#define LN_SLH_DSA_SHAKE_256S           "SLH-DSA-SHAKE-256S"
-#define NID_SLH_DSA_SHAKE_256S          1470
-#define OBJ_SLH_DSA_SHAKE_256S          OBJ_sigAlgs,30L
-
-#define SN_SLH_DSA_SHAKE_256F           "id-slh-dsa-shake-256f"
-#define LN_SLH_DSA_SHAKE_256F           "SLH-DSA-SHAKE-256F"
-#define NID_SLH_DSA_SHAKE_256F          1471
-#define OBJ_SLH_DSA_SHAKE_256F          OBJ_sigAlgs,31L
+#define SN_SLH_DSA_SHA2_128s            "id-slh-dsa-sha2-128s"
+#define LN_SLH_DSA_SHA2_128s            "SLH-DSA-SHA2-128s"
+#define NID_SLH_DSA_SHA2_128s           1460
+#define OBJ_SLH_DSA_SHA2_128s           OBJ_sigAlgs,20L
+
+#define SN_SLH_DSA_SHA2_128f            "id-slh-dsa-sha2-128f"
+#define LN_SLH_DSA_SHA2_128f            "SLH-DSA-SHA2-128f"
+#define NID_SLH_DSA_SHA2_128f           1461
+#define OBJ_SLH_DSA_SHA2_128f           OBJ_sigAlgs,21L
+
+#define SN_SLH_DSA_SHA2_192s            "id-slh-dsa-sha2-192s"
+#define LN_SLH_DSA_SHA2_192s            "SLH-DSA-SHA2-192s"
+#define NID_SLH_DSA_SHA2_192s           1462
+#define OBJ_SLH_DSA_SHA2_192s           OBJ_sigAlgs,22L
+
+#define SN_SLH_DSA_SHA2_192f            "id-slh-dsa-sha2-192f"
+#define LN_SLH_DSA_SHA2_192f            "SLH-DSA-SHA2-192f"
+#define NID_SLH_DSA_SHA2_192f           1463
+#define OBJ_SLH_DSA_SHA2_192f           OBJ_sigAlgs,23L
+
+#define SN_SLH_DSA_SHA2_256s            "id-slh-dsa-sha2-256s"
+#define LN_SLH_DSA_SHA2_256s            "SLH-DSA-SHA2-256s"
+#define NID_SLH_DSA_SHA2_256s           1464
+#define OBJ_SLH_DSA_SHA2_256s           OBJ_sigAlgs,24L
+
+#define SN_SLH_DSA_SHA2_256f            "id-slh-dsa-sha2-256f"
+#define LN_SLH_DSA_SHA2_256f            "SLH-DSA-SHA2-256f"
+#define NID_SLH_DSA_SHA2_256f           1465
+#define OBJ_SLH_DSA_SHA2_256f           OBJ_sigAlgs,25L
+
+#define SN_SLH_DSA_SHAKE_128s           "id-slh-dsa-shake-128s"
+#define LN_SLH_DSA_SHAKE_128s           "SLH-DSA-SHAKE-128s"
+#define NID_SLH_DSA_SHAKE_128s          1466
+#define OBJ_SLH_DSA_SHAKE_128s          OBJ_sigAlgs,26L
+
+#define SN_SLH_DSA_SHAKE_128f           "id-slh-dsa-shake-128f"
+#define LN_SLH_DSA_SHAKE_128f           "SLH-DSA-SHAKE-128f"
+#define NID_SLH_DSA_SHAKE_128f          1467
+#define OBJ_SLH_DSA_SHAKE_128f          OBJ_sigAlgs,27L
+
+#define SN_SLH_DSA_SHAKE_192s           "id-slh-dsa-shake-192s"
+#define LN_SLH_DSA_SHAKE_192s           "SLH-DSA-SHAKE-192s"
+#define NID_SLH_DSA_SHAKE_192s          1468
+#define OBJ_SLH_DSA_SHAKE_192s          OBJ_sigAlgs,28L
+
+#define SN_SLH_DSA_SHAKE_192f           "id-slh-dsa-shake-192f"
+#define LN_SLH_DSA_SHAKE_192f           "SLH-DSA-SHAKE-192f"
+#define NID_SLH_DSA_SHAKE_192f          1469
+#define OBJ_SLH_DSA_SHAKE_192f          OBJ_sigAlgs,29L
+
+#define SN_SLH_DSA_SHAKE_256s           "id-slh-dsa-shake-256s"
+#define LN_SLH_DSA_SHAKE_256s           "SLH-DSA-SHAKE-256s"
+#define NID_SLH_DSA_SHAKE_256s          1470
+#define OBJ_SLH_DSA_SHAKE_256s          OBJ_sigAlgs,30L
+
+#define SN_SLH_DSA_SHAKE_256f           "id-slh-dsa-shake-256f"
+#define LN_SLH_DSA_SHAKE_256f           "SLH-DSA-SHAKE-256f"
+#define NID_SLH_DSA_SHAKE_256f          1471
+#define OBJ_SLH_DSA_SHAKE_256f          OBJ_sigAlgs,31L
 
 #define SN_HASH_ML_DSA_44_WITH_SHA512           "id-hash-ml-dsa-44-with-sha512"
 #define LN_HASH_ML_DSA_44_WITH_SHA512           "HASH-ML-DSA-44-WITH-SHA512"
@@ -3521,65 +3521,65 @@
 #define NID_HASH_ML_DSA_87_WITH_SHA512          1474
 #define OBJ_HASH_ML_DSA_87_WITH_SHA512          OBJ_sigAlgs,34L
 
-#define SN_SLH_DSA_SHA2_128S_WITH_SHA256                "id-hash-slh-dsa-sha2-128s-with-sha256"
-#define LN_SLH_DSA_SHA2_128S_WITH_SHA256                "SLH-DSA-SHA2-128S-WITH-SHA256"
-#define NID_SLH_DSA_SHA2_128S_WITH_SHA256               1475
-#define OBJ_SLH_DSA_SHA2_128S_WITH_SHA256               OBJ_sigAlgs,35L
-
-#define SN_SLH_DSA_SHA2_128F_WITH_SHA256                "id-hash-slh-dsa-sha2-128f-with-sha256"
-#define LN_SLH_DSA_SHA2_128F_WITH_SHA256                "SLH-DSA-SHA2-128F-WITH-SHA256"
-#define NID_SLH_DSA_SHA2_128F_WITH_SHA256               1476
-#define OBJ_SLH_DSA_SHA2_128F_WITH_SHA256               OBJ_sigAlgs,36L
-
-#define SN_SLH_DSA_SHA2_192S_WITH_SHA512                "id-hash-slh-dsa-sha2-192s-with-sha512"
-#define LN_SLH_DSA_SHA2_192S_WITH_SHA512                "SLH-DSA-SHA2-192S-WITH-SHA512"
-#define NID_SLH_DSA_SHA2_192S_WITH_SHA512               1477
-#define OBJ_SLH_DSA_SHA2_192S_WITH_SHA512               OBJ_sigAlgs,37L
-
-#define SN_SLH_DSA_SHA2_192F_WITH_SHA512                "id-hash-slh-dsa-sha2-192f-with-sha512"
-#define LN_SLH_DSA_SHA2_192F_WITH_SHA512                "SLH-DSA-SHA2-192F-WITH-SHA512"
-#define NID_SLH_DSA_SHA2_192F_WITH_SHA512               1478
-#define OBJ_SLH_DSA_SHA2_192F_WITH_SHA512               OBJ_sigAlgs,38L
-
-#define SN_SLH_DSA_SHA2_256S_WITH_SHA512                "id-hash-slh-dsa-sha2-256s-with-sha512"
-#define LN_SLH_DSA_SHA2_256S_WITH_SHA512                "SLH-DSA-SHA2-256S-WITH-SHA512"
-#define NID_SLH_DSA_SHA2_256S_WITH_SHA512               1479
-#define OBJ_SLH_DSA_SHA2_256S_WITH_SHA512               OBJ_sigAlgs,39L
-
-#define SN_SLH_DSA_SHA2_256F_WITH_SHA512                "id-hash-slh-dsa-sha2-256f-with-sha512"
-#define LN_SLH_DSA_SHA2_256F_WITH_SHA512                "SLH-DSA-SHA2-256F-WITH-SHA512"
-#define NID_SLH_DSA_SHA2_256F_WITH_SHA512               1480
-#define OBJ_SLH_DSA_SHA2_256F_WITH_SHA512               OBJ_sigAlgs,40L
-
-#define SN_SLH_DSA_SHAKE_128S_WITH_SHAKE128             "id-hash-slh-dsa-shake-128s-with-shake128"
-#define LN_SLH_DSA_SHAKE_128S_WITH_SHAKE128             "SLH-DSA-SHAKE-128S-WITH-SHAKE128"
-#define NID_SLH_DSA_SHAKE_128S_WITH_SHAKE128            1481
-#define OBJ_SLH_DSA_SHAKE_128S_WITH_SHAKE128            OBJ_sigAlgs,41L
-
-#define SN_SLH_DSA_SHAKE_128F_WITH_SHAKE128             "id-hash-slh-dsa-shake-128f-with-shake128"
-#define LN_SLH_DSA_SHAKE_128F_WITH_SHAKE128             "SLH-DSA-SHAKE-128F-WITH-SHAKE128"
-#define NID_SLH_DSA_SHAKE_128F_WITH_SHAKE128            1482
-#define OBJ_SLH_DSA_SHAKE_128F_WITH_SHAKE128            OBJ_sigAlgs,42L
-
-#define SN_SLH_DSA_SHAKE_192S_WITH_SHAKE256             "id-hash-slh-dsa-shake-192s-with-shake256"
-#define LN_SLH_DSA_SHAKE_192S_WITH_SHAKE256             "SLH-DSA-SHAKE-192S-WITH-SHAKE256"
-#define NID_SLH_DSA_SHAKE_192S_WITH_SHAKE256            1483
-#define OBJ_SLH_DSA_SHAKE_192S_WITH_SHAKE256            OBJ_sigAlgs,43L
-
-#define SN_SLH_DSA_SHAKE_192F_WITH_SHAKE256             "id-hash-slh-dsa-shake-192f-with-shake256"
-#define LN_SLH_DSA_SHAKE_192F_WITH_SHAKE256             "SLH-DSA-SHAKE-192F-WITH-SHAKE256"
-#define NID_SLH_DSA_SHAKE_192F_WITH_SHAKE256            1484
-#define OBJ_SLH_DSA_SHAKE_192F_WITH_SHAKE256            OBJ_sigAlgs,44L
-
-#define SN_SLH_DSA_SHAKE_256S_WITH_SHAKE256             "id-hash-slh-dsa-shake-256s-with-shake256"
-#define LN_SLH_DSA_SHAKE_256S_WITH_SHAKE256             "SLH-DSA-SHAKE-256S-WITH-SHAKE256"
-#define NID_SLH_DSA_SHAKE_256S_WITH_SHAKE256            1485
-#define OBJ_SLH_DSA_SHAKE_256S_WITH_SHAKE256            OBJ_sigAlgs,45L
-
-#define SN_SLH_DSA_SHAKE_256F_WITH_SHAKE256             "id-hash-slh-dsa-shake-256f-with-shake256"
-#define LN_SLH_DSA_SHAKE_256F_WITH_SHAKE256             "SLH-DSA-SHAKE-256F-WITH-SHAKE256"
-#define NID_SLH_DSA_SHAKE_256F_WITH_SHAKE256            1486
-#define OBJ_SLH_DSA_SHAKE_256F_WITH_SHAKE256            OBJ_sigAlgs,46L
+#define SN_SLH_DSA_SHA2_128s_WITH_SHA256                "id-hash-slh-dsa-sha2-128s-with-sha256"
+#define LN_SLH_DSA_SHA2_128s_WITH_SHA256                "SLH-DSA-SHA2-128s-WITH-SHA256"
+#define NID_SLH_DSA_SHA2_128s_WITH_SHA256               1475
+#define OBJ_SLH_DSA_SHA2_128s_WITH_SHA256               OBJ_sigAlgs,35L
+
+#define SN_SLH_DSA_SHA2_128f_WITH_SHA256                "id-hash-slh-dsa-sha2-128f-with-sha256"
+#define LN_SLH_DSA_SHA2_128f_WITH_SHA256                "SLH-DSA-SHA2-128f-WITH-SHA256"
+#define NID_SLH_DSA_SHA2_128f_WITH_SHA256               1476
+#define OBJ_SLH_DSA_SHA2_128f_WITH_SHA256               OBJ_sigAlgs,36L
+
+#define SN_SLH_DSA_SHA2_192s_WITH_SHA512                "id-hash-slh-dsa-sha2-192s-with-sha512"
+#define LN_SLH_DSA_SHA2_192s_WITH_SHA512                "SLH-DSA-SHA2-192s-WITH-SHA512"
+#define NID_SLH_DSA_SHA2_192s_WITH_SHA512               1477
+#define OBJ_SLH_DSA_SHA2_192s_WITH_SHA512               OBJ_sigAlgs,37L
+
+#define SN_SLH_DSA_SHA2_192f_WITH_SHA512                "id-hash-slh-dsa-sha2-192f-with-sha512"
+#define LN_SLH_DSA_SHA2_192f_WITH_SHA512                "SLH-DSA-SHA2-192f-WITH-SHA512"
+#define NID_SLH_DSA_SHA2_192f_WITH_SHA512               1478
+#define OBJ_SLH_DSA_SHA2_192f_WITH_SHA512               OBJ_sigAlgs,38L
+
+#define SN_SLH_DSA_SHA2_256s_WITH_SHA512                "id-hash-slh-dsa-sha2-256s-with-sha512"
+#define LN_SLH_DSA_SHA2_256s_WITH_SHA512                "SLH-DSA-SHA2-256s-WITH-SHA512"
+#define NID_SLH_DSA_SHA2_256s_WITH_SHA512               1479
+#define OBJ_SLH_DSA_SHA2_256s_WITH_SHA512               OBJ_sigAlgs,39L
+
+#define SN_SLH_DSA_SHA2_256f_WITH_SHA512                "id-hash-slh-dsa-sha2-256f-with-sha512"
+#define LN_SLH_DSA_SHA2_256f_WITH_SHA512                "SLH-DSA-SHA2-256f-WITH-SHA512"
+#define NID_SLH_DSA_SHA2_256f_WITH_SHA512               1480
+#define OBJ_SLH_DSA_SHA2_256f_WITH_SHA512               OBJ_sigAlgs,40L
+
+#define SN_SLH_DSA_SHAKE_128s_WITH_SHAKE128             "id-hash-slh-dsa-shake-128s-with-shake128"
+#define LN_SLH_DSA_SHAKE_128s_WITH_SHAKE128             "SLH-DSA-SHAKE-128s-WITH-SHAKE128"
+#define NID_SLH_DSA_SHAKE_128s_WITH_SHAKE128            1481
+#define OBJ_SLH_DSA_SHAKE_128s_WITH_SHAKE128            OBJ_sigAlgs,41L
+
+#define SN_SLH_DSA_SHAKE_128f_WITH_SHAKE128             "id-hash-slh-dsa-shake-128f-with-shake128"
+#define LN_SLH_DSA_SHAKE_128f_WITH_SHAKE128             "SLH-DSA-SHAKE-128f-WITH-SHAKE128"
+#define NID_SLH_DSA_SHAKE_128f_WITH_SHAKE128            1482
+#define OBJ_SLH_DSA_SHAKE_128f_WITH_SHAKE128            OBJ_sigAlgs,42L
+
+#define SN_SLH_DSA_SHAKE_192s_WITH_SHAKE256             "id-hash-slh-dsa-shake-192s-with-shake256"
+#define LN_SLH_DSA_SHAKE_192s_WITH_SHAKE256             "SLH-DSA-SHAKE-192s-WITH-SHAKE256"
+#define NID_SLH_DSA_SHAKE_192s_WITH_SHAKE256            1483
+#define OBJ_SLH_DSA_SHAKE_192s_WITH_SHAKE256            OBJ_sigAlgs,43L
+
+#define SN_SLH_DSA_SHAKE_192f_WITH_SHAKE256             "id-hash-slh-dsa-shake-192f-with-shake256"
+#define LN_SLH_DSA_SHAKE_192f_WITH_SHAKE256             "SLH-DSA-SHAKE-192f-WITH-SHAKE256"
+#define NID_SLH_DSA_SHAKE_192f_WITH_SHAKE256            1484
+#define OBJ_SLH_DSA_SHAKE_192f_WITH_SHAKE256            OBJ_sigAlgs,44L
+
+#define SN_SLH_DSA_SHAKE_256s_WITH_SHAKE256             "id-hash-slh-dsa-shake-256s-with-shake256"
+#define LN_SLH_DSA_SHAKE_256s_WITH_SHAKE256             "SLH-DSA-SHAKE-256s-WITH-SHAKE256"
+#define NID_SLH_DSA_SHAKE_256s_WITH_SHAKE256            1485
+#define OBJ_SLH_DSA_SHAKE_256s_WITH_SHAKE256            OBJ_sigAlgs,45L
+
+#define SN_SLH_DSA_SHAKE_256f_WITH_SHAKE256             "id-hash-slh-dsa-shake-256f-with-shake256"
+#define LN_SLH_DSA_SHAKE_256f_WITH_SHAKE256             "SLH-DSA-SHAKE-256f-WITH-SHAKE256"
+#define NID_SLH_DSA_SHAKE_256f_WITH_SHAKE256            1486
+#define OBJ_SLH_DSA_SHAKE_256f_WITH_SHAKE256            OBJ_sigAlgs,46L
 
 #define SN_hold_instruction_code                "holdInstructionCode"
 #define LN_hold_instruction_code                "Hold Instruction Code"