Some PQ-related CSOR OIDs

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Paul Dale <ppzgs1@gmail.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/26321)

diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h
index a6cd106abf50750727c8e24049bc20f5eb8030a8..ef72ad1c8cbec6f90aeed056b65ee00f41631720 100644 (file)
--- a/crypto/objects/obj_dat.h
+++ b/crypto/objects/obj_dat.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by crypto/objects/obj_dat.pl
  *
- * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved.
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
  * in the file LICENSE in the source distribution or at
@@ -10,7 +10,7 @@
  */
 
 /* Serialized OID's */
-static const unsigned char so[9220] = {
+static const unsigned char so[9517] = {
     0x2A,0x86,0x48,0x86,0xF7,0x0D,                 /* [    0] OBJ_rsadsi */
     0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,            /* [    6] OBJ_pkcs */
     0x2A,0x86,0x48,0x86,0xF7,0x0D,0x02,0x02,       /* [   13] OBJ_md2 */
@@ -1315,9 +1315,42 @@ static const unsigned char so[9220] = {
     0x67,0x81,0x05,0x13,0x02,0x23,                 /* [ 9201] OBJ_tcg_tr_cat_platformFirmwareUpdateCompliance */
     0x67,0x81,0x05,0x13,0x02,0x24,                 /* [ 9207] OBJ_tcg_tr_cat_RTM */
     0x67,0x81,0x05,0x13,0x02,0x25,                 /* [ 9213] OBJ_tcg_tr_cat_PublicKey */
+    0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x04,0x01,  /* [ 9219] OBJ_ML_KEM_512 */
+    0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x04,0x02,  /* [ 9228] OBJ_ML_KEM_768 */
+    0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x04,0x03,  /* [ 9237] OBJ_ML_KEM_1024 */
+    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,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 */
 };
 
-#define NUM_NID 1454
+#define NUM_NID 1487
 static const ASN1_OBJECT nid_objs[NUM_NID] = {
     {"UNDEF", "undefined", NID_undef},
     {"rsadsi", "RSA Data Security, Inc.", NID_rsadsi, 6, &so[0]},
@@ -2773,9 +2806,42 @@ static const ASN1_OBJECT nid_objs[NUM_NID] = {
     {"tcg-tr-cat-platformFirmwareUpdateCompliance", "Platform Firmware Update Compliance Trait Category", NID_tcg_tr_cat_platformFirmwareUpdateCompliance, 6, &so[9201]},
     {"tcg-tr-cat-RTM", "Root of Trust of Measurement Trait Category", NID_tcg_tr_cat_RTM, 6, &so[9207]},
     {"tcg-tr-cat-PublicKey", "Public Key Trait Category", NID_tcg_tr_cat_PublicKey, 6, &so[9213]},
+    {"id-alg-ml-kem-512", "ML-KEM-512", NID_ML_KEM_512, 9, &so[9219]},
+    {"id-alg-ml-kem-768", "ML-KEM-768", NID_ML_KEM_768, 9, &so[9228]},
+    {"id-alg-ml-kem-1024", "ML-KEM-1024", NID_ML_KEM_1024, 9, &so[9237]},
+    {"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-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]},
 };
 
-#define NUM_SN 1445
+#define NUM_SN 1478
 static const unsigned int sn_objs[NUM_SN] = {
      364,    /* "AD_DVCS" */
      419,    /* "AES-128-CBC" */
@@ -3396,6 +3462,9 @@ static const unsigned int sn_objs[NUM_SN] = {
      323,    /* "id-alg-des40" */
      326,    /* "id-alg-dh-pop" */
      325,    /* "id-alg-dh-sig-hmac-sha1" */
+    1456,    /* "id-alg-ml-kem-1024" */
+    1454,    /* "id-alg-ml-kem-512" */
+    1455,    /* "id-alg-ml-kem-768" */
      324,    /* "id-alg-noSignature" */
      907,    /* "id-camellia128-wrap" */
      908,    /* "id-camellia192-wrap" */
@@ -3450,6 +3519,21 @@ static const unsigned int sn_objs[NUM_SN] = {
     1113,    /* "id-ecdsa-with-sha3-256" */
     1114,    /* "id-ecdsa-with-sha3-384" */
     1115,    /* "id-ecdsa-with-sha3-512" */
+    1472,    /* "id-hash-ml-dsa-44-with-sha512" */
+    1473,    /* "id-hash-ml-dsa-65-with-sha512" */
+    1474,    /* "id-hash-ml-dsa-87-with-sha512" */
+    1476,    /* "id-hash-slh-dsa-sha2-128f-with-sha256" */
+    1475,    /* "id-hash-slh-dsa-sha2-128s-with-sha256" */
+    1478,    /* "id-hash-slh-dsa-sha2-192f-with-sha512" */
+    1477,    /* "id-hash-slh-dsa-sha2-192s-with-sha512" */
+    1480,    /* "id-hash-slh-dsa-sha2-256f-with-sha512" */
+    1479,    /* "id-hash-slh-dsa-sha2-256s-with-sha512" */
+    1482,    /* "id-hash-slh-dsa-shake-128f-with-shake128" */
+    1481,    /* "id-hash-slh-dsa-shake-128s-with-shake128" */
+    1484,    /* "id-hash-slh-dsa-shake-192f-with-shake256" */
+    1483,    /* "id-hash-slh-dsa-shake-192s-with-shake256" */
+    1486,    /* "id-hash-slh-dsa-shake-256f-with-shake256" */
+    1485,    /* "id-hash-slh-dsa-shake-256s-with-shake256" */
      508,    /* "id-hex-multipart-message" */
      507,    /* "id-hex-partial-message" */
     1102,    /* "id-hmacWithSHA3-224" */
@@ -3484,6 +3568,9 @@ static const unsigned int sn_objs[NUM_SN] = {
     1221,    /* "id-kp-BrandIndicatorforMessageIdentification" */
     1220,    /* "id-kp-bgpsec-router" */
     1322,    /* "id-kp-wisun-fan-device" */
+    1457,    /* "id-ml-dsa-44" */
+    1458,    /* "id-ml-dsa-65" */
+    1459,    /* "id-ml-dsa-87" */
      280,    /* "id-mod-attribute-cert" */
      274,    /* "id-mod-cmc" */
      277,    /* "id-mod-cmp" */
@@ -3549,6 +3636,18 @@ static const unsigned int sn_objs[NUM_SN] = {
     1119,    /* "id-rsassa-pkcs1-v1_5-with-sha3-512" */
      973,    /* "id-scrypt" */
      512,    /* "id-set" */
+    1461,    /* "id-slh-dsa-sha2-128f" */
+    1460,    /* "id-slh-dsa-sha2-128s" */
+    1463,    /* "id-slh-dsa-sha2-192f" */
+    1462,    /* "id-slh-dsa-sha2-192s" */
+    1465,    /* "id-slh-dsa-sha2-256f" */
+    1464,    /* "id-slh-dsa-sha2-256s" */
+    1467,    /* "id-slh-dsa-shake-128f" */
+    1466,    /* "id-slh-dsa-shake-128s" */
+    1469,    /* "id-slh-dsa-shake-192f" */
+    1468,    /* "id-slh-dsa-shake-192s" */
+    1471,    /* "id-slh-dsa-shake-256f" */
+    1470,    /* "id-slh-dsa-shake-256s" */
      191,    /* "id-smime-aa" */
      215,    /* "id-smime-aa-contentHint" */
      218,    /* "id-smime-aa-contentIdentifier" */
@@ -4224,7 +4323,7 @@ static const unsigned int sn_objs[NUM_SN] = {
     1289,    /* "zstd" */
 };
 
-#define NUM_LN 1445
+#define NUM_LN 1478
 static const unsigned int ln_objs[NUM_LN] = {
      363,    /* "AD Time Stamping" */
      405,    /* "ANSI X9.62" */
@@ -4348,6 +4447,9 @@ static const unsigned int ln_objs[NUM_LN] = {
      852,    /* "GOST R 34.11-94 with GOST R 34.10-94 Cryptocom" */
      854,    /* "GOST R 3410-2001 Parameter Set Cryptocom" */
     1440,    /* "Generic Certificate Trait Category" */
+    1472,    /* "HASH-ML-DSA-44-WITH-SHA512" */
+    1473,    /* "HASH-ML-DSA-65-WITH-SHA512" */
+    1474,    /* "HASH-ML-DSA-87-WITH-SHA512" */
     1156,    /* "HMAC DSTU Gost 34311-95" */
      988,    /* "HMAC GOST 34.11-2012 256 bit" */
      989,    /* "HMAC GOST 34.11-2012 512 bit" */
@@ -4378,6 +4480,12 @@ static const unsigned int ln_objs[NUM_LN] = {
     1388,    /* "Internet Engineering Task Force Registry" */
      142,    /* "Invalidity Date" */
      504,    /* "MIME MHS" */
+    1457,    /* "ML-DSA-44" */
+    1458,    /* "ML-DSA-65" */
+    1459,    /* "ML-DSA-87" */
+    1456,    /* "ML-KEM-1024" */
+    1454,    /* "ML-KEM-512" */
+    1455,    /* "ML-KEM-768" */
      388,    /* "Mail" */
      383,    /* "Management" */
     1294,    /* "Microsoft Application Policies Extension" */
@@ -4480,6 +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" */
     1204,    /* "SM2-with-SM3" */
     1006,    /* "SNILS" */
      387,    /* "SNMPv2" */
@@ -5673,7 +5805,7 @@ static const unsigned int ln_objs[NUM_LN] = {
      125,    /* "zlib compression" */
 };
 
-#define NUM_OBJ 1311
+#define NUM_OBJ 1344
 static const unsigned int obj_objs[NUM_OBJ] = {
        0,    /* OBJ_undef                        0 */
      181,    /* OBJ_iso                          1 */
@@ -6762,6 +6894,39 @@ static const unsigned int obj_objs[NUM_OBJ] = {
     1117,    /* OBJ_RSA_SHA3_256                 2 16 840 1 101 3 4 3 14 */
     1118,    /* OBJ_RSA_SHA3_384                 2 16 840 1 101 3 4 3 15 */
     1119,    /* OBJ_RSA_SHA3_512                 2 16 840 1 101 3 4 3 16 */
+    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 */
+    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 */
+    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 */
       71,    /* OBJ_netscape_cert_type           2 16 840 1 113730 1 1 */
       72,    /* OBJ_netscape_base_url            2 16 840 1 113730 1 2 */
       73,    /* OBJ_netscape_revocation_url      2 16 840 1 113730 1 3 */

diff --git a/crypto/objects/obj_mac.num b/crypto/objects/obj_mac.num
index 82f0744f78e2eff62cfb4e22a1b7c755c6147500..6f0a992eafb2fa5ab8887ad01b2eaff740c88bfd 100644 (file)
--- a/crypto/objects/obj_mac.num
+++ b/crypto/objects/obj_mac.num
@@ -1451,3 +1451,36 @@ tcg_tr_cat_platformFirmwareSignatureVerification         1450
 tcg_tr_cat_platformFirmwareUpdateCompliance            1451
 tcg_tr_cat_RTM         1452
 tcg_tr_cat_PublicKey           1453
+ML_KEM_512             1454
+ML_KEM_768             1455
+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
+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

diff --git a/crypto/objects/obj_xref.h b/crypto/objects/obj_xref.h
index 01339d9da088d1b9c0a793c956e24f9503c880c8..5d3a5a338f8a63a3f3e9a856a5111db2b7699421 100644 (file)
--- a/crypto/objects/obj_xref.h
+++ b/crypto/objects/obj_xref.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by objxref.pl
  *
- * Copyright 1998-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1998-2025 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy

diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index d0310cfd07c2f7531aa76829a18d4bd1396fac60..407d4777f95db8ce3725660bd02661fc47c3c2bb 100644 (file)
--- a/crypto/objects/objects.txt
+++ b/crypto/objects/objects.txt
@@ -1121,6 +1121,36 @@ sigAlgs 13       : id-rsassa-pkcs1-v1_5-with-sha3-224    : RSA-SHA3-224
 sigAlgs 14     : id-rsassa-pkcs1-v1_5-with-sha3-256    : RSA-SHA3-256
 sigAlgs 15     : id-rsassa-pkcs1-v1_5-with-sha3-384    : RSA-SHA3-384
 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 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
 
 # Hold instruction CRL entry extension
 !Cname hold-instruction-code
@@ -1137,7 +1167,7 @@ holdInstruction 3 : holdInstructionReject : Hold Instruction Reject
 # them are also mentioned in RFC 2247
 # OIDs specific to Electronic Signature Standard/CAdES are as specified in
 # ETSI EN 319 122-1 V1.2.1 (2021-10):
-# Electronic Signatures and Infrastructures (ESI); CAdES digital signatures; 
+# Electronic Signatures and Infrastructures (ESI); CAdES digital signatures;
 # Part 1: Building blocks and CAdES baseline signatures
 itu-t 4                        : itu-t-identified-organization
 itu-t-identified-organization 0: etsi
@@ -2014,4 +2044,9 @@ tcg-tr-category 33 : tcg-tr-cat-platformHardwareCapabilities                      : Platform Hardw
 tcg-tr-category 34 : tcg-tr-cat-platformFirmwareSignatureVerification  : Platform Firmware Signature Verification Trait Category
 tcg-tr-category 35 : tcg-tr-cat-platformFirmwareUpdateCompliance               : Platform Firmware Update Compliance Trait Category
 tcg-tr-category 36 : tcg-tr-cat-RTM                                                                    : Root of Trust of Measurement Trait Category
-tcg-tr-category 37 : tcg-tr-cat-PublicKey                                                              : Public Key Trait Category
\ No newline at end of file
+tcg-tr-category 37 : tcg-tr-cat-PublicKey                                                              : Public Key Trait Category
+
+!Alias nistKems nistAlgorithms 4
+nistKems 1 : id-alg-ml-kem-512  : ML-KEM-512
+nistKems 2 : id-alg-ml-kem-768  : ML-KEM-768
+nistKems 3 : id-alg-ml-kem-1024 : ML-KEM-1024

diff --git a/fuzz/oids.txt b/fuzz/oids.txt
index 4f0a349563210fde86507df1324ae34020cde594..904676446c034e16dd2e32a2765a3bca8311b365 100644 (file)
--- a/fuzz/oids.txt
+++ b/fuzz/oids.txt
@@ -1,7 +1,7 @@
 # WARNING: do not edit!
 # Generated by fuzz/mkfuzzoids.pl
 #
-# Copyright 2020-2024 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2020-2025 The OpenSSL Project Authors. All Rights Reserved.
 #
 # Licensed under the Apache License 2.0 (the "License").  You may not use
 # this file except in compliance with the License.  You can obtain a copy
@@ -1311,3 +1311,36 @@ OBJ_tcg_tr_cat_platformFirmwareSignatureVerification="\x67\x81\x05\x13\x02\x22"
 OBJ_tcg_tr_cat_platformFirmwareUpdateCompliance="\x67\x81\x05\x13\x02\x23"
 OBJ_tcg_tr_cat_RTM="\x67\x81\x05\x13\x02\x24"
 OBJ_tcg_tr_cat_PublicKey="\x67\x81\x05\x13\x02\x25"
+OBJ_ML_KEM_512="\x60\x86\x48\x01\x65\x03\x04\x04\x01"
+OBJ_ML_KEM_768="\x60\x86\x48\x01\x65\x03\x04\x04\x02"
+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_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"

diff --git a/include/openssl/obj_mac.h b/include/openssl/obj_mac.h
index 94b6db4358a9eea9acf0e1f2f353563a20835bc5..419860c91df7a322db4a1ced97e4f3949683a213 100644 (file)
--- a/include/openssl/obj_mac.h
+++ b/include/openssl/obj_mac.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by crypto/objects/objects.pl
  *
- * Copyright 2000-2024 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2025 The OpenSSL Project Authors. All Rights Reserved.
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
  * in the file LICENSE in the source distribution or at
@@ -3431,6 +3431,156 @@
 #define NID_RSA_SHA3_512                1119
 #define OBJ_RSA_SHA3_512                OBJ_sigAlgs,16L
 
+#define SN_ML_DSA_44            "id-ml-dsa-44"
+#define LN_ML_DSA_44            "ML-DSA-44"
+#define NID_ML_DSA_44           1457
+#define OBJ_ML_DSA_44           OBJ_sigAlgs,17L
+
+#define SN_ML_DSA_65            "id-ml-dsa-65"
+#define LN_ML_DSA_65            "ML-DSA-65"
+#define NID_ML_DSA_65           1458
+#define OBJ_ML_DSA_65           OBJ_sigAlgs,18L
+
+#define SN_ML_DSA_87            "id-ml-dsa-87"
+#define LN_ML_DSA_87            "ML-DSA-87"
+#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_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"
+#define NID_HASH_ML_DSA_44_WITH_SHA512          1472
+#define OBJ_HASH_ML_DSA_44_WITH_SHA512          OBJ_sigAlgs,32L
+
+#define SN_HASH_ML_DSA_65_WITH_SHA512           "id-hash-ml-dsa-65-with-sha512"
+#define LN_HASH_ML_DSA_65_WITH_SHA512           "HASH-ML-DSA-65-WITH-SHA512"
+#define NID_HASH_ML_DSA_65_WITH_SHA512          1473
+#define OBJ_HASH_ML_DSA_65_WITH_SHA512          OBJ_sigAlgs,33L
+
+#define SN_HASH_ML_DSA_87_WITH_SHA512           "id-hash-ml-dsa-87-with-sha512"
+#define LN_HASH_ML_DSA_87_WITH_SHA512           "HASH-ML-DSA-87-WITH-SHA512"
+#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_hold_instruction_code                "holdInstructionCode"
 #define LN_hold_instruction_code                "Hold Instruction Code"
 #define NID_hold_instruction_code               430
@@ -6420,6 +6570,23 @@
 #define NID_tcg_tr_cat_PublicKey                1453
 #define OBJ_tcg_tr_cat_PublicKey                OBJ_tcg_tr_category,37L
 
+#define OBJ_nistKems            OBJ_nistAlgorithms,4L
+
+#define SN_ML_KEM_512           "id-alg-ml-kem-512"
+#define LN_ML_KEM_512           "ML-KEM-512"
+#define NID_ML_KEM_512          1454
+#define OBJ_ML_KEM_512          OBJ_nistKems,1L
+
+#define SN_ML_KEM_768           "id-alg-ml-kem-768"
+#define LN_ML_KEM_768           "ML-KEM-768"
+#define NID_ML_KEM_768          1455
+#define OBJ_ML_KEM_768          OBJ_nistKems,2L
+
+#define SN_ML_KEM_1024          "id-alg-ml-kem-1024"
+#define LN_ML_KEM_1024          "ML-KEM-1024"
+#define NID_ML_KEM_1024         1456
+#define OBJ_ML_KEM_1024         OBJ_nistKems,3L
+
 #endif /* OPENSSL_OBJ_MAC_H */
 
 #ifndef OPENSSL_NO_DEPRECATED_3_0