grpc 1.53.0.pre2 → 1.54.0

data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_enum.c

@@ -1,4 +1,3 @@
-/* v3_enum.c */
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
  * 1999.
@@ -57,8 +56,8 @@
 
 #include <stdio.h>
 
-#include <openssl/obj.h>
 #include <openssl/mem.h>
+#include <openssl/obj.h>
 #include <openssl/x509v3.h>
 
 #include "internal.h"
@@ -73,34 +72,40 @@ static const ENUMERATED_NAMES crl_reasons[] = {
     {CRL_REASON_AFFILIATION_CHANGED, "Affiliation Changed",
      "affiliationChanged"},
     {CRL_REASON_SUPERSEDED, "Superseded", "superseded"},
-    {CRL_REASON_CESSATION_OF_OPERATION,
-     "Cessation Of Operation", "cessationOfOperation"},
+    {CRL_REASON_CESSATION_OF_OPERATION, "Cessation Of Operation",
+     "cessationOfOperation"},
     {CRL_REASON_CERTIFICATE_HOLD, "Certificate Hold", "certificateHold"},
     {CRL_REASON_REMOVE_FROM_CRL, "Remove From CRL", "removeFromCRL"},
     {CRL_REASON_PRIVILEGE_WITHDRAWN, "Privilege Withdrawn",
      "privilegeWithdrawn"},
     {CRL_REASON_AA_COMPROMISE, "AA Compromise", "AACompromise"},
-    {-1, NULL, NULL}
-};
+    {-1, NULL, NULL}};
+
+static char *i2s_ASN1_ENUMERATED_TABLE(const X509V3_EXT_METHOD *method,
+                                       void *ext) {
+  const ASN1_ENUMERATED *e = ext;
+  long strval = ASN1_ENUMERATED_get(e);
+  for (const ENUMERATED_NAMES *enam = method->usr_data; enam->lname; enam++) {
+    if (strval == enam->bitnum) {
+      return OPENSSL_strdup(enam->lname);
+    }
+  }
+  return i2s_ASN1_ENUMERATED(method, e);
+}
 
 const X509V3_EXT_METHOD v3_crl_reason = {
-    NID_crl_reason, 0, ASN1_ITEM_ref(ASN1_ENUMERATED),
-    0, 0, 0, 0,
-    (X509V3_EXT_I2S)i2s_ASN1_ENUMERATED_TABLE,
+    NID_crl_reason,
+    0,
+    ASN1_ITEM_ref(ASN1_ENUMERATED),
+    0,
+    0,
     0,
-    0, 0, 0, 0,
-    (void *)crl_reasons
+    0,
+    i2s_ASN1_ENUMERATED_TABLE,
+    0,
+    0,
+    0,
+    0,
+    0,
+    (void *)crl_reasons,
 };
-
-char *i2s_ASN1_ENUMERATED_TABLE(X509V3_EXT_METHOD *method,
-                                const ASN1_ENUMERATED *e)
-{
-    const ENUMERATED_NAMES *enam;
-    long strval;
-    strval = ASN1_ENUMERATED_get(e);
-    for (enam = method->usr_data; enam->lname; enam++) {
-        if (strval == enam->bitnum)
-            return OPENSSL_strdup(enam->lname);
-    }
-    return i2s_ASN1_ENUMERATED(method, e);
-}

data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_extku.c

@@ -1,4 +1,3 @@
-/* v3_extku.c */
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
  * 1999.
@@ -63,86 +62,93 @@
 #include <openssl/obj.h>
 #include <openssl/x509v3.h>
 
