grpc 1.84.0 → 1.85.0.pre1

data/third_party/boringssl-with-bazel/crypto/x509/v3_alt.cc

@@ -15,16 +15,18 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <openssl/asn1.h>
 #include <openssl/conf.h>
 #include <openssl/err.h>
 #include <openssl/mem.h>
 #include <openssl/obj.h>
 #include <openssl/x509.h>
 
-#include "ext_dat.h"
 #include "internal.h"
 
 
+using namespace bssl;
+
 static void *v2i_subject_alt(const X509V3_EXT_METHOD *method,
                              const X509V3_CTX *ctx,
                              const STACK_OF(CONF_VALUE) *nval);
@@ -43,29 +45,69 @@ static STACK_OF(CONF_VALUE) *i2v_GENERAL_NAMES_cb(
   return i2v_GENERAL_NAMES(method, reinterpret_cast<GENERAL_NAMES *>(ext), ret);
 }
 
-const X509V3_EXT_METHOD v3_alt[] = {
-    {NID_subject_alt_name, 0, ASN1_ITEM_ref(GENERAL_NAMES), 0, 0, 0, 0, 0, 0,
-     i2v_GENERAL_NAMES_cb, v2i_subject_alt, NULL, NULL, NULL},
+const X509V3_EXT_METHOD bssl::v3_subject_alt_name = {
+    NID_subject_alt_name,
+    0,
+    ASN1_ITEM_ref(GENERAL_NAMES),
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    i2v_GENERAL_NAMES_cb,
+    v2i_subject_alt,
+    nullptr,
+    nullptr,
+    nullptr,
+};
 
-    {NID_issuer_alt_name, 0, ASN1_ITEM_ref(GENERAL_NAMES), 0, 0, 0, 0, 0, 0,
-     i2v_GENERAL_NAMES_cb, v2i_issuer_alt, NULL, NULL, NULL},
+const X509V3_EXT_METHOD bssl::v3_issuer_alt_name = {
+    NID_issuer_alt_name,
+    0,
+    ASN1_ITEM_ref(GENERAL_NAMES),
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    i2v_GENERAL_NAMES_cb,
+    v2i_issuer_alt,
+    nullptr,
+    nullptr,
+    nullptr,
+};
 
-    {NID_certificate_issuer, 0, ASN1_ITEM_ref(GENERAL_NAMES), 0, 0, 0, 0, 0, 0,
-     i2v_GENERAL_NAMES_cb, NULL, NULL, NULL, NULL},
+const X509V3_EXT_METHOD bssl::v3_certificate_issuer = {
+    NID_certificate_issuer,
+    0,
+    ASN1_ITEM_ref(GENERAL_NAMES),
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    i2v_GENERAL_NAMES_cb,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
 };
 
 STACK_OF(CONF_VALUE) *i2v_GENERAL_NAMES(const X509V3_EXT_METHOD *method,
                                         const GENERAL_NAMES *gens,
                                         STACK_OF(CONF_VALUE) *ret) {
-  int ret_was_null = ret == NULL;
+  int ret_was_null = ret == nullptr;
   for (size_t i = 0; i < sk_GENERAL_NAME_num(gens); i++) {
     const GENERAL_NAME *gen = sk_GENERAL_NAME_value(gens, i);
     STACK_OF(CONF_VALUE) *tmp = i2v_GENERAL_NAME(method, gen, ret);
-    if (tmp == NULL) {
+    if (tmp == nullptr) {
       if (ret_was_null) {
         sk_CONF_VALUE_pop_free(ret, X509V3_conf_free);
       }
-      return NULL;
+      return nullptr;
     }
     ret = tmp;
   }
@@ -79,7 +121,7 @@ STACK_OF(CONF_VALUE) *i2v_GENERAL_NAME(const X509V3_EXT_METHOD *method,
                                        const GENERAL_NAME *gen,
                                        STACK_OF(CONF_VALUE) *ret) {
   // Note the error-handling for this function relies on there being at most
-  // one |X509V3_add_value| call. If there were two and the second failed, we
+  // one `X509V3_add_value` call. If there were two and the second failed, we
   // would need to sometimes free the first call's result.
   unsigned char *p;
   char oline[256], htmp[5];
@@ -87,44 +129,44 @@ STACK_OF(CONF_VALUE) *i2v_GENERAL_NAME(const X509V3_EXT_METHOD *method,
   switch (gen->type) {
     case GEN_OTHERNAME:
       if (!X509V3_add_value("othername", "<unsupported>", &ret)) {
-        return NULL;
+        return nullptr;
       }
       break;
 
     case GEN_X400:
       if (!X509V3_add_value("X400Name", "<unsupported>", &ret)) {
-        return NULL;
+        return nullptr;
       }
       break;
 
     case GEN_EDIPARTY:
       if (!X509V3_add_value("EdiPartyName", "<unsupported>", &ret)) {
-        return NULL;
+        return nullptr;
       }
       break;
 
     case GEN_EMAIL:
       if (!x509V3_add_value_asn1_string("email", gen->d.ia5, &ret)) {
-        return NULL;
+        return nullptr;
       }
       break;
 
     case GEN_DNS:
       if (!x509V3_add_value_asn1_string("DNS", gen->d.ia5, &ret)) {
-        return NULL;
+        return nullptr;
       }
       break;
 
     case GEN_URI:
       if (!x509V3_add_value_asn1_string("URI", gen->d.ia5, &ret)) {
-        return NULL;
+        return nullptr;
       }
       break;
 
     case GEN_DIRNAME:
-      if (X509_NAME_oneline(gen->d.dirn, oline, 256) == NULL ||
+      if (X509_NAME_oneline(gen->d.dirn, oline, 256) == nullptr ||
           !X509V3_add_value("DirName", oline, &ret)) {
-        return NULL;
+        return nullptr;
       }
       break;
 
@@ -145,19 +187,19 @@ STACK_OF(CONF_VALUE) *i2v_GENERAL_NAME(const X509V3_EXT_METHOD *method,
         }
       } else {
         if (!X509V3_add_value("IP Address", "<invalid>", &ret)) {
-          return NULL;
+          return nullptr;
         }
         break;
       }
       if (!X509V3_add_value("IP Address", oline, &ret)) {
-        return NULL;
+        return nullptr;
       }
       break;
 
     case GEN_RID:
       i2t_ASN1_OBJECT(oline, 256, gen->d.rid);
       if (!X509V3_add_value("Registered ID", oline, &ret)) {
-        return NULL;
+        return nullptr;
       }
       break;
   }
@@ -230,8 +272,8 @@ static void *v2i_issuer_alt(const X509V3_EXT_METHOD *method,
                             const X509V3_CTX *ctx,
                             const STACK_OF(CONF_VALUE) *nval) {
   GENERAL_NAMES *gens = sk_GENERAL_NAME_new_null();
-  if (gens == NULL) {
-    return NULL;
+  if (gens == nullptr) {
+    return nullptr;
   }
   for (size_t i = 0; i < sk_CONF_VALUE_num(nval); i++) {
     const CONF_VALUE *cnf = sk_CONF_VALUE_value(nval, i);
@@ -242,7 +284,7 @@ static void *v2i_issuer_alt(const X509V3_EXT_METHOD *method,
       }
     } else {
       GENERAL_NAME *gen = v2i_GENERAL_NAME(method, ctx, cnf);
-      if (gen == NULL || !sk_GENERAL_NAME_push(gens, gen)) {
+      if (gen == nullptr || !sk_GENERAL_NAME_push(gens, gen)) {
         GENERAL_NAME_free(gen);
         goto err;
       }
@@ -251,7 +293,7 @@ static void *v2i_issuer_alt(const X509V3_EXT_METHOD *method,
   return gens;
 err:
   sk_GENERAL_NAME_pop_free(gens, GENERAL_NAME_free);
-  return NULL;
+  return nullptr;
 }
 
 // Append subject altname of issuer to issuer alt name of subject
@@ -270,7 +312,7 @@ static int copy_issuer(const X509V3_CTX *ctx, GENERAL_NAMES *gens) {
   }
 
   int ret = 0;
-  GENERAL_NAMES *ialt = NULL;
+  GENERAL_NAMES *ialt = nullptr;
   X509_EXTENSION *ext;
   if (!(ext = X509_get_ext(ctx->issuer_cert, i)) ||
       !(ialt = reinterpret_cast<GENERAL_NAMES *>(X509V3_EXT_d2i(ext)))) {
@@ -283,8 +325,8 @@ static int copy_issuer(const X509V3_CTX *ctx, GENERAL_NAMES *gens) {
     if (!sk_GENERAL_NAME_push(gens, gen)) {
       goto err;
     }
-    // Ownership of |gen| has moved from |ialt| to |gens|.
-    sk_GENERAL_NAME_set(ialt, j, NULL);
+    // Ownership of `gen` has moved from `ialt` to `gens`.
+    sk_GENERAL_NAME_set(ialt, j, nullptr);
   }
 
   ret = 1;
@@ -298,8 +340,8 @@ static void *v2i_subject_alt(const X509V3_EXT_METHOD *method,
                              const X509V3_CTX *ctx,
                              const STACK_OF(CONF_VALUE) *nval) {
   GENERAL_NAMES *gens = sk_GENERAL_NAME_new_null();
-  if (gens == NULL) {
-    return NULL;
+  if (gens == nullptr) {
+    return nullptr;
   }
   for (size_t i = 0; i < sk_CONF_VALUE_num(nval); i++) {
     const CONF_VALUE *cnf = sk_CONF_VALUE_value(nval, i);
@@ -315,7 +357,7 @@ static void *v2i_subject_alt(const X509V3_EXT_METHOD *method,
       }
     } else {
       GENERAL_NAME *gen = v2i_GENERAL_NAME(method, ctx, cnf);
-      if (gen == NULL || !sk_GENERAL_NAME_push(gens, gen)) {
+      if (gen == nullptr || !sk_GENERAL_NAME_push(gens, gen)) {
         GENERAL_NAME_free(gen);
         goto err;
       }
@@ -324,18 +366,18 @@ static void *v2i_subject_alt(const X509V3_EXT_METHOD *method,
   return gens;
 err:
   sk_GENERAL_NAME_pop_free(gens, GENERAL_NAME_free);
-  return NULL;
+  return nullptr;
 }
 
 // Copy any email addresses in a certificate or request to GENERAL_NAMES
 
 static int copy_email(const X509V3_CTX *ctx, GENERAL_NAMES *gens, int move_p) {
   X509_NAME *nm;
-  ASN1_IA5STRING *email = NULL;
+  ASN1_IA5STRING *email = nullptr;
   X509_NAME_ENTRY *ne;
-  GENERAL_NAME *gen = NULL;
+  GENERAL_NAME *gen = nullptr;
   int i;
-  if (ctx != NULL && ctx->flags == X509V3_CTX_TEST) {
+  if (ctx != nullptr && ctx->flags == X509V3_CTX_TEST) {
     return 1;
   }
   if (!ctx || (!ctx->subject_cert && !ctx->subject_req)) {
@@ -363,12 +405,12 @@ static int copy_email(const X509V3_CTX *ctx, GENERAL_NAMES *gens, int move_p) {
       goto err;
     }
     gen->d.ia5 = email;
-    email = NULL;
+    email = nullptr;
     gen->type = GEN_EMAIL;
     if (!sk_GENERAL_NAME_push(gens, gen)) {
       goto err;
     }
-    gen = NULL;
+    gen = nullptr;
   }
 
   return 1;
@@ -379,17 +421,17 @@ err:
   return 0;
 }
 
-GENERAL_NAMES *v2i_GENERAL_NAMES(const X509V3_EXT_METHOD *method,
-                                 const X509V3_CTX *ctx,
-                                 const STACK_OF(CONF_VALUE) *nval) {
+GENERAL_NAMES *bssl::v2i_GENERAL_NAMES(const X509V3_EXT_METHOD *method,
+                                       const X509V3_CTX *ctx,
+                                       const STACK_OF(CONF_VALUE) *nval) {
   GENERAL_NAMES *gens = sk_GENERAL_NAME_new_null();
-  if (gens == NULL) {
-    return NULL;
+  if (gens == nullptr) {
+    return nullptr;
   }
   for (size_t i = 0; i < sk_CONF_VALUE_num(nval); i++) {
     const CONF_VALUE *cnf = sk_CONF_VALUE_value(nval, i);
     GENERAL_NAME *gen = v2i_GENERAL_NAME(method, ctx, cnf);
-    if (gen == NULL || !sk_GENERAL_NAME_push(gens, gen)) {
+    if (gen == nullptr || !sk_GENERAL_NAME_push(gens, gen)) {
       GENERAL_NAME_free(gen);
       goto err;
     }
@@ -397,12 +439,13 @@ GENERAL_NAMES *v2i_GENERAL_NAMES(const X509V3_EXT_METHOD *method,
   return gens;
 err:
   sk_GENERAL_NAME_pop_free(gens, GENERAL_NAME_free);
-  return NULL;
+  return nullptr;
 }
 
-GENERAL_NAME *v2i_GENERAL_NAME(const X509V3_EXT_METHOD *method,
-                               const X509V3_CTX *ctx, const CONF_VALUE *cnf) {
-  return v2i_GENERAL_NAME_ex(NULL, method, ctx, cnf, 0);
+GENERAL_NAME *bssl::v2i_GENERAL_NAME(const X509V3_EXT_METHOD *method,
+                                     const X509V3_CTX *ctx,
+                                     const CONF_VALUE *cnf) {
+  return v2i_GENERAL_NAME_ex(nullptr, method, ctx, cnf, 0);
 }
 
 static GENERAL_NAME *a2i_GENERAL_NAME(GENERAL_NAME *out,
@@ -411,16 +454,16 @@ static GENERAL_NAME *a2i_GENERAL_NAME(GENERAL_NAME *out,
                                       const char *value, int is_nc) {
   if (!value) {
     OPENSSL_PUT_ERROR(X509V3, X509V3_R_MISSING_VALUE);
-    return NULL;
+    return nullptr;
   }
 
-  GENERAL_NAME *gen = NULL;
+  GENERAL_NAME *gen = nullptr;
   if (out) {
     gen = out;
   } else {
     gen = GENERAL_NAME_new();
-    if (gen == NULL) {
-      return NULL;
+    if (gen == nullptr) {
+      return nullptr;
     }
   }
 
@@ -429,7 +472,7 @@ static GENERAL_NAME *a2i_GENERAL_NAME(GENERAL_NAME *out,
     case GEN_EMAIL:
     case GEN_DNS: {
       ASN1_IA5STRING *str = ASN1_IA5STRING_new();
-      if (str == NULL || !ASN1_STRING_set(str, value, strlen(value))) {
+      if (str == nullptr || !ASN1_STRING_set(str, value, strlen(value))) {
         ASN1_STRING_free(str);
         goto err;
       }
@@ -457,7 +500,7 @@ static GENERAL_NAME *a2i_GENERAL_NAME(GENERAL_NAME *out,
       } else {
         gen->d.ip = a2i_IPADDRESS(value);
       }
-      if (gen->d.ip == NULL) {
+      if (gen->d.ip == nullptr) {
         OPENSSL_PUT_ERROR(X509V3, X509V3_R_BAD_IP_ADDRESS);
         ERR_add_error_data(2, "value=", value);
         goto err;
@@ -488,18 +531,18 @@ err:
   if (!out) {
     GENERAL_NAME_free(gen);
   }
-  return NULL;
+  return nullptr;
 }
 
-GENERAL_NAME *v2i_GENERAL_NAME_ex(GENERAL_NAME *out,
-                                  const X509V3_EXT_METHOD *method,
-                                  const X509V3_CTX *ctx, const CONF_VALUE *cnf,
-                                  int is_nc) {
+GENERAL_NAME *bssl::v2i_GENERAL_NAME_ex(GENERAL_NAME *out,
+                                        const X509V3_EXT_METHOD *method,
+                                        const X509V3_CTX *ctx,
+                                        const CONF_VALUE *cnf, int is_nc) {
   const char *name = cnf->name;
   const char *value = cnf->value;
   if (!value) {
     OPENSSL_PUT_ERROR(X509V3, X509V3_R_MISSING_VALUE);
-    return NULL;
+    return nullptr;
   }
 
   int type;
@@ -520,7 +563,7 @@ GENERAL_NAME *v2i_GENERAL_NAME_ex(GENERAL_NAME *out,
   } else {
     OPENSSL_PUT_ERROR(X509V3, X509V3_R_UNSUPPORTED_OPTION);
     ERR_add_error_data(2, "name=", name);
-    return NULL;
+    return nullptr;
   }
 
   return a2i_GENERAL_NAME(out, method, ctx, type, value, is_nc);
@@ -529,29 +572,29 @@ GENERAL_NAME *v2i_GENERAL_NAME_ex(GENERAL_NAME *out,
 static int do_othername(GENERAL_NAME *gen, const char *value,
                         const X509V3_CTX *ctx) {
   const char *semicolon = strchr(value, ';');
-  if (semicolon == NULL) {
+  if (semicolon == nullptr) {
     return 0;
   }
 
   OTHERNAME *name = OTHERNAME_new();
-  if (name == NULL) {
+  if (name == nullptr) {
     return 0;
   }
 
   char *objtmp = OPENSSL_strndup(value, semicolon - value);
-  if (objtmp == NULL) {
+  if (objtmp == nullptr) {
     goto err;
   }
   ASN1_OBJECT_free(name->type_id);
   name->type_id = OBJ_txt2obj(objtmp, /*dont_search_names=*/0);
   OPENSSL_free(objtmp);
-  if (name->type_id == NULL) {
+  if (name->type_id == nullptr) {
     goto err;
   }
 
   ASN1_TYPE_free(name->value);
   name->value = ASN1_generate_v3(semicolon + 1, ctx);
-  if (name->value == NULL) {
+  if (name->value == nullptr) {
     goto err;
   }
 
@@ -569,10 +612,10 @@ static int do_dirname(GENERAL_NAME *gen, const char *value,
   int ret = 0;
   const STACK_OF(CONF_VALUE) *sk = X509V3_get_section(ctx, value);
   X509_NAME *nm = X509_NAME_new();
-  if (nm == NULL) {
+  if (nm == nullptr) {
     goto err;
   }
-  if (sk == NULL) {
+  if (sk == nullptr) {
     OPENSSL_PUT_ERROR(X509V3, X509V3_R_SECTION_NOT_FOUND);
     ERR_add_error_data(2, "section=", value);
     goto err;

data/third_party/boringssl-with-bazel/crypto/x509/v3_bcons.cc

@@ -22,31 +22,32 @@
 #include <openssl/obj.h>
 #include <openssl/x509.h>
 
-#include "ext_dat.h"
 #include "internal.h"
 
 
+using namespace bssl;
+
 static STACK_OF(CONF_VALUE) *i2v_BASIC_CONSTRAINTS(
     const X509V3_EXT_METHOD *method, void *ext, STACK_OF(CONF_VALUE) *extlist);
 static void *v2i_BASIC_CONSTRAINTS(const X509V3_EXT_METHOD *method,
                                    const X509V3_CTX *ctx,
                                    const STACK_OF(CONF_VALUE) *values);
 
-const X509V3_EXT_METHOD v3_bcons = {
+const X509V3_EXT_METHOD bssl::v3_bcons = {
     NID_basic_constraints,
     0,
     ASN1_ITEM_ref(BASIC_CONSTRAINTS),
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
     i2v_BASIC_CONSTRAINTS,
     v2i_BASIC_CONSTRAINTS,
-    NULL,
-    NULL,
-    NULL,
+    nullptr,
+    nullptr,
+    nullptr,
 };
 
 ASN1_SEQUENCE(BASIC_CONSTRAINTS) = {
@@ -68,9 +69,9 @@ static STACK_OF(CONF_VALUE) *i2v_BASIC_CONSTRAINTS(
 static void *v2i_BASIC_CONSTRAINTS(const X509V3_EXT_METHOD *method,
                                    const X509V3_CTX *ctx,
                                    const STACK_OF(CONF_VALUE) *values) {
-  BASIC_CONSTRAINTS *bcons = NULL;
+  BASIC_CONSTRAINTS *bcons = nullptr;
   if (!(bcons = BASIC_CONSTRAINTS_new())) {
-    return NULL;
+    return nullptr;
   }
   for (size_t i = 0; i < sk_CONF_VALUE_num(values); i++) {
     const CONF_VALUE *val = sk_CONF_VALUE_value(values, i);
@@ -91,5 +92,5 @@ static void *v2i_BASIC_CONSTRAINTS(const X509V3_EXT_METHOD *method,
   return bcons;
 err:
   BASIC_CONSTRAINTS_free(bcons);
-  return NULL;
+  return nullptr;
 }

data/third_party/boringssl-with-bazel/crypto/x509/v3_bitst.cc

@@ -20,20 +20,17 @@
 #include <openssl/obj.h>
 #include <openssl/x509.h>
 
-#include "ext_dat.h"
 #include "internal.h"
 
 
+using namespace bssl;
+
 static const BIT_STRING_BITNAME ns_cert_type_table[] = {
-    {0, "SSL Client", "client"},
-    {1, "SSL Server", "server"},
-    {2, "S/MIME", "email"},
-    {3, "Object Signing", "objsign"},
-    {4, "Unused", "reserved"},
-    {5, "SSL CA", "sslCA"},
-    {6, "S/MIME CA", "emailCA"},
-    {7, "Object Signing CA", "objCA"},
-    {-1, NULL, NULL}};
+    {0, "SSL Client", "client"}, {1, "SSL Server", "server"},
+    {2, "S/MIME", "email"},      {3, "Object Signing", "objsign"},
+    {4, "Unused", "reserved"},   {5, "SSL CA", "sslCA"},
+    {6, "S/MIME CA", "emailCA"}, {7, "Object Signing CA", "objCA"},
+    {-1, nullptr, nullptr}};
 
 static const BIT_STRING_BITNAME key_usage_type_table[] = {
     {0, "Digital Signature", "digitalSignature"},
@@ -45,7 +42,7 @@ static const BIT_STRING_BITNAME key_usage_type_table[] = {
     {6, "CRL Sign", "cRLSign"},
     {7, "Encipher Only", "encipherOnly"},
     {8, "Decipher Only", "decipherOnly"},
-    {-1, NULL, NULL}};
+    {-1, nullptr, nullptr}};
 
 static STACK_OF(CONF_VALUE) *i2v_ASN1_BIT_STRING(
     const X509V3_EXT_METHOD *method, void *ext, STACK_OF(CONF_VALUE) *ret) {
@@ -54,7 +51,7 @@ static STACK_OF(CONF_VALUE) *i2v_ASN1_BIT_STRING(
   for (bnam = reinterpret_cast<const BIT_STRING_BITNAME *>(method->usr_data);
        bnam->lname; bnam++) {
     if (ASN1_BIT_STRING_get_bit(bits, bnam->bitnum)) {
-      X509V3_add_value(bnam->lname, NULL, &ret);
+      X509V3_add_value(bnam->lname, nullptr, &ret);
     }
   }
   return ret;
@@ -65,7 +62,7 @@ static void *v2i_ASN1_BIT_STRING(const X509V3_EXT_METHOD *method,
                                  const STACK_OF(CONF_VALUE) *nval) {
   ASN1_BIT_STRING *bs;
   if (!(bs = ASN1_BIT_STRING_new())) {
-    return NULL;
+    return nullptr;
   }
   for (size_t i = 0; i < sk_CONF_VALUE_num(nval); i++) {
     const CONF_VALUE *val = sk_CONF_VALUE_value(nval, i);
@@ -75,7 +72,7 @@ static void *v2i_ASN1_BIT_STRING(const X509V3_EXT_METHOD *method,
       if (!strcmp(bnam->sname, val->name) || !strcmp(bnam->lname, val->name)) {
         if (!ASN1_BIT_STRING_set_bit(bs, bnam->bitnum, 1)) {
           ASN1_BIT_STRING_free(bs);
-          return NULL;
+          return nullptr;
         }
         break;
       }
@@ -84,7 +81,7 @@ static void *v2i_ASN1_BIT_STRING(const X509V3_EXT_METHOD *method,
       OPENSSL_PUT_ERROR(X509V3, X509V3_R_UNKNOWN_BIT_STRING_ARGUMENT);
       X509V3_conf_err(val);
       ASN1_BIT_STRING_free(bs);
-      return NULL;
+      return nullptr;
     }
   }
   return bs;
@@ -93,10 +90,11 @@ static void *v2i_ASN1_BIT_STRING(const X509V3_EXT_METHOD *method,
 #define EXT_BITSTRING(nid, table)                                             \
   {                                                                           \
     nid, 0, ASN1_ITEM_ref(ASN1_BIT_STRING), 0, 0, 0, 0, 0, 0,                 \
-        i2v_ASN1_BIT_STRING, v2i_ASN1_BIT_STRING, NULL, NULL, (void *)(table) \
+        i2v_ASN1_BIT_STRING, v2i_ASN1_BIT_STRING, nullptr, nullptr,           \
+    (void *)(table)                                                           \
   }
 
-const X509V3_EXT_METHOD v3_nscert =
+const X509V3_EXT_METHOD bssl::v3_nscert =
     EXT_BITSTRING(NID_netscape_cert_type, ns_cert_type_table);
-const X509V3_EXT_METHOD v3_key_usage =
+const X509V3_EXT_METHOD bssl::v3_key_usage =
     EXT_BITSTRING(NID_key_usage, key_usage_type_table);