grpc 1.69.0 → 1.70.1

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

@@ -1,5 +1,5 @@
-/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
- * project 2006.
+/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
+ * 2006.
  */
 /* ====================================================================
  * Copyright (c) 2006 The OpenSSL Project.  All rights reserved.
@@ -89,8 +89,7 @@ IMPLEMENT_ASN1_FUNCTIONS_const(RSA_PSS_PARAMS)
 
 // Given an MGF1 Algorithm ID decode to an Algorithm Identifier
 static X509_ALGOR *rsa_mgf1_decode(const X509_ALGOR *alg) {
-  if (OBJ_obj2nid(alg->algorithm) != NID_mgf1 ||
-      alg->parameter == NULL ||
+  if (OBJ_obj2nid(alg->algorithm) != NID_mgf1 || alg->parameter == NULL ||
       alg->parameter->type != V_ASN1_SEQUENCE) {
     return NULL;
   }
@@ -241,7 +240,8 @@ int x509_rsa_ctx_to_pss(EVP_MD_CTX *ctx, X509_ALGOR *algor) {
     goto err;
   }
 
-  if (!X509_ALGOR_set0(algor, OBJ_nid2obj(NID_rsassaPss), V_ASN1_SEQUENCE, os)) {
+  if (!X509_ALGOR_set0(algor, OBJ_nid2obj(NID_rsassaPss), V_ASN1_SEQUENCE,
+                       os)) {
     goto err;
   }
   os = NULL;
@@ -260,51 +260,55 @@ int x509_rsa_pss_to_ctx(EVP_MD_CTX *ctx, const X509_ALGOR *sigalg,
   // Decode PSS parameters
   int ret = 0;
   RSA_PSS_PARAMS *pss = rsa_pss_decode(sigalg);
-  if (pss == NULL) {
-    OPENSSL_PUT_ERROR(X509, X509_R_INVALID_PSS_PARAMETERS);
-    goto err;
-  }
 
-  const EVP_MD *mgf1md = rsa_mgf1_to_md(pss->maskGenAlgorithm);
-  const EVP_MD *md = rsa_algor_to_md(pss->hashAlgorithm);
-  if (mgf1md == NULL || md == NULL) {
-    goto err;
-  }
+  {
+    if (pss == NULL) {
+      OPENSSL_PUT_ERROR(X509, X509_R_INVALID_PSS_PARAMETERS);
+      goto err;
+    }
 
-  // We require the MGF-1 and signing hashes to match.
-  if (mgf1md != md) {
-    OPENSSL_PUT_ERROR(X509, X509_R_INVALID_PSS_PARAMETERS);
-    goto err;
-  }
+    const EVP_MD *mgf1md = rsa_mgf1_to_md(pss->maskGenAlgorithm);
+    const EVP_MD *md = rsa_algor_to_md(pss->hashAlgorithm);
+    if (mgf1md == NULL || md == NULL) {
+      goto err;
+    }
 
-  // We require the salt length be the hash length. The DEFAULT value is 20, but
-  // this does not match any supported salt length.
-  uint64_t salt_len = 0;
-  if (pss->saltLength == NULL ||
-      !ASN1_INTEGER_get_uint64(&salt_len, pss->saltLength) ||
-      salt_len != EVP_MD_size(md)) {
-    OPENSSL_PUT_ERROR(X509, X509_R_INVALID_PSS_PARAMETERS);
-    goto err;
-  }
-  assert(salt_len <= INT_MAX);
+    // We require the MGF-1 and signing hashes to match.
+    if (mgf1md != md) {
+      OPENSSL_PUT_ERROR(X509, X509_R_INVALID_PSS_PARAMETERS);
+      goto err;
+    }
 
-  // The trailer field must be 1 (0xbc). This value is DEFAULT, so the structure
-  // is required to omit it in DER. Although a syntax error, we also tolerate an
-  // explicitly-encoded value. See the certificates in cl/362617931.
-  if (pss->trailerField != NULL && ASN1_INTEGER_get(pss->trailerField) != 1) {
-    OPENSSL_PUT_ERROR(X509, X509_R_INVALID_PSS_PARAMETERS);
-    goto err;
-  }
+    // We require the salt length be the hash length. The DEFAULT value is 20,
+    // but this does not match any supported salt length.
+    uint64_t salt_len = 0;
+    if (pss->saltLength == NULL ||
+        !ASN1_INTEGER_get_uint64(&salt_len, pss->saltLength) ||
+        salt_len != EVP_MD_size(md)) {
+      OPENSSL_PUT_ERROR(X509, X509_R_INVALID_PSS_PARAMETERS);
+      goto err;
+    }
+    assert(salt_len <= INT_MAX);
+
+    // The trailer field must be 1 (0xbc). This value is DEFAULT, so the
+    // structure is required to omit it in DER. Although a syntax error, we also
+    // tolerate an explicitly-encoded value. See the certificates in
+    // cl/362617931.
+    if (pss->trailerField != NULL && ASN1_INTEGER_get(pss->trailerField) != 1) {
+      OPENSSL_PUT_ERROR(X509, X509_R_INVALID_PSS_PARAMETERS);
+      goto err;
+    }
 
-  EVP_PKEY_CTX *pctx;
-  if (!EVP_DigestVerifyInit(ctx, &pctx, md, NULL, pkey) ||
-      !EVP_PKEY_CTX_set_rsa_padding(pctx, RSA_PKCS1_PSS_PADDING) ||
-      !EVP_PKEY_CTX_set_rsa_pss_saltlen(pctx, (int)salt_len) ||
-      !EVP_PKEY_CTX_set_rsa_mgf1_md(pctx, mgf1md)) {
-    goto err;
-  }
+    EVP_PKEY_CTX *pctx;
+    if (!EVP_DigestVerifyInit(ctx, &pctx, md, NULL, pkey) ||
+        !EVP_PKEY_CTX_set_rsa_padding(pctx, RSA_PKCS1_PSS_PADDING) ||
+        !EVP_PKEY_CTX_set_rsa_pss_saltlen(pctx, (int)salt_len) ||
+        !EVP_PKEY_CTX_set_rsa_mgf1_md(pctx, mgf1md)) {
+      goto err;
+    }
 
-  ret = 1;
+    ret = 1;
+  }
 
 err:
   RSA_PSS_PARAMS_free(pss);

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

@@ -65,6 +65,7 @@
 #include <openssl/obj.h>
 #include <openssl/x509.h>
 
+#include "ext_dat.h"
 #include "internal.h"
 
 
@@ -93,7 +94,8 @@ const X509V3_EXT_METHOD v3_akey_id = {
 
 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;
+  const AUTHORITY_KEYID *akeyid =
+      reinterpret_cast<const AUTHORITY_KEYID *>(ext);
   int extlist_was_null = extlist == NULL;
   if (akeyid->keyid) {
     char *tmp = x509v3_bytes_to_hex(akeyid->keyid->data, akeyid->keyid->length);
@@ -177,7 +179,7 @@ static void *v2i_AUTHORITY_KEYID(const X509V3_EXT_METHOD *method,
     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);
+      ikeyid = reinterpret_cast<ASN1_OCTET_STRING *>(X509V3_EXT_d2i(ext));
     }
     if (keyid == 2 && !ikeyid) {
       OPENSSL_PUT_ERROR(X509V3, X509V3_R_UNABLE_TO_GET_ISSUER_KEYID);

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

@@ -1,6 +1,5 @@
 /*
- * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
- * project.
+ * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project.
  */
 /* ====================================================================
  * Copyright (c) 1999-2003 The OpenSSL Project.  All rights reserved.
@@ -63,6 +62,7 @@
 #include <openssl/obj.h>
 #include <openssl/x509.h>
 
+#include "ext_dat.h"
 #include "internal.h"
 
 
@@ -81,7 +81,7 @@ static int do_dirname(GENERAL_NAME *gen, const char *value,
 
 static STACK_OF(CONF_VALUE) *i2v_GENERAL_NAMES_cb(
     const X509V3_EXT_METHOD *method, void *ext, STACK_OF(CONF_VALUE) *ret) {
-  return i2v_GENERAL_NAMES(method, ext, ret);
+  return i2v_GENERAL_NAMES(method, reinterpret_cast<GENERAL_NAMES *>(ext), ret);
 }
 
 const X509V3_EXT_METHOD v3_alt[] = {
@@ -314,7 +314,7 @@ static int copy_issuer(const X509V3_CTX *ctx, GENERAL_NAMES *gens) {
   GENERAL_NAMES *ialt = NULL;
   X509_EXTENSION *ext;
   if (!(ext = X509_get_ext(ctx->issuer_cert, i)) ||
-      !(ialt = X509V3_EXT_d2i(ext))) {
+      !(ialt = reinterpret_cast<GENERAL_NAMES *>(X509V3_EXT_d2i(ext)))) {
     OPENSSL_PUT_ERROR(X509V3, X509V3_R_ISSUER_DECODE_ERROR);
     goto err;
   }
@@ -608,11 +608,11 @@ err:
 static int do_dirname(GENERAL_NAME *gen, const char *value,
                       const X509V3_CTX *ctx) {
   int ret = 0;
+  const STACK_OF(CONF_VALUE) *sk = X509V3_get_section(ctx, value);
   X509_NAME *nm = X509_NAME_new();
   if (nm == NULL) {
     goto err;
   }
-  const STACK_OF(CONF_VALUE) *sk = X509V3_get_section(ctx, value);
   if (sk == NULL) {
     OPENSSL_PUT_ERROR(X509V3, X509V3_R_SECTION_NOT_FOUND);
     ERR_add_error_data(2, "section=", value);

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

@@ -64,6 +64,7 @@
 #include <openssl/obj.h>
 #include <openssl/x509.h>
 
+#include "ext_dat.h"
 #include "internal.h"
 
 
@@ -99,7 +100,8 @@ IMPLEMENT_ASN1_FUNCTIONS_const(BASIC_CONSTRAINTS)
 
 static STACK_OF(CONF_VALUE) *i2v_BASIC_CONSTRAINTS(
     const X509V3_EXT_METHOD *method, void *ext, STACK_OF(CONF_VALUE) *extlist) {
-  const BASIC_CONSTRAINTS *bcons = ext;
+  const BASIC_CONSTRAINTS *bcons =
+      reinterpret_cast<const BASIC_CONSTRAINTS *>(ext);
   X509V3_add_value_bool("CA", bcons->ca, &extlist);
   X509V3_add_value_int("pathlen", bcons->pathlen, &extlist);
   return extlist;

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

@@ -62,6 +62,7 @@
 #include <openssl/obj.h>
 #include <openssl/x509.h>
 
+#include "ext_dat.h"
 #include "internal.h"
 
 
@@ -90,9 +91,10 @@ static const BIT_STRING_BITNAME key_usage_type_table[] = {
 
 static STACK_OF(CONF_VALUE) *i2v_ASN1_BIT_STRING(
     const X509V3_EXT_METHOD *method, void *ext, STACK_OF(CONF_VALUE) *ret) {
-  const ASN1_BIT_STRING *bits = ext;
+  const ASN1_BIT_STRING *bits = reinterpret_cast<ASN1_BIT_STRING *>(ext);
   const BIT_STRING_BITNAME *bnam;
-  for (bnam = method->usr_data; bnam->lname; bnam++) {
+  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);
     }
@@ -110,7 +112,8 @@ static void *v2i_ASN1_BIT_STRING(const X509V3_EXT_METHOD *method,
   for (size_t i = 0; i < sk_CONF_VALUE_num(nval); i++) {
     const CONF_VALUE *val = sk_CONF_VALUE_value(nval, i);
     const BIT_STRING_BITNAME *bnam;
-    for (bnam = method->usr_data; bnam->lname; bnam++) {
+    for (bnam = reinterpret_cast<const BIT_STRING_BITNAME *>(method->usr_data);
+         bnam->lname; bnam++) {
       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);

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

@@ -190,7 +190,8 @@ static X509_EXTENSION *do_ext_nconf(const CONF *conf, const X509V3_CTX *ctx,
   }
 
   ext = do_ext_i2d(method, ext_nid, crit, ext_struc);
-  ASN1_item_free(ext_struc, ASN1_ITEM_ptr(method->it));
+  ASN1_item_free(reinterpret_cast<ASN1_VALUE *>(ext_struc),
+                 ASN1_ITEM_ptr(method->it));
   return ext;
 }
 
@@ -198,7 +199,8 @@ static X509_EXTENSION *do_ext_i2d(const X509V3_EXT_METHOD *method, int ext_nid,
                                   int crit, void *ext_struc) {
   // Convert the extension's internal representation to DER.
   unsigned char *ext_der = NULL;
-  int ext_len = ASN1_item_i2d(ext_struc, &ext_der, ASN1_ITEM_ptr(method->it));
+  int ext_len = ASN1_item_i2d(reinterpret_cast<ASN1_VALUE *>(ext_struc),
+                              &ext_der, ASN1_ITEM_ptr(method->it));
   if (ext_len < 0) {
     return NULL;
   }
@@ -401,9 +403,7 @@ const STACK_OF(CONF_VALUE) *X509V3_get_section(const X509V3_CTX *ctx,
   return NCONF_get_section(ctx->db, section);
 }
 
-void X509V3_set_nconf(X509V3_CTX *ctx, const CONF *conf) {
-  ctx->db = conf;
-}
+void X509V3_set_nconf(X509V3_CTX *ctx, const CONF *conf) { ctx->db = conf; }
 
 void X509V3_set_ctx(X509V3_CTX *ctx, const X509 *issuer, const X509 *subj,
                     const X509_REQ *req, const X509_CRL *crl, int flags) {

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

@@ -68,6 +68,7 @@
 #include <openssl/stack.h>
 #include <openssl/x509.h>
 
+#include "ext_dat.h"
 #include "internal.h"
 
 // Certificate policies extension support: this one is a bit complex...
@@ -161,56 +162,60 @@ static void *r2i_certpol(const X509V3_EXT_METHOD *method, const X509V3_CTX *ctx,
     return NULL;
   }
   STACK_OF(CONF_VALUE) *vals = X509V3_parse_list(value);
-  if (vals == NULL) {
-    OPENSSL_PUT_ERROR(X509V3, ERR_R_X509V3_LIB);
-    goto err;
-  }
-  int ia5org = 0;
-  for (size_t i = 0; i < sk_CONF_VALUE_num(vals); i++) {
-    const CONF_VALUE *cnf = sk_CONF_VALUE_value(vals, i);
-    if (cnf->value || !cnf->name) {
-      OPENSSL_PUT_ERROR(X509V3, X509V3_R_INVALID_POLICY_IDENTIFIER);
-      X509V3_conf_err(cnf);
+
+  {
+    if (vals == NULL) {
+      OPENSSL_PUT_ERROR(X509V3, ERR_R_X509V3_LIB);
       goto err;
     }
-    POLICYINFO *pol;
-    const char *pstr = cnf->name;
-    if (!strcmp(pstr, "ia5org")) {
-      ia5org = 1;
-      continue;
-    } else if (*pstr == '@') {
-      const STACK_OF(CONF_VALUE) *polsect = X509V3_get_section(ctx, pstr + 1);
-      if (!polsect) {
-        OPENSSL_PUT_ERROR(X509V3, X509V3_R_INVALID_SECTION);
-
+    int ia5org = 0;
+    for (size_t i = 0; i < sk_CONF_VALUE_num(vals); i++) {
+      const CONF_VALUE *cnf = sk_CONF_VALUE_value(vals, i);
+      if (cnf->value || !cnf->name) {
+        OPENSSL_PUT_ERROR(X509V3, X509V3_R_INVALID_POLICY_IDENTIFIER);
         X509V3_conf_err(cnf);
         goto err;
       }
-      pol = policy_section(ctx, polsect, ia5org);
-      if (!pol) {
-        goto err;
-      }
-    } else {
-      ASN1_OBJECT *pobj = OBJ_txt2obj(cnf->name, 0);
-      if (pobj == NULL) {
-        OPENSSL_PUT_ERROR(X509V3, X509V3_R_INVALID_OBJECT_IDENTIFIER);
-        X509V3_conf_err(cnf);
-        goto err;
+      POLICYINFO *pol;
+      const char *pstr = cnf->name;
+      if (!strcmp(pstr, "ia5org")) {
+        ia5org = 1;
+        continue;
+      } else if (*pstr == '@') {
+        const STACK_OF(CONF_VALUE) *polsect = X509V3_get_section(ctx, pstr + 1);
+        if (!polsect) {
+          OPENSSL_PUT_ERROR(X509V3, X509V3_R_INVALID_SECTION);
+
+          X509V3_conf_err(cnf);
+          goto err;
+        }
+        pol = policy_section(ctx, polsect, ia5org);
+        if (!pol) {
+          goto err;
+        }
+      } else {
+        ASN1_OBJECT *pobj = OBJ_txt2obj(cnf->name, 0);
+        if (pobj == NULL) {
+          OPENSSL_PUT_ERROR(X509V3, X509V3_R_INVALID_OBJECT_IDENTIFIER);
+          X509V3_conf_err(cnf);
+          goto err;
+        }
+        pol = POLICYINFO_new();
+        if (pol == NULL) {
+          ASN1_OBJECT_free(pobj);
+          goto err;
+        }
+        pol->policyid = pobj;
       }
-      pol = POLICYINFO_new();
-      if (pol == NULL) {
-        ASN1_OBJECT_free(pobj);
+      if (!sk_POLICYINFO_push(pols, pol)) {
+        POLICYINFO_free(pol);
         goto err;
       }
-      pol->policyid = pobj;
-    }
-    if (!sk_POLICYINFO_push(pols, pol)) {
-      POLICYINFO_free(pol);
-      goto err;
     }
+    sk_CONF_VALUE_pop_free(vals, X509V3_conf_free);
+    return pols;
   }
-  sk_CONF_VALUE_pop_free(vals, X509V3_conf_free);
-  return pols;
+
 err:
   sk_CONF_VALUE_pop_free(vals, X509V3_conf_free);
   sk_POLICYINFO_pop_free(pols, POLICYINFO_free);
@@ -408,7 +413,8 @@ static int nref_nos(STACK_OF(ASN1_INTEGER) *nnums,
 
 static int i2r_certpol(const X509V3_EXT_METHOD *method, void *ext, BIO *out,
                        int indent) {
-  const STACK_OF(POLICYINFO) *pol = ext;
+  const STACK_OF(POLICYINFO) *pol =
+      reinterpret_cast<const STACK_OF(POLICYINFO) *>(ext);
   // First print out the policy OIDs
   for (size_t i = 0; i < sk_POLICYINFO_num(pol); i++) {
     const POLICYINFO *pinfo = sk_POLICYINFO_value(pol, i);

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

@@ -65,6 +65,7 @@
 #include <openssl/obj.h>
 #include <openssl/x509.h>
 
+#include "ext_dat.h"
 #include "internal.h"
 
 
@@ -518,7 +519,7 @@ static int print_distpoint(BIO *out, DIST_POINT_NAME *dpn, int indent) {
 
 static int i2r_idp(const X509V3_EXT_METHOD *method, void *pidp, BIO *out,
                    int indent) {
-  ISSUING_DIST_POINT *idp = pidp;
+  ISSUING_DIST_POINT *idp = reinterpret_cast<ISSUING_DIST_POINT *>(pidp);
   if (idp->distpoint) {
     print_distpoint(out, idp->distpoint, indent);
   }
@@ -548,7 +549,7 @@ static int i2r_idp(const X509V3_EXT_METHOD *method, void *pidp, BIO *out,
 
 static int i2r_crldp(const X509V3_EXT_METHOD *method, void *pcrldp, BIO *out,
                      int indent) {
-  STACK_OF(DIST_POINT) *crld = pcrldp;
+  STACK_OF(DIST_POINT) *crld = reinterpret_cast<STACK_OF(DIST_POINT) *>(pcrldp);
   DIST_POINT *point;
   size_t i;
   for (i = 0; i < sk_DIST_POINT_num(crld); i++) {

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

@@ -61,6 +61,7 @@
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
 
+#include "ext_dat.h"
 #include "internal.h"
 
 
@@ -84,9 +85,11 @@ static const ENUMERATED_NAMES crl_reasons[] = {
 
 static char *i2s_ASN1_ENUMERATED_TABLE(const X509V3_EXT_METHOD *method,
                                        void *ext) {
-  const ASN1_ENUMERATED *e = ext;
+  const ASN1_ENUMERATED *e = reinterpret_cast<const ASN1_ENUMERATED *>(ext);
   long strval = ASN1_ENUMERATED_get(e);
-  for (const ENUMERATED_NAMES *enam = method->usr_data; enam->lname; enam++) {
+  for (const ENUMERATED_NAMES *enam =
+           reinterpret_cast<const ENUMERATED_NAMES *>(method->usr_data);
+       enam->lname; enam++) {
     if (strval == enam->bitnum) {
       return OPENSSL_strdup(enam->lname);
     }

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

@@ -62,6 +62,7 @@
 #include <openssl/obj.h>
 #include <openssl/x509.h>
 
+#include "ext_dat.h"
 #include "internal.h"
 
 
@@ -114,7 +115,8 @@ 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) {
-  const EXTENDED_KEY_USAGE *eku = a;
+  const EXTENDED_KEY_USAGE *eku =
+      reinterpret_cast<const EXTENDED_KEY_USAGE *>(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];

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

@@ -176,33 +176,33 @@ int GENERAL_NAME_cmp(const GENERAL_NAME *a, const GENERAL_NAME *b) {
 void GENERAL_NAME_set0_value(GENERAL_NAME *a, int type, void *value) {
   switch (type) {
     case GEN_X400:
-      a->d.x400Address = value;
+      a->d.x400Address = reinterpret_cast<ASN1_STRING *>(value);
       break;
 
     case GEN_EDIPARTY:
-      a->d.ediPartyName = value;
+      a->d.ediPartyName = reinterpret_cast<EDIPARTYNAME *>(value);
       break;
 
     case GEN_OTHERNAME:
-      a->d.otherName = value;
+      a->d.otherName = reinterpret_cast<OTHERNAME *>(value);
       break;
 
     case GEN_EMAIL:
     case GEN_DNS:
     case GEN_URI:
-      a->d.ia5 = value;
+      a->d.ia5 = reinterpret_cast<ASN1_STRING *>(value);
       break;
 
     case GEN_DIRNAME:
-      a->d.dirn = value;
+      a->d.dirn = reinterpret_cast<X509_NAME *>(value);
       break;
 
     case GEN_IPADD:
-      a->d.ip = value;
+      a->d.ip = reinterpret_cast<ASN1_STRING *>(value);
       break;
 
     case GEN_RID:
-      a->d.rid = value;
+      a->d.rid = reinterpret_cast<ASN1_OBJECT *>(value);
       break;
   }
   a->type = type;

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

@@ -67,15 +67,16 @@
 #include <openssl/x509.h>
 
 #include "../internal.h"
+#include "ext_dat.h"
 
 
 static char *i2s_ASN1_IA5STRING(const X509V3_EXT_METHOD *method, void *ext) {
-  const ASN1_IA5STRING *ia5 = ext;
+  const ASN1_IA5STRING *ia5 = reinterpret_cast<const ASN1_IA5STRING *>(ext);
   char *tmp;
   if (!ia5 || !ia5->length) {
     return NULL;
   }
-  if (!(tmp = OPENSSL_malloc(ia5->length + 1))) {
+  if (!(tmp = reinterpret_cast<char *>(OPENSSL_malloc(ia5->length + 1)))) {
     return NULL;
   }
   OPENSSL_memcpy(tmp, ia5->data, ia5->length);

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

@@ -67,6 +67,7 @@
 #include <openssl/obj.h>
 #include <openssl/x509.h>
 
+#include "ext_dat.h"
 #include "internal.h"
 
 
@@ -125,7 +126,8 @@ IMPLEMENT_ASN1_FUNCTIONS(AUTHORITY_INFO_ACCESS)
 
 static STACK_OF(CONF_VALUE) *i2v_AUTHORITY_INFO_ACCESS(
     const X509V3_EXT_METHOD *method, void *ext, STACK_OF(CONF_VALUE) *ret) {
-  const AUTHORITY_INFO_ACCESS *ainfo = ext;
+  const AUTHORITY_INFO_ACCESS *ainfo =
+      reinterpret_cast<const AUTHORITY_INFO_ACCESS *>(ext);
   ACCESS_DESCRIPTION *desc;
   int nlen;
   char objtmp[80], *ntmp;
@@ -144,7 +146,7 @@ static STACK_OF(CONF_VALUE) *i2v_AUTHORITY_INFO_ACCESS(
     vtmp = sk_CONF_VALUE_value(tret, i);
     i2t_ASN1_OBJECT(objtmp, sizeof objtmp, desc->method);
     nlen = strlen(objtmp) + strlen(vtmp->name) + 5;
-    ntmp = OPENSSL_malloc(nlen);
+    ntmp = reinterpret_cast<char *>(OPENSSL_malloc(nlen));
     if (ntmp == NULL) {
       goto err;
     }

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

@@ -59,9 +59,11 @@
 #include <openssl/obj.h>
 #include <openssl/x509.h>
 
+#include "ext_dat.h"
+
 
 static char *i2s_ASN1_INTEGER_cb(const X509V3_EXT_METHOD *method, void *ext) {
-  return i2s_ASN1_INTEGER(method, ext);
+  return i2s_ASN1_INTEGER(method, reinterpret_cast<ASN1_INTEGER *>(ext));
 }
 
 static void *s2i_asn1_int(const X509V3_EXT_METHOD *meth, const X509V3_CTX *ctx,

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

@@ -109,8 +109,9 @@ const X509V3_EXT_METHOD *X509V3_EXT_get_nid(int nid) {
     return NULL;
   }
   tmp.ext_nid = nid;
-  ret = bsearch(&t, standard_exts, STANDARD_EXTENSION_COUNT,
-                sizeof(X509V3_EXT_METHOD *), ext_cmp);
+  ret = reinterpret_cast<X509V3_EXT_METHOD **>(
+      bsearch(&t, standard_exts, STANDARD_EXTENSION_COUNT,
+              sizeof(X509V3_EXT_METHOD *), ext_cmp));
   if (ret) {
     return *ret;
   }
@@ -139,12 +140,13 @@ int X509V3_EXT_free(int nid, void *ext_data) {
     return 0;
   }
 
-  ASN1_item_free(ext_data, ASN1_ITEM_ptr(ext_method->it));
+  ASN1_item_free(reinterpret_cast<ASN1_VALUE *>(ext_data),
+                 ASN1_ITEM_ptr(ext_method->it));
   return 1;
 }
 
 int X509V3_EXT_add_alias(int nid_to, int nid_from) {
-OPENSSL_BEGIN_ALLOW_DEPRECATED
+  OPENSSL_BEGIN_ALLOW_DEPRECATED
   const X509V3_EXT_METHOD *ext;
   X509V3_EXT_METHOD *tmpext;
 
@@ -163,7 +165,7 @@ OPENSSL_BEGIN_ALLOW_DEPRECATED
     return 0;
   }
   return 1;
-OPENSSL_END_ALLOW_DEPRECATED
+  OPENSSL_END_ALLOW_DEPRECATED
 }
 
 // Legacy function: we don't need to add standard extensions any more because
@@ -188,7 +190,8 @@ void *X509V3_EXT_d2i(const X509_EXTENSION *ext) {
   }
   // Check for trailing data.
   if (p != ext->value->data + ext->value->length) {
-    ASN1_item_free(ret, ASN1_ITEM_ptr(method->it));
+    ASN1_item_free(reinterpret_cast<ASN1_VALUE *>(ret),
+                   ASN1_ITEM_ptr(method->it));
     OPENSSL_PUT_ERROR(X509V3, X509V3_R_TRAILING_DATA_IN_EXTENSION);
     return NULL;
   }

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

@@ -1,6 +1,5 @@
 /*
- * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
- * project.
+ * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project.
  */
 /* ====================================================================
  * Copyright (c) 2003 The OpenSSL Project.  All rights reserved.
@@ -65,6 +64,7 @@
 #include <openssl/x509.h>
 
 #include "../internal.h"
+#include "ext_dat.h"
 #include "internal.h"
 
 
@@ -166,7 +166,7 @@ err:
 
 static int i2r_NAME_CONSTRAINTS(const X509V3_EXT_METHOD *method, void *a,
                                 BIO *bp, int ind) {
-  NAME_CONSTRAINTS *ncons = a;
+  NAME_CONSTRAINTS *ncons = reinterpret_cast<NAME_CONSTRAINTS *>(a);
   do_i2r_name_constraints(method, ncons->permittedSubtrees, bp, ind,
                           "Permitted");
   do_i2r_name_constraints(method, ncons->excludedSubtrees, bp, ind, "Excluded");

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

@@ -13,6 +13,8 @@
 #include <openssl/bio.h>
 #include <openssl/nid.h>
 
+#include "ext_dat.h"
+
 // OCSP extensions and a couple of CRL entry extensions
 
 static int i2r_ocsp_acutoff(const X509V3_EXT_METHOD *method, void *nonce,
@@ -62,7 +64,8 @@ static int i2r_ocsp_acutoff(const X509V3_EXT_METHOD *method, void *cutoff,
   if (BIO_printf(bp, "%*s", ind, "") <= 0) {
     return 0;
   }
-  if (!ASN1_GENERALIZEDTIME_print(bp, cutoff)) {
+  if (!ASN1_GENERALIZEDTIME_print(
+          bp, reinterpret_cast<ASN1_GENERALIZEDTIME *>(cutoff))) {
     return 0;
   }
   return 1;