+#include "internal.h"
+
+
 static void *v2i_EXTENDED_KEY_USAGE(const X509V3_EXT_METHOD *method,
-                                    X509V3_CTX *ctx,
-                                    STACK_OF(CONF_VALUE) *nval);
-static STACK_OF(CONF_VALUE) *i2v_EXTENDED_KEY_USAGE(const X509V3_EXT_METHOD
-                                                    *method, void *eku, STACK_OF(CONF_VALUE)
-                                                    *extlist);
+                                    const X509V3_CTX *ctx,
+                                    const STACK_OF(CONF_VALUE) *nval);
+static STACK_OF(CONF_VALUE) *i2v_EXTENDED_KEY_USAGE(
+    const X509V3_EXT_METHOD *method, void *eku, STACK_OF(CONF_VALUE) *extlist);
 
 const X509V3_EXT_METHOD v3_ext_ku = {
-    NID_ext_key_usage, 0,
+    NID_ext_key_usage,
+    0,
     ASN1_ITEM_ref(EXTENDED_KEY_USAGE),
-    0, 0, 0, 0,
-    0, 0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
     i2v_EXTENDED_KEY_USAGE,
     v2i_EXTENDED_KEY_USAGE,
-    0, 0,
-    NULL
+    0,
+    0,
+    NULL,
 };
 
-/* NB OCSP acceptable responses also is a SEQUENCE OF OBJECT */
+// NB OCSP acceptable responses also is a SEQUENCE OF OBJECT
 const X509V3_EXT_METHOD v3_ocsp_accresp = {
-    NID_id_pkix_OCSP_acceptableResponses, 0,
+    NID_id_pkix_OCSP_acceptableResponses,
+    0,
     ASN1_ITEM_ref(EXTENDED_KEY_USAGE),
-    0, 0, 0, 0,
-    0, 0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
     i2v_EXTENDED_KEY_USAGE,
     v2i_EXTENDED_KEY_USAGE,
-    0, 0,
-    NULL
+    0,
+    0,
+    NULL,
 };
 
-ASN1_ITEM_TEMPLATE(EXTENDED_KEY_USAGE) =
-        ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, EXTENDED_KEY_USAGE, ASN1_OBJECT)
+ASN1_ITEM_TEMPLATE(EXTENDED_KEY_USAGE) = ASN1_EX_TEMPLATE_TYPE(
+    ASN1_TFLG_SEQUENCE_OF, 0, EXTENDED_KEY_USAGE, ASN1_OBJECT)
 ASN1_ITEM_TEMPLATE_END(EXTENDED_KEY_USAGE)
 
-IMPLEMENT_ASN1_FUNCTIONS(EXTENDED_KEY_USAGE)
+IMPLEMENT_ASN1_FUNCTIONS_const(EXTENDED_KEY_USAGE)
 
