grpc 1.84.1 → 1.85.0.pre1

data/third_party/boringssl-with-bazel/crypto/obj/obj.cc

@@ -18,98 +18,87 @@
 #include <limits.h>
 #include <string.h>
 
+#include <iterator>
+
 #include <openssl/asn1.h>
 #include <openssl/bytestring.h>
 #include <openssl/err.h>
-#include <openssl/lhash.h>
 #include <openssl/mem.h>
-#include <openssl/thread.h>
 
 #include "../asn1/internal.h"
 #include "../internal.h"
 #include "../lhash/internal.h"
 
-// obj_data.h must be included after the definition of |ASN1_OBJECT|.
+// obj_data.h must be included after the definition of `ASN1_OBJECT`.
 #include "obj_dat.h"
 
 
+using namespace bssl;
+
+BSSL_NAMESPACE_BEGIN
+
 DEFINE_LHASH_OF(ASN1_OBJECT)
 
-static CRYPTO_MUTEX global_added_lock = CRYPTO_MUTEX_INIT;
-// These globals are protected by |global_added_lock|.
-static LHASH_OF(ASN1_OBJECT) *global_added_by_data = NULL;
-static LHASH_OF(ASN1_OBJECT) *global_added_by_nid = NULL;
-static LHASH_OF(ASN1_OBJECT) *global_added_by_short_name = NULL;
-static LHASH_OF(ASN1_OBJECT) *global_added_by_long_name = NULL;
+BSSL_NAMESPACE_END
+
+static StaticMutex global_added_lock;
+// These globals are protected by `global_added_lock`.
+static LHASH_OF(ASN1_OBJECT) *global_added_by_data = nullptr;
+static LHASH_OF(ASN1_OBJECT) *global_added_by_nid = nullptr;
+static LHASH_OF(ASN1_OBJECT) *global_added_by_short_name = nullptr;
+static LHASH_OF(ASN1_OBJECT) *global_added_by_long_name = nullptr;
 
-static CRYPTO_MUTEX global_next_nid_lock = CRYPTO_MUTEX_INIT;
+static StaticMutex global_next_nid_lock;
 static unsigned global_next_nid = NUM_NID;
 
