grpc 1.69.0 → 1.70.1

data/third_party/boringssl-with-bazel/src/crypto/x509/{x_crl.c → x_crl.cc}

@@ -121,8 +121,8 @@ static int crl_parse_entry_extensions(X509_CRL *crl) {
     X509_REVOKED *rev = sk_X509_REVOKED_value(revoked, i);
 
     int crit;
-    ASN1_ENUMERATED *reason =
-        X509_REVOKED_get_ext_d2i(rev, NID_crl_reason, &crit, NULL);
+    ASN1_ENUMERATED *reason = reinterpret_cast<ASN1_ENUMERATED *>(
+        X509_REVOKED_get_ext_d2i(rev, NID_crl_reason, &crit, NULL));
     if (!reason && crit != -1) {
       crl->flags |= EXFLAG_INVALID;
       return 1;
@@ -188,8 +188,8 @@ static int crl_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
         return 0;
       }
 
-      crl->idp =
-          X509_CRL_get_ext_d2i(crl, NID_issuing_distribution_point, &i, NULL);
+      crl->idp = reinterpret_cast<ISSUING_DIST_POINT *>(
+          X509_CRL_get_ext_d2i(crl, NID_issuing_distribution_point, &i, NULL));
       if (crl->idp != NULL) {
         if (!setup_idp(crl, crl->idp)) {
           return 0;
@@ -198,8 +198,8 @@ static int crl_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
         return 0;
       }
 
-      crl->akid =
-          X509_CRL_get_ext_d2i(crl, NID_authority_key_identifier, &i, NULL);
+      crl->akid = reinterpret_cast<AUTHORITY_KEYID *>(
+          X509_CRL_get_ext_d2i(crl, NID_authority_key_identifier, &i, NULL));
       if (crl->akid == NULL && i != -1) {
         return 0;
       }

data/third_party/boringssl-with-bazel/src/crypto/x509/{x_name.c → x_name.cc}

@@ -65,6 +65,7 @@
 #include <openssl/obj.h>
 #include <openssl/stack.h>
 #include <openssl/x509.h>
+#include <cstdint>
 
 #include "../asn1/internal.h"
 #include "../internal.h"
@@ -134,7 +135,7 @@ IMPLEMENT_ASN1_DUP_FUNCTION(X509_NAME)
 
 static int x509_name_ex_new(ASN1_VALUE **val, const ASN1_ITEM *it) {
   X509_NAME *ret = NULL;
-  ret = OPENSSL_malloc(sizeof(X509_NAME));
+  ret = reinterpret_cast<X509_NAME *>(OPENSSL_malloc(sizeof(X509_NAME)));
   if (!ret) {
     goto memerr;
   }
@@ -276,43 +277,49 @@ static int x509_name_encode(X509_NAME *a) {
   size_t i;
   STACK_OF(STACK_OF_X509_NAME_ENTRY) *intname =
       sk_STACK_OF_X509_NAME_ENTRY_new_null();
-  if (!intname) {
-    goto err;
-  }
-  for (i = 0; i < sk_X509_NAME_ENTRY_num(a->entries); i++) {
-    entry = sk_X509_NAME_ENTRY_value(a->entries, i);
-    if (entry->set != set) {
-      entries = sk_X509_NAME_ENTRY_new_null();
-      if (!entries) {
-        goto err;
+
+  {
+    if (!intname) {
+      goto err;
+    }
+    for (i = 0; i < sk_X509_NAME_ENTRY_num(a->entries); i++) {
+      entry = sk_X509_NAME_ENTRY_value(a->entries, i);
+      if (entry->set != set) {
+        entries = sk_X509_NAME_ENTRY_new_null();
+        if (!entries) {
+          goto err;
+        }
+        if (!sk_STACK_OF_X509_NAME_ENTRY_push(intname, entries)) {
+          sk_X509_NAME_ENTRY_free(entries);
+          goto err;
+        }
+        set = entry->set;
       }
-      if (!sk_STACK_OF_X509_NAME_ENTRY_push(intname, entries)) {
-        sk_X509_NAME_ENTRY_free(entries);
+      if (!sk_X509_NAME_ENTRY_push(entries, entry)) {
         goto err;
       }
-      set = entry->set;
     }
-    if (!sk_X509_NAME_ENTRY_push(entries, entry)) {
+    ASN1_VALUE *intname_val = (ASN1_VALUE *)intname;
+    len =
+        ASN1_item_ex_i2d(&intname_val, NULL, ASN1_ITEM_rptr(X509_NAME_INTERNAL),
+                         /*tag=*/-1, /*aclass=*/0);
+    if (len <= 0) {
+      goto err;
+    }
+    if (!BUF_MEM_grow(a->bytes, len)) {
       goto err;
     }
+    p = (unsigned char *)a->bytes->data;
+    if (ASN1_item_ex_i2d(&intname_val, &p, ASN1_ITEM_rptr(X509_NAME_INTERNAL),
+                         /*tag=*/-1, /*aclass=*/0) <= 0) {
+      goto err;
+    }
+    sk_STACK_OF_X509_NAME_ENTRY_pop_free(intname,
+                                         local_sk_X509_NAME_ENTRY_free);
+    a->modified = 0;
+    return 1;
   }
-  ASN1_VALUE *intname_val = (ASN1_VALUE *)intname;
-  len = ASN1_item_ex_i2d(&intname_val, NULL, ASN1_ITEM_rptr(X509_NAME_INTERNAL),
-                         /*tag=*/-1, /*aclass=*/0);
-  if (len <= 0) {
-    goto err;
-  }
-  if (!BUF_MEM_grow(a->bytes, len)) {
-    goto err;
-  }
-  p = (unsigned char *)a->bytes->data;
-  if (ASN1_item_ex_i2d(&intname_val, &p, ASN1_ITEM_rptr(X509_NAME_INTERNAL),
-                       /*tag=*/-1, /*aclass=*/0) <= 0) {
-    goto err;
-  }
-  sk_STACK_OF_X509_NAME_ENTRY_pop_free(intname, local_sk_X509_NAME_ENTRY_free);
-  a->modified = 0;
-  return 1;
+
 err:
   sk_STACK_OF_X509_NAME_ENTRY_pop_free(intname, local_sk_X509_NAME_ENTRY_free);
   return 0;
@@ -383,7 +390,7 @@ static int x509_name_canon(X509_NAME *a) {
   }
   a->canon_enclen = len;
 
-  p = OPENSSL_malloc(a->canon_enclen);
+  p = reinterpret_cast<uint8_t *>(OPENSSL_malloc(a->canon_enclen));
 
   if (!p) {
     goto err;

data/third_party/boringssl-with-bazel/src/crypto/x509/{x_pubkey.c → x_pubkey.cc}

@@ -77,13 +77,14 @@ static void x509_pubkey_changed(X509_PUBKEY *pub) {
   // Re-encode the |X509_PUBKEY| to DER and parse it with EVP's APIs.
   uint8_t *spki = NULL;
   int spki_len = i2d_X509_PUBKEY(pub, &spki);
+  EVP_PKEY *pkey;
   if (spki_len < 0) {
     goto err;
   }
 
   CBS cbs;
   CBS_init(&cbs, spki, (size_t)spki_len);
-  EVP_PKEY *pkey = EVP_parse_public_key(&cbs);
+  pkey = EVP_parse_public_key(&cbs);
   if (pkey == NULL || CBS_len(&cbs) != 0) {
     EVP_PKEY_free(pkey);
     goto err;
@@ -126,6 +127,7 @@ int X509_PUBKEY_set(X509_PUBKEY **x, EVP_PKEY *pkey) {
   }
 
   CBB cbb;
+  const uint8_t *p;
   if (!CBB_init(&cbb, 0) ||  //
       !EVP_marshal_public_key(&cbb, pkey) ||
       !CBB_finish(&cbb, &spki, &spki_len) ||  //
@@ -135,7 +137,7 @@ int X509_PUBKEY_set(X509_PUBKEY **x, EVP_PKEY *pkey) {
     goto error;
   }
 
-  const uint8_t *p = spki;
+  p = spki;
   pk = d2i_X509_PUBKEY(NULL, &p, (long)spki_len);
   if (pk == NULL || p != spki + spki_len) {
     OPENSSL_PUT_ERROR(X509, X509_R_PUBLIC_KEY_DECODE_ERROR);

data/third_party/boringssl-with-bazel/src/crypto/x509/{x_x509.c → x_x509.cc}

@@ -91,7 +91,7 @@ IMPLEMENT_ASN1_FUNCTIONS(X509_CINF)
 // x509_new_null returns a new |X509| object where the |cert_info|, |sig_alg|,
 // and |signature| fields are not yet filled in.
 static X509 *x509_new_null(void) {
-  X509 *ret = OPENSSL_zalloc(sizeof(X509));
+  X509 *ret = reinterpret_cast<X509 *>(OPENSSL_zalloc(sizeof(X509)));
   if (ret == NULL) {
     return NULL;
   }
@@ -177,56 +177,59 @@ static X509 *x509_parse(CBS *cbs, CRYPTO_BUFFER *buf) {
     return NULL;
   }
 
-  // TODO(crbug.com/boringssl/443): When the rest of the library is decoupled
-  // from the tasn_*.c implementation, replace this with |CBS|-based functions.
-  const uint8_t *inp = CBS_data(&tbs);
-  if (ASN1_item_ex_d2i((ASN1_VALUE **)&ret->cert_info, &inp, CBS_len(&tbs),
-                       ASN1_ITEM_rptr(X509_CINF), /*tag=*/-1,
-                       /*aclass=*/0, /*opt=*/0, buf) <= 0 ||
-      inp != CBS_data(&tbs) + CBS_len(&tbs)) {
-    goto err;
-  }
+  {
+    // TODO(crbug.com/boringssl/443): When the rest of the library is decoupled
+    // from the tasn_*.c implementation, replace this with |CBS|-based
+    // functions.
+    const uint8_t *inp = CBS_data(&tbs);
+    if (ASN1_item_ex_d2i((ASN1_VALUE **)&ret->cert_info, &inp, CBS_len(&tbs),
+                         ASN1_ITEM_rptr(X509_CINF), /*tag=*/-1,
+                         /*aclass=*/0, /*opt=*/0, buf) <= 0 ||
+        inp != CBS_data(&tbs) + CBS_len(&tbs)) {
+      goto err;
+    }
 
-  inp = CBS_data(&sigalg);
-  ret->sig_alg = d2i_X509_ALGOR(NULL, &inp, CBS_len(&sigalg));
-  if (ret->sig_alg == NULL || inp != CBS_data(&sigalg) + CBS_len(&sigalg)) {
-    goto err;
-  }
+    inp = CBS_data(&sigalg);
+    ret->sig_alg = d2i_X509_ALGOR(NULL, &inp, CBS_len(&sigalg));
+    if (ret->sig_alg == NULL || inp != CBS_data(&sigalg) + CBS_len(&sigalg)) {
+      goto err;
+    }
 
-  inp = CBS_data(&sig);
-  ret->signature = c2i_ASN1_BIT_STRING(NULL, &inp, CBS_len(&sig));
-  if (ret->signature == NULL || inp != CBS_data(&sig) + CBS_len(&sig)) {
-    goto err;
-  }
+    inp = CBS_data(&sig);
+    ret->signature = c2i_ASN1_BIT_STRING(NULL, &inp, CBS_len(&sig));
+    if (ret->signature == NULL || inp != CBS_data(&sig) + CBS_len(&sig)) {
+      goto err;
+    }
+
+    // The version must be one of v1(0), v2(1), or v3(2).
+    long version = X509_VERSION_1;
+    if (ret->cert_info->version != NULL) {
+      version = ASN1_INTEGER_get(ret->cert_info->version);
+      // TODO(https://crbug.com/boringssl/364): |X509_VERSION_1| should
+      // also be rejected here. This means an explicitly-encoded X.509v1
+      // version. v1 is DEFAULT, so DER requires it be omitted.
+      if (version < X509_VERSION_1 || version > X509_VERSION_3) {
+        OPENSSL_PUT_ERROR(X509, X509_R_INVALID_VERSION);
+        goto err;
+      }
+    }
 
-  // The version must be one of v1(0), v2(1), or v3(2).
-  long version = X509_VERSION_1;
-  if (ret->cert_info->version != NULL) {
-    version = ASN1_INTEGER_get(ret->cert_info->version);
-    // TODO(https://crbug.com/boringssl/364): |X509_VERSION_1| should
-    // also be rejected here. This means an explicitly-encoded X.509v1
-    // version. v1 is DEFAULT, so DER requires it be omitted.
-    if (version < X509_VERSION_1 || version > X509_VERSION_3) {
-      OPENSSL_PUT_ERROR(X509, X509_R_INVALID_VERSION);
+    // Per RFC 5280, section 4.1.2.8, these fields require v2 or v3.
+    if (version == X509_VERSION_1 && (ret->cert_info->issuerUID != NULL ||
+                                      ret->cert_info->subjectUID != NULL)) {
+      OPENSSL_PUT_ERROR(X509, X509_R_INVALID_FIELD_FOR_VERSION);
       goto err;
     }
-  }
 
-  // Per RFC 5280, section 4.1.2.8, these fields require v2 or v3.
-  if (version == X509_VERSION_1 && (ret->cert_info->issuerUID != NULL ||
-                                    ret->cert_info->subjectUID != NULL)) {
-    OPENSSL_PUT_ERROR(X509, X509_R_INVALID_FIELD_FOR_VERSION);
-    goto err;
-  }
+    // Per RFC 5280, section 4.1.2.9, extensions require v3.
+    if (version != X509_VERSION_3 && ret->cert_info->extensions != NULL) {
+      OPENSSL_PUT_ERROR(X509, X509_R_INVALID_FIELD_FOR_VERSION);
+      goto err;
+    }
 
-  // Per RFC 5280, section 4.1.2.9, extensions require v3.
-  if (version != X509_VERSION_3 && ret->cert_info->extensions != NULL) {
-    OPENSSL_PUT_ERROR(X509, X509_R_INVALID_FIELD_FOR_VERSION);
-    goto err;
+    return ret;
   }
 
-  return ret;
-
 err:
   X509_free(ret);
   return NULL;
@@ -263,6 +266,7 @@ int i2d_X509(X509 *x509, uint8_t **outp) {
   }
 
   CBB cbb, cert;
+  int len;
   if (!CBB_init(&cbb, 64) ||  //
       !CBB_add_asn1(&cbb, &cert, CBS_ASN1_SEQUENCE)) {
     goto err;
@@ -271,7 +275,7 @@ int i2d_X509(X509 *x509, uint8_t **outp) {
   // TODO(crbug.com/boringssl/443): When the rest of the library is decoupled
   // from the tasn_*.c implementation, replace this with |CBS|-based functions.
   uint8_t *out;
-  int len = i2d_X509_CINF(x509->cert_info, NULL);
+  len = i2d_X509_CINF(x509->cert_info, NULL);
   if (len < 0 ||  //
       !CBB_add_space(&cert, &out, (size_t)len) ||
       i2d_X509_CINF(x509->cert_info, &out) != len) {
@@ -481,7 +485,7 @@ int i2d_X509_AUX(X509 *a, unsigned char **pp) {
   }
 
   // Allocate requisite combined storage
-  *pp = tmp = OPENSSL_malloc(length);
+  *pp = tmp = reinterpret_cast<uint8_t *>(OPENSSL_malloc(length));
   if (tmp == NULL) {
     return -1;  // Push error onto error stack?
   }

data/third_party/boringssl-with-bazel/src/crypto/x509/{x_x509a.c → x_x509a.cc}

@@ -151,11 +151,12 @@ const uint8_t *X509_keyid_get0(const X509 *x, int *out_len) {
 }
 
 int X509_add1_trust_object(X509 *x, const ASN1_OBJECT *obj) {
+  X509_CERT_AUX *aux;
   ASN1_OBJECT *objtmp = OBJ_dup(obj);
   if (objtmp == NULL) {
     goto err;
   }
-  X509_CERT_AUX *aux = aux_get(x);
+  aux = aux_get(x);
   if (aux->trust == NULL) {
     aux->trust = sk_ASN1_OBJECT_new_null();
     if (aux->trust == NULL) {
@@ -173,11 +174,12 @@ err:
 }
 
 int X509_add1_reject_object(X509 *x, const ASN1_OBJECT *obj) {
+  X509_CERT_AUX *aux;
   ASN1_OBJECT *objtmp = OBJ_dup(obj);
   if (objtmp == NULL) {
     goto err;
   }
-  X509_CERT_AUX *aux = aux_get(x);
+  aux = aux_get(x);
   if (aux->reject == NULL) {
     aux->reject = sk_ASN1_OBJECT_new_null();
     if (aux->reject == NULL) {