-static STACK_OF(CONF_VALUE) *i2v_EXTENDED_KEY_USAGE(const X509V3_EXT_METHOD
-                                                    *method, void *a, STACK_OF(CONF_VALUE)
-                                                    *ext_list)
-{
-    EXTENDED_KEY_USAGE *eku = a;
-    size_t i;
-    ASN1_OBJECT *obj;
+static STACK_OF(CONF_VALUE) *i2v_EXTENDED_KEY_USAGE(
+    const X509V3_EXT_METHOD *method, void *a, STACK_OF(CONF_VALUE) *ext_list) {
+  const EXTENDED_KEY_USAGE *eku = a;
+  for (size_t i = 0; i < sk_ASN1_OBJECT_num(eku); i++) {
+    const ASN1_OBJECT *obj = sk_ASN1_OBJECT_value(eku, i);
     char obj_tmp[80];
-    for (i = 0; i < sk_ASN1_OBJECT_num(eku); i++) {
-        obj = sk_ASN1_OBJECT_value(eku, i);
-        i2t_ASN1_OBJECT(obj_tmp, 80, obj);
-        X509V3_add_value(NULL, obj_tmp, &ext_list);
-    }
-    return ext_list;
+    i2t_ASN1_OBJECT(obj_tmp, 80, obj);
+    X509V3_add_value(NULL, obj_tmp, &ext_list);
+  }
+  return ext_list;
 }
 
 static void *v2i_EXTENDED_KEY_USAGE(const X509V3_EXT_METHOD *method,
-                                    X509V3_CTX *ctx,
-                                    STACK_OF(CONF_VALUE) *nval)
-{
-    EXTENDED_KEY_USAGE *extku;
-    char *extval;
-    ASN1_OBJECT *objtmp;
-    CONF_VALUE *val;
-    size_t i;
+                                    const X509V3_CTX *ctx,
+                                    const STACK_OF(CONF_VALUE) *nval) {
+  EXTENDED_KEY_USAGE *extku = sk_ASN1_OBJECT_new_null();
+  if (extku == NULL) {
+    return NULL;
+  }
 
-    if (!(extku = sk_ASN1_OBJECT_new_null())) {
-        OPENSSL_PUT_ERROR(X509V3, ERR_R_MALLOC_FAILURE);
-        return NULL;
+  for (size_t i = 0; i < sk_CONF_VALUE_num(nval); i++) {
+    const CONF_VALUE *val = sk_CONF_VALUE_value(nval, i);
+    const char *extval;
+    if (val->value) {
+      extval = val->value;
+    } else {
+      extval = val->name;
     }
-
-    for (i = 0; i < sk_CONF_VALUE_num(nval); i++) {
-        val = sk_CONF_VALUE_value(nval, i);
-        if (val->value)
-            extval = val->value;
-        else
-            extval = val->name;
-        if (!(objtmp = OBJ_txt2obj(extval, 0))) {
-            sk_ASN1_OBJECT_pop_free(extku, ASN1_OBJECT_free);
-            OPENSSL_PUT_ERROR(X509V3, X509V3_R_INVALID_OBJECT_IDENTIFIER);
-            X509V3_conf_err(val);
-            return NULL;
-        }
-        sk_ASN1_OBJECT_push(extku, objtmp);
+    ASN1_OBJECT *obj = OBJ_txt2obj(extval, 0);
+    if (obj == NULL || !sk_ASN1_OBJECT_push(extku, obj)) {
+      ASN1_OBJECT_free(obj);
+      sk_ASN1_OBJECT_pop_free(extku, ASN1_OBJECT_free);
+      OPENSSL_PUT_ERROR(X509V3, X509V3_R_INVALID_OBJECT_IDENTIFIER);
+      X509V3_conf_err(val);
+      return NULL;
     }
-    return extku;
+  }
+
+  return extku;
 }

data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_genn.c

@@ -1,4 +1,3 @@
-/* v3_genn.c */
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
  * 1999.
@@ -62,205 +61,210 @@
 #include <openssl/obj.h>
 #include <openssl/x509v3.h>
 
+#include "internal.h"
+
 
 ASN1_SEQUENCE(OTHERNAME) = {
-        ASN1_SIMPLE(OTHERNAME, type_id, ASN1_OBJECT),
-        /* Maybe have a true ANY DEFINED BY later */
-        ASN1_EXP(OTHERNAME, value, ASN1_ANY, 0)
+    ASN1_SIMPLE(OTHERNAME, type_id, ASN1_OBJECT),
+    // Maybe have a true ANY DEFINED BY later
+    ASN1_EXP(OTHERNAME, value, ASN1_ANY, 0),
 } ASN1_SEQUENCE_END(OTHERNAME)
 
-IMPLEMENT_ASN1_FUNCTIONS(OTHERNAME)
+IMPLEMENT_ASN1_FUNCTIONS_const(OTHERNAME)
 
 ASN1_SEQUENCE(EDIPARTYNAME) = {
-        /* DirectoryString is a CHOICE type, so use explicit tagging. */
-        ASN1_EXP_OPT(EDIPARTYNAME, nameAssigner, DIRECTORYSTRING, 0),
-        ASN1_EXP(EDIPARTYNAME, partyName, DIRECTORYSTRING, 1)
+    // DirectoryString is a CHOICE type, so use explicit tagging.
+    ASN1_EXP_OPT(EDIPARTYNAME, nameAssigner, DIRECTORYSTRING, 0),
+    ASN1_EXP(EDIPARTYNAME, partyName, DIRECTORYSTRING, 1),
 } ASN1_SEQUENCE_END(EDIPARTYNAME)
 
-IMPLEMENT_ASN1_FUNCTIONS(EDIPARTYNAME)
+IMPLEMENT_ASN1_FUNCTIONS_const(EDIPARTYNAME)
 
 ASN1_CHOICE(GENERAL_NAME) = {
-        ASN1_IMP(GENERAL_NAME, d.otherName, OTHERNAME, GEN_OTHERNAME),
-        ASN1_IMP(GENERAL_NAME, d.rfc822Name, ASN1_IA5STRING, GEN_EMAIL),
-        ASN1_IMP(GENERAL_NAME, d.dNSName, ASN1_IA5STRING, GEN_DNS),
-        /* Don't decode this */
-        ASN1_IMP(GENERAL_NAME, d.x400Address, ASN1_SEQUENCE, GEN_X400),
-        /* X509_NAME is a CHOICE type so use EXPLICIT */
-        ASN1_EXP(GENERAL_NAME, d.directoryName, X509_NAME, GEN_DIRNAME),
-        ASN1_IMP(GENERAL_NAME, d.ediPartyName, EDIPARTYNAME, GEN_EDIPARTY),
-        ASN1_IMP(GENERAL_NAME, d.uniformResourceIdentifier, ASN1_IA5STRING, GEN_URI),
-        ASN1_IMP(GENERAL_NAME, d.iPAddress, ASN1_OCTET_STRING, GEN_IPADD),
-        ASN1_IMP(GENERAL_NAME, d.registeredID, ASN1_OBJECT, GEN_RID)
+    ASN1_IMP(GENERAL_NAME, d.otherName, OTHERNAME, GEN_OTHERNAME),
+    ASN1_IMP(GENERAL_NAME, d.rfc822Name, ASN1_IA5STRING, GEN_EMAIL),
+    ASN1_IMP(GENERAL_NAME, d.dNSName, ASN1_IA5STRING, GEN_DNS),
+    // Don't decode this
+    ASN1_IMP(GENERAL_NAME, d.x400Address, ASN1_SEQUENCE, GEN_X400),
+    // X509_NAME is a CHOICE type so use EXPLICIT
+    ASN1_EXP(GENERAL_NAME, d.directoryName, X509_NAME, GEN_DIRNAME),
+    ASN1_IMP(GENERAL_NAME, d.ediPartyName, EDIPARTYNAME, GEN_EDIPARTY),
+    ASN1_IMP(GENERAL_NAME, d.uniformResourceIdentifier, ASN1_IA5STRING,
+             GEN_URI),
+    ASN1_IMP(GENERAL_NAME, d.iPAddress, ASN1_OCTET_STRING, GEN_IPADD),
+    ASN1_IMP(GENERAL_NAME, d.registeredID, ASN1_OBJECT, GEN_RID),
 } ASN1_CHOICE_END(GENERAL_NAME)
 
 IMPLEMENT_ASN1_FUNCTIONS(GENERAL_NAME)
 
-ASN1_ITEM_TEMPLATE(GENERAL_NAMES) =
-        ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, GeneralNames, GENERAL_NAME)
+ASN1_ITEM_TEMPLATE(GENERAL_NAMES) = ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF,
+                                                          0, GeneralNames,
+                                                          GENERAL_NAME)
 ASN1_ITEM_TEMPLATE_END(GENERAL_NAMES)
 
 IMPLEMENT_ASN1_FUNCTIONS(GENERAL_NAMES)
 
 IMPLEMENT_ASN1_DUP_FUNCTION(GENERAL_NAME)
 
-static int edipartyname_cmp(const EDIPARTYNAME *a, const EDIPARTYNAME *b)
-{
-    /* nameAssigner is optional and may be NULL. */
-    if (a->nameAssigner == NULL) {
-        if (b->nameAssigner != NULL) {
-            return -1;
-        }
-    } else {
-        if (b->nameAssigner == NULL ||
-            ASN1_STRING_cmp(a->nameAssigner, b->nameAssigner) != 0) {
-            return -1;
-        }
+static int edipartyname_cmp(const EDIPARTYNAME *a, const EDIPARTYNAME *b) {
+  // nameAssigner is optional and may be NULL.
+  if (a->nameAssigner == NULL) {
+    if (b->nameAssigner != NULL) {
+      return -1;
+    }
+  } else {
+    if (b->nameAssigner == NULL ||
+        ASN1_STRING_cmp(a->nameAssigner, b->nameAssigner) != 0) {
+      return -1;
     }
+  }
+
+  // partyName may not be NULL.
+  return ASN1_STRING_cmp(a->partyName, b->partyName);
+}
 
-    /* partyName may not be NULL. */
-    return ASN1_STRING_cmp(a->partyName, b->partyName);
+// Returns 0 if they are equal, != 0 otherwise.
+static int othername_cmp(const OTHERNAME *a, const OTHERNAME *b) {
+  int result = -1;
+
+  if (!a || !b) {
+    return -1;
+  }
+  // Check their type first.
+  if ((result = OBJ_cmp(a->type_id, b->type_id)) != 0) {
+    return result;
+  }
+  // Check the value.
+  result = ASN1_TYPE_cmp(a->value, b->value);
+  return result;
 }
 
-/* Returns 0 if they are equal, != 0 otherwise. */
-int GENERAL_NAME_cmp(const GENERAL_NAME *a, const GENERAL_NAME *b)
-{
-    if (!a || !b || a->type != b->type)
-        return -1;
+// Returns 0 if they are equal, != 0 otherwise.
+int GENERAL_NAME_cmp(const GENERAL_NAME *a, const GENERAL_NAME *b) {
+  if (!a || !b || a->type != b->type) {
+    return -1;
+  }
 
-    switch (a->type) {
+  switch (a->type) {
     case GEN_X400:
-        return ASN1_STRING_cmp(a->d.x400Address, b->d.x400Address);
+      return ASN1_STRING_cmp(a->d.x400Address, b->d.x400Address);
 
     case GEN_EDIPARTY:
-        return edipartyname_cmp(a->d.ediPartyName, b->d.ediPartyName);
+      return edipartyname_cmp(a->d.ediPartyName, b->d.ediPartyName);
 
     case GEN_OTHERNAME:
-        return OTHERNAME_cmp(a->d.otherName, b->d.otherName);
+      return othername_cmp(a->d.otherName, b->d.otherName);
 
     case GEN_EMAIL:
     case GEN_DNS:
     case GEN_URI:
-        return ASN1_STRING_cmp(a->d.ia5, b->d.ia5);
+      return ASN1_STRING_cmp(a->d.ia5, b->d.ia5);
 
     case GEN_DIRNAME:
-        return X509_NAME_cmp(a->d.dirn, b->d.dirn);
+      return X509_NAME_cmp(a->d.dirn, b->d.dirn);
 
     case GEN_IPADD:
-        return ASN1_OCTET_STRING_cmp(a->d.ip, b->d.ip);
+      return ASN1_OCTET_STRING_cmp(a->d.ip, b->d.ip);
 
     case GEN_RID:
-        return OBJ_cmp(a->d.rid, b->d.rid);
-    }
+      return OBJ_cmp(a->d.rid, b->d.rid);
+  }
 
-    return -1;
+  return -1;
 }
 
-/* Returns 0 if they are equal, != 0 otherwise. */
-int OTHERNAME_cmp(OTHERNAME *a, OTHERNAME *b)
-{
-    int result = -1;
-
-    if (!a || !b)
-        return -1;
-    /* Check their type first. */
-    if ((result = OBJ_cmp(a->type_id, b->type_id)) != 0)
-        return result;
-    /* Check the value. */
-    result = ASN1_TYPE_cmp(a->value, b->value);
-    return result;
-}
-
-void GENERAL_NAME_set0_value(GENERAL_NAME *a, int type, void *value)
-{
-    switch (type) {
+void GENERAL_NAME_set0_value(GENERAL_NAME *a, int type, void *value) {
+  switch (type) {
     case GEN_X400:
-        a->d.x400Address = value;
-        break;
+      a->d.x400Address = value;
+      break;
 
     case GEN_EDIPARTY:
-        a->d.ediPartyName = value;
-        break;
+      a->d.ediPartyName = value;
+      break;
 
     case GEN_OTHERNAME:
-        a->d.otherName = value;
-        break;
+      a->d.otherName = value;
+      break;
 
     case GEN_EMAIL:
     case GEN_DNS:
     case GEN_URI:
-        a->d.ia5 = value;
-        break;
+      a->d.ia5 = value;
+      break;
 
     case GEN_DIRNAME:
-        a->d.dirn = value;
-        break;
+      a->d.dirn = value;
+      break;
 
     case GEN_IPADD:
-        a->d.ip = value;
-        break;
+      a->d.ip = value;
+      break;
 
     case GEN_RID:
-        a->d.rid = value;
-        break;
-    }
-    a->type = type;
+      a->d.rid = value;
+      break;
+  }
+  a->type = type;
 }
 
-void *GENERAL_NAME_get0_value(const GENERAL_NAME *a, int *ptype)
-{
-    if (ptype)
-        *ptype = a->type;
-    switch (a->type) {
+void *GENERAL_NAME_get0_value(const GENERAL_NAME *a, int *ptype) {
+  if (ptype) {
+    *ptype = a->type;
+  }
+  switch (a->type) {
     case GEN_X400:
-        return a->d.x400Address;
+      return a->d.x400Address;
 
     case GEN_EDIPARTY:
-        return a->d.ediPartyName;
+      return a->d.ediPartyName;
 
     case GEN_OTHERNAME:
-        return a->d.otherName;
+      return a->d.otherName;
 
     case GEN_EMAIL:
     case GEN_DNS:
     case GEN_URI:
-        return a->d.ia5;
+      return a->d.ia5;
 
     case GEN_DIRNAME:
-        return a->d.dirn;
+      return a->d.dirn;
 
     case GEN_IPADD:
-        return a->d.ip;
+      return a->d.ip;
 
     case GEN_RID:
-        return a->d.rid;
+      return a->d.rid;
 
     default:
-        return NULL;
-    }
+      return NULL;
+  }
 }
 
-int GENERAL_NAME_set0_othername(GENERAL_NAME *gen,
-                                ASN1_OBJECT *oid, ASN1_TYPE *value)
-{
-    OTHERNAME *oth;
-    oth = OTHERNAME_new();
-    if (!oth)
-        return 0;
-    ASN1_TYPE_free(oth->value);
-    oth->type_id = oid;
-    oth->value = value;
-    GENERAL_NAME_set0_value(gen, GEN_OTHERNAME, oth);
-    return 1;
+int GENERAL_NAME_set0_othername(GENERAL_NAME *gen, ASN1_OBJECT *oid,
+                                ASN1_TYPE *value) {
+  OTHERNAME *oth;
+  oth = OTHERNAME_new();
+  if (!oth) {
+    return 0;
+  }
+  ASN1_TYPE_free(oth->value);
+  oth->type_id = oid;
+  oth->value = value;
+  GENERAL_NAME_set0_value(gen, GEN_OTHERNAME, oth);
+  return 1;
 }
 
-int GENERAL_NAME_get0_otherName(const GENERAL_NAME *gen,
-                                ASN1_OBJECT **poid, ASN1_TYPE **pvalue)
-{
-    if (gen->type != GEN_OTHERNAME)
-        return 0;
-    if (poid)
-        *poid = gen->d.otherName->type_id;
-    if (pvalue)
-        *pvalue = gen->d.otherName->value;
-    return 1;
+int GENERAL_NAME_get0_otherName(const GENERAL_NAME *gen, ASN1_OBJECT **poid,
+                                ASN1_TYPE **pvalue) {
+  if (gen->type != GEN_OTHERNAME) {
+    return 0;
+  }
+  if (poid) {
+    *poid = gen->d.otherName->type_id;
+  }
+  if (pvalue) {
+    *pvalue = gen->d.otherName->value;
+  }
+  return 1;
 }

data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_ia5.c

@@ -1,4 +1,3 @@
-/* v3_ia5.c */
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
  * 1999.
@@ -70,10 +69,48 @@
 #include "../internal.h"
 
 
-static char *i2s_ASN1_IA5STRING(X509V3_EXT_METHOD *method,
-                                ASN1_IA5STRING *ia5);
-static ASN1_IA5STRING *s2i_ASN1_IA5STRING(X509V3_EXT_METHOD *method,
-                                          X509V3_CTX *ctx, char *str);
+static char *i2s_ASN1_IA5STRING(const X509V3_EXT_METHOD *method, void *ext) {
+  const ASN1_IA5STRING *ia5 = ext;
+  char *tmp;
+  if (!ia5 || !ia5->length) {
+    return NULL;
+  }
+  if (!(tmp = OPENSSL_malloc(ia5->length + 1))) {
+    return NULL;
+  }
+  OPENSSL_memcpy(tmp, ia5->data, ia5->length);
+  tmp[ia5->length] = 0;
+  return tmp;
+}
+
+static void *s2i_ASN1_IA5STRING(const X509V3_EXT_METHOD *method,
+                                const X509V3_CTX *ctx, const char *str) {
+  ASN1_IA5STRING *ia5;
+  if (!str) {
+    OPENSSL_PUT_ERROR(X509V3, X509V3_R_INVALID_NULL_ARGUMENT);
+    return NULL;
+  }
+  if (!(ia5 = ASN1_IA5STRING_new())) {
+    goto err;
+  }
+  if (!ASN1_STRING_set(ia5, str, strlen(str))) {
+    ASN1_IA5STRING_free(ia5);
+    goto err;
+  }
+  return ia5;
+err:
+  return NULL;
+}
+
+#define EXT_IA5STRING(nid)                                                 \
+  {                                                                        \
+    nid, 0, ASN1_ITEM_ref(ASN1_IA5STRING), 0, 0, 0, 0, i2s_ASN1_IA5STRING, \
+        s2i_ASN1_IA5STRING, 0, 0, 0, 0, NULL                               \
+  }
+
+#define EXT_END \
+  { -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
+
 const X509V3_EXT_METHOD v3_ns_ia5_list[] = {
     EXT_IA5STRING(NID_netscape_base_url),
     EXT_IA5STRING(NID_netscape_revocation_url),
@@ -82,40 +119,4 @@ const X509V3_EXT_METHOD v3_ns_ia5_list[] = {
     EXT_IA5STRING(NID_netscape_ca_policy_url),
     EXT_IA5STRING(NID_netscape_ssl_server_name),
     EXT_IA5STRING(NID_netscape_comment),
-    EXT_END
-};
-
-static char *i2s_ASN1_IA5STRING(X509V3_EXT_METHOD *method,
-                                ASN1_IA5STRING *ia5)
-{
-    char *tmp;
-    if (!ia5 || !ia5->length)
-        return NULL;
-    if (!(tmp = OPENSSL_malloc(ia5->length + 1))) {
-        OPENSSL_PUT_ERROR(X509V3, ERR_R_MALLOC_FAILURE);
-        return NULL;
-    }
-    OPENSSL_memcpy(tmp, ia5->data, ia5->length);
-    tmp[ia5->length] = 0;
-    return tmp;
-}
-
-static ASN1_IA5STRING *s2i_ASN1_IA5STRING(X509V3_EXT_METHOD *method,
-                                          X509V3_CTX *ctx, char *str)
-{
-    ASN1_IA5STRING *ia5;
-    if (!str) {
-        OPENSSL_PUT_ERROR(X509V3, X509V3_R_INVALID_NULL_ARGUMENT);
-        return NULL;
-    }
-    if (!(ia5 = ASN1_IA5STRING_new()))
-        goto err;
-    if (!ASN1_STRING_set(ia5, str, strlen(str))) {
-        ASN1_IA5STRING_free(ia5);
-        goto err;
-    }
-    return ia5;
- err:
-    OPENSSL_PUT_ERROR(X509V3, ERR_R_MALLOC_FAILURE);
-    return NULL;
-}
+    EXT_END};