grpc 1.53.1 → 1.54.0

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

@@ -1,4 +1,3 @@
-/* v3_akey.c */
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
  * 1999.
@@ -69,158 +68,154 @@
 #include "internal.h"
 
 
-static STACK_OF(CONF_VALUE) *i2v_AUTHORITY_KEYID(X509V3_EXT_METHOD *method,
-                                                 AUTHORITY_KEYID *akeyid,
-                                                 STACK_OF(CONF_VALUE)
-                                                 *extlist);
-static AUTHORITY_KEYID *v2i_AUTHORITY_KEYID(X509V3_EXT_METHOD *method,
-                                            X509V3_CTX *ctx,
-                                            STACK_OF(CONF_VALUE) *values);
+static STACK_OF(CONF_VALUE) *i2v_AUTHORITY_KEYID(
+    const X509V3_EXT_METHOD *method, void *ext, STACK_OF(CONF_VALUE) *extlist);
+static void *v2i_AUTHORITY_KEYID(const X509V3_EXT_METHOD *method,
+                                 const X509V3_CTX *ctx,
+                                 const STACK_OF(CONF_VALUE) *values);
 
 const X509V3_EXT_METHOD v3_akey_id = {
     NID_authority_key_identifier,
-    X509V3_EXT_MULTILINE, ASN1_ITEM_ref(AUTHORITY_KEYID),
-    0, 0, 0, 0,
-    0, 0,
-    (X509V3_EXT_I2V) i2v_AUTHORITY_KEYID,
-    (X509V3_EXT_V2I)v2i_AUTHORITY_KEYID,
-    0, 0,
-    NULL
+    X509V3_EXT_MULTILINE,
+    ASN1_ITEM_ref(AUTHORITY_KEYID),
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    i2v_AUTHORITY_KEYID,
+    v2i_AUTHORITY_KEYID,
+    0,
+    0,
+    NULL,
 };
 
