grpc 1.69.0 → 1.70.1

data/third_party/boringssl-with-bazel/src/crypto/x509/{v3_pcons.c → v3_pcons.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.
@@ -64,6 +63,7 @@
 #include <openssl/obj.h>
 #include <openssl/x509.h>
 
+#include "ext_dat.h"
 #include "internal.h"
 
 
@@ -99,7 +99,7 @@ IMPLEMENT_ASN1_ALLOC_FUNCTIONS(POLICY_CONSTRAINTS)
 
 static STACK_OF(CONF_VALUE) *i2v_POLICY_CONSTRAINTS(
     const X509V3_EXT_METHOD *method, void *a, STACK_OF(CONF_VALUE) *extlist) {
-  const POLICY_CONSTRAINTS *pcons = a;
+  const POLICY_CONSTRAINTS *pcons = reinterpret_cast<POLICY_CONSTRAINTS *>(a);
   X509V3_add_value_int("Require Explicit Policy", pcons->requireExplicitPolicy,
                        &extlist);
   X509V3_add_value_int("Inhibit Policy Mapping", pcons->inhibitPolicyMapping,

data/third_party/boringssl-with-bazel/src/crypto/x509/{v3_pmaps.c → v3_pmaps.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.
@@ -62,6 +61,7 @@
 #include <openssl/obj.h>
 #include <openssl/x509.h>
 
+#include "ext_dat.h"
 #include "internal.h"
 
 
@@ -101,7 +101,7 @@ IMPLEMENT_ASN1_ALLOC_FUNCTIONS(POLICY_MAPPING)
 
 static STACK_OF(CONF_VALUE) *i2v_POLICY_MAPPINGS(
     const X509V3_EXT_METHOD *method, void *a, STACK_OF(CONF_VALUE) *ext_list) {
-  const POLICY_MAPPINGS *pmaps = a;
+  const POLICY_MAPPINGS *pmaps = reinterpret_cast<POLICY_MAPPINGS *>(a);
   for (size_t i = 0; i < sk_POLICY_MAPPING_num(pmaps); i++) {
     const POLICY_MAPPING *pmap = sk_POLICY_MAPPING_value(pmaps, i);
     char obj_tmp1[80], obj_tmp2[80];

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

@@ -144,7 +144,8 @@ int X509V3_EXT_print(BIO *out, const X509_EXTENSION *ext, unsigned long flag,
 err:
   sk_CONF_VALUE_pop_free(nval, X509V3_conf_free);
   OPENSSL_free(value);
-  ASN1_item_free(ext_str, ASN1_ITEM_ptr(method->it));
+  ASN1_item_free(reinterpret_cast<ASN1_VALUE *>(ext_str),
+                 ASN1_ITEM_ptr(method->it));
   return ok;
 }
 

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

@@ -203,7 +203,8 @@ static int setup_dp(X509 *x, DIST_POINT *dp) {
 
 static int setup_crldp(X509 *x) {
   int j;
-  x->crldp = X509_get_ext_d2i(x, NID_crl_distribution_points, &j, NULL);
+  x->crldp = reinterpret_cast<STACK_OF(DIST_POINT) *>(
+      X509_get_ext_d2i(x, NID_crl_distribution_points, &j, NULL));
   if (x->crldp == NULL && j != -1) {
     return 0;
   }
@@ -244,7 +245,8 @@ int x509v3_cache_extensions(X509 *x) {
     x->ex_flags |= EXFLAG_V1;
   }
   // Handle basic constraints
-  if ((bs = X509_get_ext_d2i(x, NID_basic_constraints, &j, NULL))) {
+  if ((bs = reinterpret_cast<BASIC_CONSTRAINTS *>(
+           X509_get_ext_d2i(x, NID_basic_constraints, &j, NULL)))) {
     if (bs->ca) {
       x->ex_flags |= EXFLAG_CA;
     }
@@ -269,7 +271,8 @@ int x509v3_cache_extensions(X509 *x) {
     x->ex_flags |= EXFLAG_INVALID;
   }
   // Handle key usage
-  if ((usage = X509_get_ext_d2i(x, NID_key_usage, &j, NULL))) {
+  if ((usage = reinterpret_cast<ASN1_BIT_STRING *>(
+           X509_get_ext_d2i(x, NID_key_usage, &j, NULL)))) {
     if (usage->length > 0) {
       x->ex_kusage = usage->data[0];
       if (usage->length > 1) {
@@ -284,7 +287,8 @@ int x509v3_cache_extensions(X509 *x) {
     x->ex_flags |= EXFLAG_INVALID;
   }
   x->ex_xkusage = 0;
-  if ((extusage = X509_get_ext_d2i(x, NID_ext_key_usage, &j, NULL))) {
+  if ((extusage = reinterpret_cast<EXTENDED_KEY_USAGE *>(
+           X509_get_ext_d2i(x, NID_ext_key_usage, &j, NULL)))) {
     x->ex_flags |= EXFLAG_XKUSAGE;
     for (i = 0; i < sk_ASN1_OBJECT_num(extusage); i++) {
       switch (OBJ_obj2nid(sk_ASN1_OBJECT_value(extusage, i))) {
@@ -331,11 +335,13 @@ int x509v3_cache_extensions(X509 *x) {
     x->ex_flags |= EXFLAG_INVALID;
   }
 
-  x->skid = X509_get_ext_d2i(x, NID_subject_key_identifier, &j, NULL);
+  x->skid = reinterpret_cast<ASN1_OCTET_STRING *>(
+      X509_get_ext_d2i(x, NID_subject_key_identifier, &j, NULL));
   if (x->skid == NULL && j != -1) {
     x->ex_flags |= EXFLAG_INVALID;
   }
-  x->akid = X509_get_ext_d2i(x, NID_authority_key_identifier, &j, NULL);
+  x->akid = reinterpret_cast<AUTHORITY_KEYID *>(
+      X509_get_ext_d2i(x, NID_authority_key_identifier, &j, NULL));
   if (x->akid == NULL && j != -1) {
     x->ex_flags |= EXFLAG_INVALID;
   }
@@ -348,11 +354,13 @@ int x509v3_cache_extensions(X509 *x) {
       x->ex_flags |= EXFLAG_SS;
     }
   }
-  x->altname = X509_get_ext_d2i(x, NID_subject_alt_name, &j, NULL);
+  x->altname = reinterpret_cast<STACK_OF(GENERAL_NAME) *>(
+      X509_get_ext_d2i(x, NID_subject_alt_name, &j, NULL));
   if (x->altname == NULL && j != -1) {
     x->ex_flags |= EXFLAG_INVALID;
   }
-  x->nc = X509_get_ext_d2i(x, NID_name_constraints, &j, NULL);
+  x->nc = reinterpret_cast<NAME_CONSTRAINTS *>(
+      X509_get_ext_d2i(x, NID_name_constraints, &j, NULL));
   if (x->nc == NULL && j != -1) {
     x->ex_flags |= EXFLAG_INVALID;
   }

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

@@ -60,10 +60,11 @@
 
 #include <openssl/digest.h>
 #include <openssl/err.h>
-#include <openssl/obj.h>
 #include <openssl/mem.h>
+#include <openssl/obj.h>
 #include <openssl/x509.h>
 
+#include "ext_dat.h"
 #include "internal.h"
 
 
@@ -77,6 +78,7 @@ ASN1_OCTET_STRING *s2i_ASN1_OCTET_STRING(const X509V3_EXT_METHOD *method,
                                          const char *str) {
   size_t len;
   uint8_t *data = x509v3_hex_to_bytes(str, &len);
+  ASN1_OCTET_STRING *oct;
   if (data == NULL) {
     return NULL;
   }
@@ -85,7 +87,7 @@ ASN1_OCTET_STRING *s2i_ASN1_OCTET_STRING(const X509V3_EXT_METHOD *method,
     goto err;
   }
 
-  ASN1_OCTET_STRING *oct = ASN1_OCTET_STRING_new();
+  oct = ASN1_OCTET_STRING_new();
   if (oct == NULL) {
     goto err;
   }
@@ -99,7 +101,8 @@ err:
 
 static char *i2s_ASN1_OCTET_STRING_cb(const X509V3_EXT_METHOD *method,
                                       void *ext) {
-  return i2s_ASN1_OCTET_STRING(method, ext);
+  return i2s_ASN1_OCTET_STRING(method,
+                               reinterpret_cast<ASN1_OCTET_STRING *>(ext));
 }
 
 static void *s2i_skey_id(const X509V3_EXT_METHOD *method, const X509V3_CTX *ctx,

data/third_party/boringssl-with-bazel/src/crypto/x509/{v3_utl.c → v3_utl.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.
@@ -182,7 +181,7 @@ static char *bignum_to_string(const BIGNUM *bn) {
   }
 
   len = strlen(tmp) + 3;
-  ret = OPENSSL_malloc(len);
+  ret = reinterpret_cast<char *>(OPENSSL_malloc(len));
   if (ret == NULL) {
     OPENSSL_free(tmp);
     return NULL;
@@ -502,7 +501,8 @@ unsigned char *x509v3_hex_to_bytes(const char *str, size_t *len) {
     OPENSSL_PUT_ERROR(X509V3, X509V3_R_INVALID_NULL_ARGUMENT);
     return NULL;
   }
-  if (!(hexbuf = OPENSSL_malloc(strlen(str) >> 1))) {
+  if (!(hexbuf =
+            reinterpret_cast<uint8_t *>(OPENSSL_malloc(strlen(str) >> 1)))) {
     goto err;
   }
   for (p = (unsigned char *)str, q = hexbuf; *p;) {
@@ -559,7 +559,8 @@ STACK_OF(OPENSSL_STRING) *X509_get1_email(const X509 *x) {
   GENERAL_NAMES *gens;
   STACK_OF(OPENSSL_STRING) *ret;
 
-  gens = X509_get_ext_d2i(x, NID_subject_alt_name, NULL, NULL);
+  gens = reinterpret_cast<GENERAL_NAMES *>(
+      X509_get_ext_d2i(x, NID_subject_alt_name, NULL, NULL));
   ret = get_email(X509_get_subject_name(x), gens);
   sk_GENERAL_NAME_pop_free(gens, GENERAL_NAME_free);
   return ret;
@@ -570,7 +571,8 @@ STACK_OF(OPENSSL_STRING) *X509_get1_ocsp(const X509 *x) {
   STACK_OF(OPENSSL_STRING) *ret = NULL;
   size_t i;
 
-  info = X509_get_ext_d2i(x, NID_info_access, NULL, NULL);
+  info = reinterpret_cast<AUTHORITY_INFO_ACCESS *>(
+      X509_get_ext_d2i(x, NID_info_access, NULL, NULL));
   if (!info) {
     return NULL;
   }
@@ -594,7 +596,8 @@ STACK_OF(OPENSSL_STRING) *X509_REQ_get1_email(const X509_REQ *x) {
   STACK_OF(OPENSSL_STRING) *ret;
 
   exts = X509_REQ_get_extensions(x);
-  gens = X509V3_get_d2i(exts, NID_subject_alt_name, NULL, NULL);
+  gens = reinterpret_cast<GENERAL_NAMES *>(
+      X509V3_get_d2i(exts, NID_subject_alt_name, NULL, NULL));
   ret = get_email(X509_REQ_get_subject_name(x), gens);
   sk_GENERAL_NAME_pop_free(gens, GENERAL_NAME_free);
   sk_X509_EXTENSION_pop_free(exts, X509_EXTENSION_free);
@@ -995,7 +998,8 @@ static int do_x509_check(const X509 *x, const char *chk, size_t chklen,
     equal = equal_case;
   }
 
-  GENERAL_NAMES *gens = X509_get_ext_d2i(x, NID_subject_alt_name, NULL, NULL);
+  GENERAL_NAMES *gens = reinterpret_cast<GENERAL_NAMES *>(
+      X509_get_ext_d2i(x, NID_subject_alt_name, NULL, NULL));
   if (gens) {
     for (size_t i = 0; i < sk_GENERAL_NAME_num(gens); i++) {
       const GENERAL_NAME *gen = sk_GENERAL_NAME_value(gens, i);
@@ -1112,7 +1116,8 @@ ASN1_OCTET_STRING *a2i_IPADDRESS_NC(const char *ipasc) {
   unsigned char ipout[32];
   char *iptmp = NULL, *p;
   int iplen1, iplen2;
-  p = strchr(ipasc, '/');
+  // FIXME: yes, this function takes a const pointer and writes to it!
+  p = const_cast<char *>(strchr(ipasc, '/'));
   if (!p) {
     return NULL;
   }
@@ -1293,7 +1298,7 @@ static int ipv6_from_asc(uint8_t v6[16], const char *in) {
 }
 
 static int ipv6_cb(const char *elem, size_t len, void *usr) {
-  IPV6_STAT *s = usr;
+  IPV6_STAT *s = reinterpret_cast<IPV6_STAT *>(usr);
   // Error if 16 bytes written
   if (s->total == 16) {
     return 0;

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

@@ -157,8 +157,9 @@ int X509_ATTRIBUTE_set1_data(X509_ATTRIBUTE *attr, int attrtype,
     // |data| is an encoded string. We must decode and re-encode it to |attr|'s
     // preferred ASN.1 type. Note |len| may be -1, in which case
     // |ASN1_STRING_set_by_NID| calls |strlen| automatically.
-    ASN1_STRING *str = ASN1_STRING_set_by_NID(NULL, data, len, attrtype,
-                                              OBJ_obj2nid(attr->object));
+    ASN1_STRING *str =
+        ASN1_STRING_set_by_NID(NULL, reinterpret_cast<const uint8_t *>(data),
+                               len, attrtype, OBJ_obj2nid(attr->object));
     if (str == NULL) {
       OPENSSL_PUT_ERROR(X509, ERR_R_ASN1_LIB);
       goto err;

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

@@ -80,7 +80,8 @@ static int X509_LOOKUP_by_subject(X509_LOOKUP *ctx, int type, X509_NAME *name,
 
 static X509_LOOKUP *X509_LOOKUP_new(const X509_LOOKUP_METHOD *method,
                                     X509_STORE *store) {
-  X509_LOOKUP *ret = OPENSSL_zalloc(sizeof(X509_LOOKUP));
+  X509_LOOKUP *ret =
+      reinterpret_cast<X509_LOOKUP *>(OPENSSL_zalloc(sizeof(X509_LOOKUP)));
   if (ret == NULL) {
     return NULL;
   }
@@ -150,7 +151,8 @@ static int x509_object_cmp_sk(const X509_OBJECT *const *a,
 }
 
 X509_STORE *X509_STORE_new(void) {
-  X509_STORE *ret = OPENSSL_zalloc(sizeof(X509_STORE));
+  X509_STORE *ret =
+      reinterpret_cast<X509_STORE *>(OPENSSL_zalloc(sizeof(X509_STORE)));
   if (ret == NULL) {
     return NULL;
   }
@@ -160,8 +162,7 @@ X509_STORE *X509_STORE_new(void) {
   ret->objs = sk_X509_OBJECT_new(x509_object_cmp_sk);
   ret->get_cert_methods = sk_X509_LOOKUP_new_null();
   ret->param = X509_VERIFY_PARAM_new();
-  if (ret->objs == NULL ||
-      ret->get_cert_methods == NULL ||
+  if (ret->objs == NULL || ret->get_cert_methods == NULL ||
       ret->param == NULL) {
     X509_STORE_free(ret);
     return NULL;
@@ -284,7 +285,7 @@ int X509_STORE_add_crl(X509_STORE *ctx, X509_CRL *x) {
 }
 
 X509_OBJECT *X509_OBJECT_new(void) {
-  return OPENSSL_zalloc(sizeof(X509_OBJECT));
+  return reinterpret_cast<X509_OBJECT *>(OPENSSL_zalloc(sizeof(X509_OBJECT)));
 }
 
 void X509_OBJECT_free(X509_OBJECT *obj) {

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

@@ -143,7 +143,7 @@ STACK_OF(X509_EXTENSION) *X509v3_add_ext(STACK_OF(X509_EXTENSION) **x,
                                          const X509_EXTENSION *ex, int loc) {
   X509_EXTENSION *new_ex = NULL;
   STACK_OF(X509_EXTENSION) *sk = NULL;
-  int free_sk = 0;
+  int free_sk = 0, n;
 
   if (x == NULL) {
     OPENSSL_PUT_ERROR(X509, ERR_R_PASSED_NULL_PARAMETER);
@@ -159,7 +159,7 @@ STACK_OF(X509_EXTENSION) *X509v3_add_ext(STACK_OF(X509_EXTENSION) **x,
     sk = *x;
   }
 
-  int n = (int)sk_X509_EXTENSION_num(sk);
+  n = (int)sk_X509_EXTENSION_num(sk);
   if (loc > n) {
     loc = n;
   } else if (loc < 0) {