-static int obj_next_nid(void) {
-  CRYPTO_MUTEX_lock_write(&global_next_nid_lock);
-  int ret = global_next_nid++;
-  CRYPTO_MUTEX_unlock_write(&global_next_nid_lock);
-  return ret;
+static int obj_next_nid() {
+  MutexWriteLock lock(&global_next_nid_lock);
+  return global_next_nid++;
 }
 
 ASN1_OBJECT *OBJ_dup(const ASN1_OBJECT *o) {
-  ASN1_OBJECT *r;
-  unsigned char *data = NULL;
-  char *sn = NULL, *ln = NULL;
-
-  if (o == NULL) {
-    return NULL;
+  if (o == nullptr) {
+    return nullptr;
   }
 
   if (!(o->flags & ASN1_OBJECT_FLAG_DYNAMIC)) {
     // TODO(fork): this is a little dangerous.
-    return (ASN1_OBJECT *)o;
+    return const_cast<ASN1_OBJECT *>(o);
   }
 
-  r = ASN1_OBJECT_new();
-  if (r == NULL) {
+  UniquePtr<ASN1_OBJECT> r(ASN1_OBJECT_new());
+  if (r == nullptr) {
     OPENSSL_PUT_ERROR(OBJ, ERR_R_ASN1_LIB);
-    return NULL;
+    return nullptr;
   }
-  r->ln = r->sn = NULL;
 
-  // once data is attached to an object, it remains const
+  // All fields of the object will be allocated.
+  r->flags = o->flags | ASN1_OBJECT_FLAG_DYNAMIC |
+             ASN1_OBJECT_FLAG_DYNAMIC_STRINGS | ASN1_OBJECT_FLAG_DYNAMIC_DATA;
+
   r->data = reinterpret_cast<uint8_t *>(OPENSSL_memdup(o->data, o->length));
-  if (o->length != 0 && r->data == NULL) {
-    goto err;
+  if (o->length != 0 && r->data == nullptr) {
+    return nullptr;
   }
 
   r->length = o->length;
   r->nid = o->nid;
 
-  if (o->ln != NULL) {
-    ln = OPENSSL_strdup(o->ln);
-    if (ln == NULL) {
-      goto err;
+  if (o->ln != nullptr) {
+    r->ln = OPENSSL_strdup(o->ln);
+    if (r->ln == nullptr) {
+      return nullptr;
     }
   }
 
-  if (o->sn != NULL) {
-    sn = OPENSSL_strdup(o->sn);
-    if (sn == NULL) {
-      goto err;
+  if (o->sn != nullptr) {
+    r->sn = OPENSSL_strdup(o->sn);
+    if (r->sn == nullptr) {
+      return nullptr;
     }
   }
 
-  r->sn = sn;
-  r->ln = ln;
-
-  r->flags =
-      o->flags | (ASN1_OBJECT_FLAG_DYNAMIC | ASN1_OBJECT_FLAG_DYNAMIC_STRINGS |
-                  ASN1_OBJECT_FLAG_DYNAMIC_DATA);
-  return r;
-
-err:
-  OPENSSL_free(ln);
-  OPENSSL_free(sn);
-  OPENSSL_free(data);
-  OPENSSL_free(r);
-  return NULL;
+  return r.release();
 }
 
 int OBJ_cmp(const ASN1_OBJECT *a, const ASN1_OBJECT *b) {
@@ -122,15 +111,15 @@ int OBJ_cmp(const ASN1_OBJECT *a, const ASN1_OBJECT *b) {
 }
 
 const uint8_t *OBJ_get0_data(const ASN1_OBJECT *obj) {
-  if (obj == NULL) {
-    return NULL;
+  if (obj == nullptr) {
+    return nullptr;
   }
 
   return obj->data;
 }
 
 size_t OBJ_length(const ASN1_OBJECT *obj) {
-  if (obj == NULL || obj->length < 0) {
+  if (obj == nullptr || obj->length < 0) {
     return 0;
   }
 
@@ -138,14 +127,14 @@ size_t OBJ_length(const ASN1_OBJECT *obj) {
 }
 
 static const ASN1_OBJECT *get_builtin_object(int nid) {
-  // |NID_undef| is stored separately, so all the indices are off by one. The
+  // `NID_undef` is stored separately, so all the indices are off by one. The
   // caller of this function must have a valid built-in, non-undef NID.
   BSSL_CHECK(nid > 0 && nid < NUM_NID);
   return &kObjects[nid - 1];
 }
 
-// obj_cmp is called to search the kNIDsInOIDOrder array. The |key| argument is
-// an |ASN1_OBJECT|* that we're looking for and |element| is a pointer to an
+// obj_cmp is called to search the kNIDsInOIDOrder array. The `key` argument is
+// an `ASN1_OBJECT`* that we're looking for and `element` is a pointer to an
 // unsigned int in the array.
 static int obj_cmp(const void *key, const void *element) {
   uint16_t nid = *((const uint16_t *)element);
@@ -154,7 +143,7 @@ static int obj_cmp(const void *key, const void *element) {
 }
 
 int OBJ_obj2nid(const ASN1_OBJECT *obj) {
-  if (obj == NULL) {
+  if (obj == nullptr) {
     return NID_undef;
   }
 
@@ -162,22 +151,20 @@ int OBJ_obj2nid(const ASN1_OBJECT *obj) {
     return obj->nid;
   }
 
-  CRYPTO_MUTEX_lock_read(&global_added_lock);
-  if (global_added_by_data != NULL) {
-    ASN1_OBJECT *match;
-
-    match = lh_ASN1_OBJECT_retrieve(global_added_by_data, obj);
-    if (match != NULL) {
-      CRYPTO_MUTEX_unlock_read(&global_added_lock);
-      return match->nid;
+  {
+    MutexReadLock lock(&global_added_lock);
+    if (global_added_by_data != nullptr) {
+      ASN1_OBJECT *match = lh_ASN1_OBJECT_retrieve(global_added_by_data, obj);
+      if (match != nullptr) {
+        return match->nid;
+      }
     }
   }
-  CRYPTO_MUTEX_unlock_read(&global_added_lock);
 
   const uint16_t *nid_ptr = reinterpret_cast<const uint16_t *>(
-      bsearch(obj, kNIDsInOIDOrder, OPENSSL_ARRAY_SIZE(kNIDsInOIDOrder),
+      bsearch(obj, kNIDsInOIDOrder, std::size(kNIDsInOIDOrder),
               sizeof(kNIDsInOIDOrder[0]), obj_cmp));
-  if (nid_ptr == NULL) {
+  if (nid_ptr == nullptr) {
     return NID_undef;
   }
 
@@ -198,7 +185,7 @@ int OBJ_cbs2nid(const CBS *cbs) {
 }
 
 // short_name_cmp is called to search the kNIDsInShortNameOrder array. The
-// |key| argument is name that we're looking for and |element| is a pointer to
+// `key` argument is name that we're looking for and `element` is a pointer to
 // an unsigned int in the array.
 static int short_name_cmp(const void *key, const void *element) {
   const char *name = (const char *)key;
@@ -208,24 +195,23 @@ static int short_name_cmp(const void *key, const void *element) {
 }
 
 int OBJ_sn2nid(const char *short_name) {
-  CRYPTO_MUTEX_lock_read(&global_added_lock);
-  if (global_added_by_short_name != NULL) {
-    ASN1_OBJECT *match, templ;
-
-    templ.sn = short_name;
-    match = lh_ASN1_OBJECT_retrieve(global_added_by_short_name, &templ);
-    if (match != NULL) {
-      CRYPTO_MUTEX_unlock_read(&global_added_lock);
-      return match->nid;
+  {
+    MutexReadLock lock(&global_added_lock);
+    if (global_added_by_short_name != nullptr) {
+      ASN1_OBJECT templ;
+      templ.sn = short_name;
+      ASN1_OBJECT *match =
+          lh_ASN1_OBJECT_retrieve(global_added_by_short_name, &templ);
+      if (match != nullptr) {
+        return match->nid;
+      }
     }
   }
-  CRYPTO_MUTEX_unlock_read(&global_added_lock);
 
-  const uint16_t *nid_ptr = reinterpret_cast<const uint16_t *>(
-      bsearch(short_name, kNIDsInShortNameOrder,
-              OPENSSL_ARRAY_SIZE(kNIDsInShortNameOrder),
-              sizeof(kNIDsInShortNameOrder[0]), short_name_cmp));
-  if (nid_ptr == NULL) {
+  const uint16_t *nid_ptr = reinterpret_cast<const uint16_t *>(bsearch(
+      short_name, kNIDsInShortNameOrder, std::size(kNIDsInShortNameOrder),
+      sizeof(kNIDsInShortNameOrder[0]), short_name_cmp));
+  if (nid_ptr == nullptr) {
     return NID_undef;
   }
 
@@ -233,7 +219,7 @@ int OBJ_sn2nid(const char *short_name) {
 }
 
 // long_name_cmp is called to search the kNIDsInLongNameOrder array. The
-// |key| argument is name that we're looking for and |element| is a pointer to
+// `key` argument is name that we're looking for and `element` is a pointer to
 // an unsigned int in the array.
 static int long_name_cmp(const void *key, const void *element) {
   const char *name = (const char *)key;
@@ -243,23 +229,23 @@ static int long_name_cmp(const void *key, const void *element) {
 }
 
 int OBJ_ln2nid(const char *long_name) {
-  CRYPTO_MUTEX_lock_read(&global_added_lock);
-  if (global_added_by_long_name != NULL) {
-    ASN1_OBJECT *match, templ;
-
-    templ.ln = long_name;
-    match = lh_ASN1_OBJECT_retrieve(global_added_by_long_name, &templ);
-    if (match != NULL) {
-      CRYPTO_MUTEX_unlock_read(&global_added_lock);
-      return match->nid;
+  {
+    MutexReadLock lock(&global_added_lock);
+    if (global_added_by_long_name != nullptr) {
+      ASN1_OBJECT templ;
+      templ.ln = long_name;
+      ASN1_OBJECT *match =
+          lh_ASN1_OBJECT_retrieve(global_added_by_long_name, &templ);
+      if (match != nullptr) {
+        return match->nid;
+      }
     }
   }
-  CRYPTO_MUTEX_unlock_read(&global_added_lock);
 
-  const uint16_t *nid_ptr = reinterpret_cast<const uint16_t *>(bsearch(
-      long_name, kNIDsInLongNameOrder, OPENSSL_ARRAY_SIZE(kNIDsInLongNameOrder),
-      sizeof(kNIDsInLongNameOrder[0]), long_name_cmp));
-  if (nid_ptr == NULL) {
+  const uint16_t *nid_ptr = reinterpret_cast<const uint16_t *>(
+      bsearch(long_name, kNIDsInLongNameOrder, std::size(kNIDsInLongNameOrder),
+              sizeof(kNIDsInLongNameOrder[0]), long_name_cmp));
+  if (nid_ptr == nullptr) {
     return NID_undef;
   }
 
@@ -278,23 +264,17 @@ int OBJ_txt2nid(const char *s) {
 
 OPENSSL_EXPORT int OBJ_nid2cbb(CBB *out, int nid) {
   const ASN1_OBJECT *obj = OBJ_nid2obj(nid);
-  CBB oid;
-
-  if (obj == NULL || !CBB_add_asn1(out, &oid, CBS_ASN1_OBJECT) ||
-      !CBB_add_bytes(&oid, obj->data, obj->length) || !CBB_flush(out)) {
-    return 0;
-  }
-
-  return 1;
+  return obj != nullptr &&
+         CBB_add_asn1_element(out, CBS_ASN1_OBJECT, obj->data, obj->length);
 }
 
-const ASN1_OBJECT *OBJ_get_undef(void) {
+const ASN1_OBJECT *OBJ_get_undef() {
   static const ASN1_OBJECT kUndef = {
       /*sn=*/SN_undef,
       /*ln=*/LN_undef,
       /*nid=*/NID_undef,
       /*length=*/0,
-      /*data=*/NULL,
+      /*data=*/nullptr,
       /*flags=*/0,
   };
   return &kUndef;
@@ -308,33 +288,32 @@ ASN1_OBJECT *OBJ_nid2obj(int nid) {
   if (nid > 0 && nid < NUM_NID) {
     const ASN1_OBJECT *obj = get_builtin_object(nid);
     if (nid != NID_undef && obj->nid == NID_undef) {
-      goto err;
+      OPENSSL_PUT_ERROR(OBJ, OBJ_R_UNKNOWN_NID);
+      return nullptr;
     }
     return (ASN1_OBJECT *)obj;
   }
 
-  CRYPTO_MUTEX_lock_read(&global_added_lock);
-  if (global_added_by_nid != NULL) {
-    ASN1_OBJECT *match, templ;
-
-    templ.nid = nid;
-    match = lh_ASN1_OBJECT_retrieve(global_added_by_nid, &templ);
-    if (match != NULL) {
-      CRYPTO_MUTEX_unlock_read(&global_added_lock);
-      return match;
+  {
+    MutexReadLock lock(&global_added_lock);
+    if (global_added_by_nid != nullptr) {
+      ASN1_OBJECT templ;
+      templ.nid = nid;
+      ASN1_OBJECT *match = lh_ASN1_OBJECT_retrieve(global_added_by_nid, &templ);
+      if (match != nullptr) {
+        return match;
+      }
     }
   }
-  CRYPTO_MUTEX_unlock_read(&global_added_lock);
 
-err:
   OPENSSL_PUT_ERROR(OBJ, OBJ_R_UNKNOWN_NID);
-  return NULL;
+  return nullptr;
 }
 
 const char *OBJ_nid2sn(int nid) {
   const ASN1_OBJECT *obj = OBJ_nid2obj(nid);
-  if (obj == NULL) {
-    return NULL;
+  if (obj == nullptr) {
+    return nullptr;
   }
 
   return obj->sn;
@@ -342,14 +321,14 @@ const char *OBJ_nid2sn(int nid) {
 
 const char *OBJ_nid2ln(int nid) {
   const ASN1_OBJECT *obj = OBJ_nid2obj(nid);
-  if (obj == NULL) {
-    return NULL;
+  if (obj == nullptr) {
+    return nullptr;
   }
 
   return obj->ln;
 }
 
-static ASN1_OBJECT *create_object_with_text_oid(int (*get_nid)(void),
+static ASN1_OBJECT *create_object_with_text_oid(int (*get_nid)(),
                                                 const char *oid,
                                                 const char *short_name,
                                                 const char *long_name) {
@@ -361,7 +340,7 @@ static ASN1_OBJECT *create_object_with_text_oid(int (*get_nid)(void),
       !CBB_finish(&cbb, &buf, &len)) {
     OPENSSL_PUT_ERROR(OBJ, OBJ_R_INVALID_OID_STRING);
     CBB_cleanup(&cbb);
-    return NULL;
+    return nullptr;
   }
 
   ASN1_OBJECT *ret = ASN1_OBJECT_create(get_nid ? get_nid() : NID_undef, buf,
@@ -382,7 +361,7 @@ ASN1_OBJECT *OBJ_txt2obj(const char *s, int dont_search_names) {
     }
   }
 
-  return create_object_with_text_oid(NULL, s, NULL, NULL);
+  return create_object_with_text_oid(nullptr, s, nullptr, nullptr);
 }
 
 static int strlcpy_int(char *dst, const char *src, int dst_size) {
@@ -398,7 +377,7 @@ int OBJ_obj2txt(char *out, int out_len, const ASN1_OBJECT *obj,
                 int always_return_oid) {
   // Python depends on the empty OID successfully encoding as the empty
   // string.
-  if (obj == NULL || obj->length == 0) {
+  if (obj == nullptr || obj->length == 0) {
     return strlcpy_int(out, "", out_len);
   }
 
@@ -406,10 +385,10 @@ int OBJ_obj2txt(char *out, int out_len, const ASN1_OBJECT *obj,
     int nid = OBJ_obj2nid(obj);
     if (nid != NID_undef) {
       const char *name = OBJ_nid2ln(nid);
-      if (name == NULL) {
+      if (name == nullptr) {
         name = OBJ_nid2sn(nid);
       }
-      if (name != NULL) {
+      if (name != nullptr) {
         return strlcpy_int(out, name, out_len);
       }
     }
@@ -418,7 +397,7 @@ int OBJ_obj2txt(char *out, int out_len, const ASN1_OBJECT *obj,
   CBS cbs;
   CBS_init(&cbs, obj->data, obj->length);
   char *txt = CBS_asn1_oid_to_text(&cbs);
-  if (txt == NULL) {
+  if (txt == nullptr) {
     if (out_len > 0) {
       out[0] = '\0';
     }
@@ -456,64 +435,60 @@ static int cmp_long_name(const ASN1_OBJECT *a, const ASN1_OBJECT *b) {
   return strcmp(a->ln, b->ln);
 }
 
-// obj_add_object inserts |obj| into the various global hashes for run-time
+// obj_add_object inserts `obj` into the various global hashes for run-time
 // added objects. It returns one on success or zero otherwise.
 static int obj_add_object(ASN1_OBJECT *obj) {
   obj->flags &= ~(ASN1_OBJECT_FLAG_DYNAMIC | ASN1_OBJECT_FLAG_DYNAMIC_STRINGS |
                   ASN1_OBJECT_FLAG_DYNAMIC_DATA);
 
-  CRYPTO_MUTEX_lock_write(&global_added_lock);
-  if (global_added_by_nid == NULL) {
+  MutexWriteLock lock(&global_added_lock);
+  if (global_added_by_nid == nullptr) {
     global_added_by_nid = lh_ASN1_OBJECT_new(hash_nid, cmp_nid);
   }
-  if (global_added_by_data == NULL) {
+  if (global_added_by_data == nullptr) {
     global_added_by_data = lh_ASN1_OBJECT_new(hash_data, OBJ_cmp);
   }
-  if (global_added_by_short_name == NULL) {
+  if (global_added_by_short_name == nullptr) {
     global_added_by_short_name =
         lh_ASN1_OBJECT_new(hash_short_name, cmp_short_name);
   }
-  if (global_added_by_long_name == NULL) {
+  if (global_added_by_long_name == nullptr) {
     global_added_by_long_name =
         lh_ASN1_OBJECT_new(hash_long_name, cmp_long_name);
   }
 
-  int ok = 0;
-  if (global_added_by_nid == NULL ||         //
-      global_added_by_data == NULL ||        //
-      global_added_by_short_name == NULL ||  //
-      global_added_by_long_name == NULL) {
-    goto err;
+  if (global_added_by_nid == nullptr ||         //
+      global_added_by_data == nullptr ||        //
+      global_added_by_short_name == nullptr ||  //
+      global_added_by_long_name == nullptr) {
+    return 0;
   }
 
-  // We don't pay attention to |old_object| (which contains any previous object
+  // We don't pay attention to `old_object` (which contains any previous object
   // that was evicted from the hashes) because we don't have a reference count
   // on ASN1_OBJECT values. Also, we should never have duplicates nids and so
-  // should always have objects in |global_added_by_nid|.
+  // should always have objects in `global_added_by_nid`.
   ASN1_OBJECT *old_object;
-  ok = lh_ASN1_OBJECT_insert(global_added_by_nid, &old_object, obj);
-  if (obj->length != 0 && obj->data != NULL) {
+  int ok = lh_ASN1_OBJECT_insert(global_added_by_nid, &old_object, obj);
+  if (obj->length != 0 && obj->data != nullptr) {
     ok &= lh_ASN1_OBJECT_insert(global_added_by_data, &old_object, obj);
   }
-  if (obj->sn != NULL) {
+  if (obj->sn != nullptr) {
     ok &= lh_ASN1_OBJECT_insert(global_added_by_short_name, &old_object, obj);
   }
-  if (obj->ln != NULL) {
+  if (obj->ln != nullptr) {
     ok &= lh_ASN1_OBJECT_insert(global_added_by_long_name, &old_object, obj);
   }
-
-err:
-  CRYPTO_MUTEX_unlock_write(&global_added_lock);
   return ok;
 }
 
 int OBJ_create(const char *oid, const char *short_name, const char *long_name) {
   ASN1_OBJECT *op =
       create_object_with_text_oid(obj_next_nid, oid, short_name, long_name);
-  if (op == NULL || !obj_add_object(op)) {
+  if (op == nullptr || !obj_add_object(op)) {
     return NID_undef;
   }
   return op->nid;
 }
 
-void OBJ_cleanup(void) {}
+void OBJ_cleanup() {}

data/third_party/boringssl-with-bazel/crypto/obj/obj_dat.h

@@ -15,7 +15,8 @@
 // This file is generated by crypto/obj/objects.go.
 
 
-#define NUM_NID 966
+BSSL_NAMESPACE_BEGIN
+#define NUM_NID 973
 
 static const uint8_t kObjectData[] = {
     /* NID_rsadsi */
@@ -7095,6 +7096,56 @@ static const uint8_t kObjectData[] = {
     0x04,
     0x02,
     0x06,
+    /* NID_ML_KEM_1024 */
+    0x60,
+    0x86,
+    0x48,
+    0x01,
+    0x65,
+    0x03,
+    0x04,
+    0x04,
+    0x03,
+    /* NID_ML_DSA_44 */
+    0x60,
+    0x86,
+    0x48,
+    0x01,
+    0x65,
+    0x03,
+    0x04,
+    0x03,
+    0x11,
+    /* NID_ML_DSA_65 */
+    0x60,
+    0x86,
+    0x48,
+    0x01,
+    0x65,
+    0x03,
+    0x04,
+    0x03,
+    0x12,
+    /* NID_ML_DSA_87 */
+    0x60,
+    0x86,
+    0x48,
+    0x01,
+    0x65,
+    0x03,
+    0x04,
+    0x03,
+    0x13,
+    /* NID_ML_KEM_768 */
+    0x60,
+    0x86,
+    0x48,
+    0x01,
+    0x65,
+    0x03,
+    0x04,
+    0x04,
+    0x02,
 };
 
 static const ASN1_OBJECT kObjects[NUM_NID] = {
@@ -8742,6 +8793,15 @@ static const ASN1_OBJECT kObjects[NUM_NID] = {
     {"X25519Kyber768Draft00", "X25519Kyber768Draft00",
      NID_X25519Kyber768Draft00, 0, NULL, 0},
     {"X25519MLKEM768", "X25519MLKEM768", NID_X25519MLKEM768, 0, NULL, 0},
+    {"id-alg-ml-kem-1024", "ML-KEM-1024", NID_ML_KEM_1024, 9,
+     &kObjectData[6196], 0},
+    {"id-ml-dsa-44", "ML-DSA-44", NID_ML_DSA_44, 9, &kObjectData[6205], 0},
+    {"id-ml-dsa-65", "ML-DSA-65", NID_ML_DSA_65, 9, &kObjectData[6214], 0},
+    {"id-ml-dsa-87", "ML-DSA-87", NID_ML_DSA_87, 9, &kObjectData[6223], 0},
+    {"id-alg-ml-kem-768", "ML-KEM-768", NID_ML_KEM_768, 9, &kObjectData[6232],
+     0},
+    {NULL, NULL, NID_undef, 0, NULL, 0},
+    {"X-Wing", "X-Wing", NID_X_Wing, 0, NULL, 0},
 };
 
 static const uint16_t kNIDsInShortNameOrder[] = {
@@ -8938,6 +8998,7 @@ static const uint16_t kNIDsInShortNameOrder[] = {
     16 /* ST */,
     143 /* SXNetID */,
     458 /* UID */,
+    972 /* X-Wing */,
     948 /* X25519 */,
     964 /* X25519Kyber768Draft00 */,
     965 /* X25519MLKEM768 */,
@@ -9179,6 +9240,8 @@ static const uint16_t kNIDsInShortNameOrder[] = {
     323 /* id-alg-des40 */,
     326 /* id-alg-dh-pop */,
     325 /* id-alg-dh-sig-hmac-sha1 */,
+    966 /* id-alg-ml-kem-1024 */,
+    970 /* id-alg-ml-kem-768 */,
     324 /* id-alg-noSignature */,
     907 /* id-camellia128-wrap */,
     908 /* id-camellia192-wrap */,
@@ -9232,6 +9295,9 @@ static const uint16_t kNIDsInShortNameOrder[] = {
     784 /* id-it-suppLangTags */,
     304 /* id-it-unsupportedOIDs */,
     128 /* id-kp */,
+    967 /* id-ml-dsa-44 */,
+    968 /* id-ml-dsa-65 */,
+    969 /* id-ml-dsa-87 */,
     280 /* id-mod-attribute-cert */,
     274 /* id-mod-cmc */,
     277 /* id-mod-cmp */,
@@ -9755,6 +9821,11 @@ static const uint16_t kNIDsInLongNameOrder[] = {
     647 /* International Organizations */,
     142 /* Invalidity Date */,
     504 /* MIME MHS */,
+    967 /* ML-DSA-44 */,
+    968 /* ML-DSA-65 */,
+    969 /* ML-DSA-87 */,
+    966 /* ML-KEM-1024 */,
+    970 /* ML-KEM-768 */,
     388 /* Mail */,
     383 /* Management */,
     417 /* Microsoft CSP Name */,
@@ -9810,6 +9881,7 @@ static const uint16_t kNIDsInLongNameOrder[] = {
     129 /* TLS Web Server Authentication */,
     133 /* Time Stamping */,
     375 /* Trust Root */,
+    972 /* X-Wing */,
     948 /* X25519 */,
     964 /* X25519Kyber768Draft00 */,
     965 /* X25519MLKEM768 */,
@@ -11370,6 +11442,11 @@ static const uint16_t kNIDsInOIDOrder[] = {
     962 /* 2.16.840.1.101.3.4.2.6 (OBJ_sha512_256) */,
     802 /* 2.16.840.1.101.3.4.3.1 (OBJ_dsa_with_SHA224) */,
     803 /* 2.16.840.1.101.3.4.3.2 (OBJ_dsa_with_SHA256) */,
+    967 /* 2.16.840.1.101.3.4.3.17 (OBJ_ML_DSA_44) */,
+    968 /* 2.16.840.1.101.3.4.3.18 (OBJ_ML_DSA_65) */,
+    969 /* 2.16.840.1.101.3.4.3.19 (OBJ_ML_DSA_87) */,
+    970 /* 2.16.840.1.101.3.4.4.2 (OBJ_ML_KEM_768) */,
+    966 /* 2.16.840.1.101.3.4.4.3 (OBJ_ML_KEM_1024) */,
     71 /* 2.16.840.1.113730.1.1 (OBJ_netscape_cert_type) */,
     72 /* 2.16.840.1.113730.1.2 (OBJ_netscape_base_url) */,
     73 /* 2.16.840.1.113730.1.3 (OBJ_netscape_revocation_url) */,
@@ -11546,3 +11623,4 @@ static const uint16_t kNIDsInOIDOrder[] = {
     155 /* 1.2.840.113549.1.12.10.1.6 (OBJ_safeContentsBag) */,
     34 /* 1.3.6.1.4.1.188.7.1.1.2 (OBJ_idea_cbc) */,
 };
+BSSL_NAMESPACE_END