-static STACK_OF(CONF_VALUE) *i2v_AUTHORITY_KEYID(X509V3_EXT_METHOD *method,
-                                                 AUTHORITY_KEYID *akeyid,
-                                                 STACK_OF(CONF_VALUE)
-                                                 *extlist)
-{
-    char *tmp = NULL;
-    int extlist_was_null = extlist == NULL;
-    if (akeyid->keyid) {
-        tmp = x509v3_bytes_to_hex(akeyid->keyid->data, akeyid->keyid->length);
-        int ok = tmp != NULL && X509V3_add_value("keyid", tmp, &extlist);
-        OPENSSL_free(tmp);
-        if (!ok) {
-            goto err;
-        }
+static STACK_OF(CONF_VALUE) *i2v_AUTHORITY_KEYID(
+    const X509V3_EXT_METHOD *method, void *ext, STACK_OF(CONF_VALUE) *extlist) {
+  const AUTHORITY_KEYID *akeyid = ext;
+  int extlist_was_null = extlist == NULL;
+  if (akeyid->keyid) {
+    char *tmp = x509v3_bytes_to_hex(akeyid->keyid->data, akeyid->keyid->length);
+    int ok = tmp != NULL && X509V3_add_value("keyid", tmp, &extlist);
+    OPENSSL_free(tmp);
+    if (!ok) {
+      goto err;
     }
-    if (akeyid->issuer) {
-        STACK_OF(CONF_VALUE) *tmpextlist =
-            i2v_GENERAL_NAMES(NULL, akeyid->issuer, extlist);
-        if (tmpextlist == NULL) {
-            goto err;
-        }
-        extlist = tmpextlist;
+  }
+  if (akeyid->issuer) {
+    STACK_OF(CONF_VALUE) *tmpextlist =
+        i2v_GENERAL_NAMES(NULL, akeyid->issuer, extlist);
+    if (tmpextlist == NULL) {
+      goto err;
     }
-    if (akeyid->serial) {
-        tmp = x509v3_bytes_to_hex(akeyid->serial->data, akeyid->serial->length);
-        int ok = tmp != NULL && X509V3_add_value("serial", tmp, &extlist);
-        OPENSSL_free(tmp);
-        if (!ok) {
-            goto err;
-        }
+    extlist = tmpextlist;
+  }
+  if (akeyid->serial) {
+    if (!X509V3_add_value_int("serial", akeyid->serial, &extlist)) {
+      goto err;
     }
-    return extlist;
+  }
+  return extlist;
 
 err:
-    if (extlist_was_null) {
-        sk_CONF_VALUE_pop_free(extlist, X509V3_conf_free);
-    }
-    return NULL;
+  if (extlist_was_null) {
+    sk_CONF_VALUE_pop_free(extlist, X509V3_conf_free);
+  }
+  return NULL;
 }
 
-/*
- * Currently two options: keyid: use the issuers subject keyid, the value
- * 'always' means its is an error if the issuer certificate doesn't have a
- * key id. issuer: use the issuers cert issuer and serial number. The default
- * is to only use this if keyid is not present. With the option 'always' this
- * is always included.
- */
-
-static AUTHORITY_KEYID *v2i_AUTHORITY_KEYID(X509V3_EXT_METHOD *method,
-                                            X509V3_CTX *ctx,
-                                            STACK_OF(CONF_VALUE) *values)
-{
-    char keyid = 0, issuer = 0;
-    size_t i;
-    int j;
-    CONF_VALUE *cnf;
-    ASN1_OCTET_STRING *ikeyid = NULL;
-    X509_NAME *isname = NULL;
-    GENERAL_NAMES *gens = NULL;
-    GENERAL_NAME *gen = NULL;
-    ASN1_INTEGER *serial = NULL;
-    X509_EXTENSION *ext;
-    X509 *cert;
-    AUTHORITY_KEYID *akeyid;
-
-    for (i = 0; i < sk_CONF_VALUE_num(values); i++) {
-        cnf = sk_CONF_VALUE_value(values, i);
-        if (!strcmp(cnf->name, "keyid")) {
-            keyid = 1;
-            if (cnf->value && !strcmp(cnf->value, "always"))
-                keyid = 2;
-        } else if (!strcmp(cnf->name, "issuer")) {
-            issuer = 1;
-            if (cnf->value && !strcmp(cnf->value, "always"))
-                issuer = 2;
-        } else {
-            OPENSSL_PUT_ERROR(X509V3, X509V3_R_UNKNOWN_OPTION);
-            ERR_add_error_data(2, "name=", cnf->name);
-            return NULL;
-        }
+// Currently two options: keyid: use the issuers subject keyid, the value
+// 'always' means its is an error if the issuer certificate doesn't have a
+// key id. issuer: use the issuers cert issuer and serial number. The default
+// is to only use this if keyid is not present. With the option 'always' this
+// is always included.
+
+static void *v2i_AUTHORITY_KEYID(const X509V3_EXT_METHOD *method,
+                                 const X509V3_CTX *ctx,
+                                 const STACK_OF(CONF_VALUE) *values) {
+  char keyid = 0, issuer = 0;
+  int j;
+  ASN1_OCTET_STRING *ikeyid = NULL;
+  X509_NAME *isname = NULL;
+  GENERAL_NAMES *gens = NULL;
+  GENERAL_NAME *gen = NULL;
+  ASN1_INTEGER *serial = NULL;
+  const X509 *cert;
+  AUTHORITY_KEYID *akeyid;
+
+  for (size_t i = 0; i < sk_CONF_VALUE_num(values); i++) {
+    const CONF_VALUE *cnf = sk_CONF_VALUE_value(values, i);
+    if (!strcmp(cnf->name, "keyid")) {
+      keyid = 1;
+      if (cnf->value && !strcmp(cnf->value, "always")) {
+        keyid = 2;
+      }
+    } else if (!strcmp(cnf->name, "issuer")) {
+      issuer = 1;
+      if (cnf->value && !strcmp(cnf->value, "always")) {
+        issuer = 2;
+      }
+    } else {
+      OPENSSL_PUT_ERROR(X509V3, X509V3_R_UNKNOWN_OPTION);
+      ERR_add_error_data(2, "name=", cnf->name);
+      return NULL;
     }
+  }
 
-    if (!ctx || !ctx->issuer_cert) {
-        if (ctx && (ctx->flags == CTX_TEST))
-            return AUTHORITY_KEYID_new();
-        OPENSSL_PUT_ERROR(X509V3, X509V3_R_NO_ISSUER_CERTIFICATE);
-        return NULL;
+  if (!ctx || !ctx->issuer_cert) {
+    if (ctx && (ctx->flags == X509V3_CTX_TEST)) {
+      return AUTHORITY_KEYID_new();
     }
+    OPENSSL_PUT_ERROR(X509V3, X509V3_R_NO_ISSUER_CERTIFICATE);
+    return NULL;
+  }
 
-    cert = ctx->issuer_cert;
+  cert = ctx->issuer_cert;
 
-    if (keyid) {
-        j = X509_get_ext_by_NID(cert, NID_subject_key_identifier, -1);
-        if ((j >= 0) && (ext = X509_get_ext(cert, j)))
-            ikeyid = X509V3_EXT_d2i(ext);
-        if (keyid == 2 && !ikeyid) {
-            OPENSSL_PUT_ERROR(X509V3, X509V3_R_UNABLE_TO_GET_ISSUER_KEYID);
-            return NULL;
-        }
+  if (keyid) {
+    j = X509_get_ext_by_NID(cert, NID_subject_key_identifier, -1);
+    const X509_EXTENSION *ext;
+    if ((j >= 0) && (ext = X509_get_ext(cert, j))) {
+      ikeyid = X509V3_EXT_d2i(ext);
     }
-
-    if ((issuer && !ikeyid) || (issuer == 2)) {
-        isname = X509_NAME_dup(X509_get_issuer_name(cert));
-        serial = ASN1_INTEGER_dup(X509_get_serialNumber(cert));
-        if (!isname || !serial) {
-            OPENSSL_PUT_ERROR(X509V3, X509V3_R_UNABLE_TO_GET_ISSUER_DETAILS);
-            goto err;
-        }
+    if (keyid == 2 && !ikeyid) {
+      OPENSSL_PUT_ERROR(X509V3, X509V3_R_UNABLE_TO_GET_ISSUER_KEYID);
+      return NULL;
+    }
+  }
+
+  if ((issuer && !ikeyid) || (issuer == 2)) {
+    isname = X509_NAME_dup(X509_get_issuer_name(cert));
+    serial = ASN1_INTEGER_dup(X509_get0_serialNumber(cert));
+    if (!isname || !serial) {
+      OPENSSL_PUT_ERROR(X509V3, X509V3_R_UNABLE_TO_GET_ISSUER_DETAILS);
+      goto err;
     }
+  }
+
+  if (!(akeyid = AUTHORITY_KEYID_new())) {
+    goto err;
+  }
 
-    if (!(akeyid = AUTHORITY_KEYID_new()))
-        goto err;
-
-    if (isname) {
-        if (!(gens = sk_GENERAL_NAME_new_null())
-            || !(gen = GENERAL_NAME_new())
-            || !sk_GENERAL_NAME_push(gens, gen)) {
-            OPENSSL_PUT_ERROR(X509V3, ERR_R_MALLOC_FAILURE);
-            goto err;
-        }
-        gen->type = GEN_DIRNAME;
-        gen->d.dirn = isname;
+  if (isname) {
+    if (!(gens = sk_GENERAL_NAME_new_null()) || !(gen = GENERAL_NAME_new()) ||
+        !sk_GENERAL_NAME_push(gens, gen)) {
+      goto err;
     }
+    gen->type = GEN_DIRNAME;
+    gen->d.dirn = isname;
+  }
 
-    akeyid->issuer = gens;
-    akeyid->serial = serial;
-    akeyid->keyid = ikeyid;
+  akeyid->issuer = gens;
+  akeyid->serial = serial;
+  akeyid->keyid = ikeyid;
 
-    return akeyid;
+  return akeyid;
 
- err:
-    X509_NAME_free(isname);
-    ASN1_INTEGER_free(serial);
-    ASN1_OCTET_STRING_free(ikeyid);
-    return NULL;
+err:
+  X509_NAME_free(isname);
+  ASN1_INTEGER_free(serial);
+  ASN1_OCTET_STRING_free(ikeyid);
+  return NULL;
 }

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

@@ -1,4 +1,3 @@
-/* v3_akey_asn1.c */
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
  * 1999.
@@ -64,9 +63,9 @@
 
 
 ASN1_SEQUENCE(AUTHORITY_KEYID) = {
-        ASN1_IMP_OPT(AUTHORITY_KEYID, keyid, ASN1_OCTET_STRING, 0),
-        ASN1_IMP_SEQUENCE_OF_OPT(AUTHORITY_KEYID, issuer, GENERAL_NAME, 1),
-        ASN1_IMP_OPT(AUTHORITY_KEYID, serial, ASN1_INTEGER, 2)
+    ASN1_IMP_OPT(AUTHORITY_KEYID, keyid, ASN1_OCTET_STRING, 0),
+    ASN1_IMP_SEQUENCE_OF_OPT(AUTHORITY_KEYID, issuer, GENERAL_NAME, 1),
+    ASN1_IMP_OPT(AUTHORITY_KEYID, serial, ASN1_INTEGER, 2),
 } ASN1_SEQUENCE_END(AUTHORITY_KEYID)
 
 IMPLEMENT_ASN1_FUNCTIONS(AUTHORITY_KEYID)