grpc 1.69.0 → 1.70.1

data/third_party/boringssl-with-bazel/src/crypto/mlkem/internal.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2023, Google Inc.
+/* Copyright 2023 The BoringSSL Authors
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

data/third_party/boringssl-with-bazel/src/crypto/mlkem/mlkem.cc

@@ -1,4 +1,4 @@
-/* Copyright (c) 2024, Google Inc.
+/* Copyright 2024 The BoringSSL Authors
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -75,11 +75,11 @@ static const int kDV768 = 4;
 static const int kDU1024 = 11;
 static const int kDV1024 = 5;
 
-constexpr size_t encoded_vector_size(int rank) {
+static constexpr size_t encoded_vector_size(int rank) {
   return (kLog2Prime * DEGREE / 8) * static_cast<size_t>(rank);
 }
 
-constexpr size_t encoded_public_key_size(int rank) {
+static constexpr size_t encoded_public_key_size(int rank) {
   return encoded_vector_size(rank) + /*sizeof(rho)=*/32;
 }
 
@@ -88,13 +88,13 @@ static_assert(encoded_public_key_size(RANK768) == MLKEM768_PUBLIC_KEY_BYTES,
 static_assert(encoded_public_key_size(RANK1024) == MLKEM1024_PUBLIC_KEY_BYTES,
               "");
 
-constexpr size_t compressed_vector_size(int rank) {
+static constexpr size_t compressed_vector_size(int rank) {
   // `if constexpr` isn't available in C++17.
   return (rank == RANK768 ? kDU768 : kDU1024) * static_cast<size_t>(rank) *
          DEGREE / 8;
 }
 
-constexpr size_t ciphertext_size(int rank) {
+static constexpr size_t ciphertext_size(int rank) {
   return compressed_vector_size(rank) +
          (rank == RANK768 ? kDV768 : kDV1024) * DEGREE / 8;
 }
@@ -743,9 +743,9 @@ static int mlkem_marshal_public_key(CBB *out,
 }
 
 template <int RANK>
-void mlkem_generate_key_external_seed(uint8_t *out_encoded_public_key,
-                                      private_key<RANK> *priv,
-                                      const uint8_t seed[MLKEM_SEED_BYTES]) {
+static void mlkem_generate_key_external_seed(
+    uint8_t *out_encoded_public_key, private_key<RANK> *priv,
+    const uint8_t seed[MLKEM_SEED_BYTES]) {
   uint8_t augmented_seed[33];
   OPENSSL_memcpy(augmented_seed, seed, 32);
   augmented_seed[32] = RANK;

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

@@ -116,7 +116,7 @@ ASN1_OBJECT *OBJ_dup(const ASN1_OBJECT *o) {
   r->ln = r->sn = NULL;
 
   // once data is attached to an object, it remains const
-  r->data = OPENSSL_memdup(o->data, o->length);
+  r->data = reinterpret_cast<uint8_t *>(OPENSSL_memdup(o->data, o->length));
   if (o->length != 0 && r->data == NULL) {
     goto err;
   }
@@ -191,7 +191,8 @@ static const ASN1_OBJECT *get_builtin_object(int nid) {
 // unsigned int in the array.
 static int obj_cmp(const void *key, const void *element) {
   uint16_t nid = *((const uint16_t *)element);
-  return OBJ_cmp(key, get_builtin_object(nid));
+  return OBJ_cmp(reinterpret_cast<const ASN1_OBJECT *>(key),
+                 get_builtin_object(nid));
 }
 
 int OBJ_obj2nid(const ASN1_OBJECT *obj) {
@@ -215,9 +216,9 @@ int OBJ_obj2nid(const ASN1_OBJECT *obj) {
   }
   CRYPTO_MUTEX_unlock_read(&global_added_lock);
 
-  const uint16_t *nid_ptr =
+  const uint16_t *nid_ptr = reinterpret_cast<const uint16_t *>(
       bsearch(obj, kNIDsInOIDOrder, OPENSSL_ARRAY_SIZE(kNIDsInOIDOrder),
-              sizeof(kNIDsInOIDOrder[0]), obj_cmp);
+              sizeof(kNIDsInOIDOrder[0]), obj_cmp));
   if (nid_ptr == NULL) {
     return NID_undef;
   }
@@ -251,10 +252,10 @@ static int short_name_cmp(const void *key, const void *element) {
 int OBJ_sn2nid(const char *short_name) {
   CRYPTO_MUTEX_lock_read(&global_added_lock);
   if (global_added_by_short_name != NULL) {
-    ASN1_OBJECT *match, template;
+    ASN1_OBJECT *match, templ;
 
-    template.sn = short_name;
-    match = lh_ASN1_OBJECT_retrieve(global_added_by_short_name, &template);
+    templ.sn = short_name;
+    match = lh_ASN1_OBJECT_retrieve(global_added_by_short_name, &templ);
     if (match != NULL) {
       CRYPTO_MUTEX_unlock_read(&global_added_lock);
       return match->nid;
@@ -262,10 +263,10 @@ int OBJ_sn2nid(const char *short_name) {
   }
   CRYPTO_MUTEX_unlock_read(&global_added_lock);
 
-  const uint16_t *nid_ptr =
+  const uint16_t *nid_ptr = reinterpret_cast<const uint16_t *>(
       bsearch(short_name, kNIDsInShortNameOrder,
               OPENSSL_ARRAY_SIZE(kNIDsInShortNameOrder),
-              sizeof(kNIDsInShortNameOrder[0]), short_name_cmp);
+              sizeof(kNIDsInShortNameOrder[0]), short_name_cmp));
   if (nid_ptr == NULL) {
     return NID_undef;
   }
@@ -286,10 +287,10 @@ static int long_name_cmp(const void *key, const void *element) {
 int OBJ_ln2nid(const char *long_name) {
   CRYPTO_MUTEX_lock_read(&global_added_lock);
   if (global_added_by_long_name != NULL) {
-    ASN1_OBJECT *match, template;
+    ASN1_OBJECT *match, templ;
 
-    template.ln = long_name;
-    match = lh_ASN1_OBJECT_retrieve(global_added_by_long_name, &template);
+    templ.ln = long_name;
+    match = lh_ASN1_OBJECT_retrieve(global_added_by_long_name, &templ);
     if (match != NULL) {
       CRYPTO_MUTEX_unlock_read(&global_added_lock);
       return match->nid;
@@ -297,9 +298,9 @@ int OBJ_ln2nid(const char *long_name) {
   }
   CRYPTO_MUTEX_unlock_read(&global_added_lock);
 
-  const uint16_t *nid_ptr = bsearch(
+  const uint16_t *nid_ptr = reinterpret_cast<const uint16_t *>(bsearch(
       long_name, kNIDsInLongNameOrder, OPENSSL_ARRAY_SIZE(kNIDsInLongNameOrder),
-      sizeof(kNIDsInLongNameOrder[0]), long_name_cmp);
+      sizeof(kNIDsInLongNameOrder[0]), long_name_cmp));
   if (nid_ptr == NULL) {
     return NID_undef;
   }
@@ -321,10 +322,8 @@ OPENSSL_EXPORT int OBJ_nid2cbb(CBB *out, int nid) {
   const ASN1_OBJECT *obj = OBJ_nid2obj(nid);
   CBB oid;
 
-  if (obj == NULL ||
-      !CBB_add_asn1(out, &oid, CBS_ASN1_OBJECT) ||
-      !CBB_add_bytes(&oid, obj->data, obj->length) ||
-      !CBB_flush(out)) {
+  if (obj == NULL || !CBB_add_asn1(out, &oid, CBS_ASN1_OBJECT) ||
+      !CBB_add_bytes(&oid, obj->data, obj->length) || !CBB_flush(out)) {
     return 0;
   }
 
@@ -358,10 +357,10 @@ ASN1_OBJECT *OBJ_nid2obj(int nid) {
 
   CRYPTO_MUTEX_lock_read(&global_added_lock);
   if (global_added_by_nid != NULL) {
-    ASN1_OBJECT *match, template;
+    ASN1_OBJECT *match, templ;
 
-    template.nid = nid;
-    match = lh_ASN1_OBJECT_retrieve(global_added_by_nid, &template);
+    templ.nid = nid;
+    match = lh_ASN1_OBJECT_retrieve(global_added_by_nid, &templ);
     if (match != NULL) {
       CRYPTO_MUTEX_unlock_read(&global_added_lock);
       return match;
@@ -473,9 +472,7 @@ int OBJ_obj2txt(char *out, int out_len, const ASN1_OBJECT *obj,
   return ret;
 }
 
-static uint32_t hash_nid(const ASN1_OBJECT *obj) {
-  return obj->nid;
-}
+static uint32_t hash_nid(const ASN1_OBJECT *obj) { return obj->nid; }
 
 static int cmp_nid(const ASN1_OBJECT *a, const ASN1_OBJECT *b) {
   return a->nid - b->nid;
@@ -519,13 +516,14 @@ static int obj_add_object(ASN1_OBJECT *obj) {
         lh_ASN1_OBJECT_new(hash_short_name, cmp_short_name);
   }
   if (global_added_by_long_name == NULL) {
-    global_added_by_long_name = lh_ASN1_OBJECT_new(hash_long_name, cmp_long_name);
+    global_added_by_long_name =
+        lh_ASN1_OBJECT_new(hash_long_name, cmp_long_name);
   }
 
   int ok = 0;
-  if (global_added_by_nid == NULL ||
-      global_added_by_data == NULL ||
-      global_added_by_short_name == NULL ||
+  if (global_added_by_nid == NULL ||         //
+      global_added_by_data == NULL ||        //
+      global_added_by_short_name == NULL ||  //
       global_added_by_long_name == NULL) {
     goto err;
   }
@@ -554,8 +552,7 @@ err:
 int OBJ_create(const char *oid, const char *short_name, const char *long_name) {
   ASN1_OBJECT *op =
       create_object_with_text_oid(obj_next_nid, oid, short_name, long_name);
-  if (op == NULL ||
-      !obj_add_object(op)) {
+  if (op == NULL || !obj_add_object(op)) {
     return NID_undef;
   }
   return op->nid;

data/third_party/boringssl-with-bazel/src/crypto/pem/{pem_info.c → pem_info.cc}

@@ -71,7 +71,7 @@
 
 
 static X509_PKEY *X509_PKEY_new(void) {
-  return OPENSSL_zalloc(sizeof(X509_PKEY));
+  return reinterpret_cast<X509_PKEY *>(OPENSSL_zalloc(sizeof(X509_PKEY)));
 }
 
 static void X509_PKEY_free(X509_PKEY *x) {
@@ -84,7 +84,7 @@ static void X509_PKEY_free(X509_PKEY *x) {
 }
 
 static X509_INFO *X509_INFO_new(void) {
-  return OPENSSL_zalloc(sizeof(X509_INFO));
+  return reinterpret_cast<X509_INFO *>(OPENSSL_zalloc(sizeof(X509_INFO)));
 }
 
 void X509_INFO_free(X509_INFO *x) {

data/third_party/boringssl-with-bazel/src/crypto/pem/{pem_lib.c → pem_lib.cc}

@@ -467,8 +467,7 @@ int PEM_get_EVP_CIPHER_INFO(char *header, EVP_CIPHER_INFO *cipher) {
   p = header;
   for (;;) {
     c = *header;
-    if (!((c >= 'A' && c <= 'Z') || c == '-' ||
-          OPENSSL_isdigit(c))) {
+    if (!((c >= 'A' && c <= 'Z') || c == '-' || OPENSSL_isdigit(c))) {
       break;
     }
     header++;
@@ -553,7 +552,7 @@ int PEM_write_bio(BIO *bp, const char *name, const char *header,
     }
   }
 
-  buf = OPENSSL_malloc(PEM_BUFSIZE * 8);
+  buf = reinterpret_cast<uint8_t *>(OPENSSL_malloc(PEM_BUFSIZE * 8));
   if (buf == NULL) {
     goto err;
   }
@@ -784,6 +783,6 @@ int PEM_def_callback(char *buf, int size, int rwflag, void *userdata) {
   if (len >= (size_t)size) {
     return -1;
   }
-  OPENSSL_strlcpy(buf, userdata, (size_t)size);
+  OPENSSL_strlcpy(buf, reinterpret_cast<char *>(userdata), (size_t)size);
   return (int)len;
 }

data/third_party/boringssl-with-bazel/src/crypto/pem/{pem_oth.c → pem_oth.cc}

@@ -78,7 +78,7 @@ void *PEM_ASN1_read_bio(d2i_of_void *d2i, const char *name, BIO *bp, void **x,
     return NULL;
   }
   p = data;
-  ret = d2i(x, &p, len);
+  ret = reinterpret_cast<char *>(d2i(x, &p, len));
   if (ret == NULL) {
     OPENSSL_PUT_ERROR(PEM, ERR_R_ASN1_LIB);
   }

data/third_party/boringssl-with-bazel/src/crypto/pkcs7/internal.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2017, Google Inc.
+/* Copyright 2017 The BoringSSL Authors
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

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

@@ -1,4 +1,4 @@
-/* Copyright (c) 2014, Google Inc.
+/* Copyright 2014 The BoringSSL Authors
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -20,8 +20,8 @@
 #include <openssl/pool.h>
 #include <openssl/stack.h>
 
-#include "internal.h"
 #include "../bytestring/internal.h"
+#include "internal.h"
 
 
 // 1.2.840.113549.1.7.1
@@ -109,8 +109,7 @@ int PKCS7_get_raw_certificates(STACK_OF(CRYPTO_BUFFER) *out_certs, CBS *cbs,
     }
 
     CRYPTO_BUFFER *buf = CRYPTO_BUFFER_new_from_CBS(&cert, pool);
-    if (buf == NULL ||
-        !sk_CRYPTO_BUFFER_push(out_certs, buf)) {
+    if (buf == NULL || !sk_CRYPTO_BUFFER_push(out_certs, buf)) {
       CRYPTO_BUFFER_free(buf);
       goto err;
     }
@@ -132,7 +131,8 @@ err:
 }
 
 static int pkcs7_bundle_raw_certificates_cb(CBB *out, const void *arg) {
-  const STACK_OF(CRYPTO_BUFFER) *certs = arg;
+  const STACK_OF(CRYPTO_BUFFER) *certs =
+      reinterpret_cast<const STACK_OF(CRYPTO_BUFFER) *>(arg);
   CBB certificates;
 
   // See https://tools.ietf.org/html/rfc2315#section-9.1

data/third_party/boringssl-with-bazel/src/crypto/pkcs7/{pkcs7_x509.c → pkcs7_x509.cc}

@@ -1,4 +1,4 @@
-/* Copyright (c) 2017, Google Inc.
+/* Copyright 2017 The BoringSSL Authors
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -26,24 +26,22 @@
 #include <openssl/stack.h>
 #include <openssl/x509.h>
 
-#include "internal.h"
 #include "../internal.h"
+#include "internal.h"
 
 
 int PKCS7_get_certificates(STACK_OF(X509) *out_certs, CBS *cbs) {
   int ret = 0;
   const size_t initial_certs_len = sk_X509_num(out_certs);
   STACK_OF(CRYPTO_BUFFER) *raw = sk_CRYPTO_BUFFER_new_null();
-  if (raw == NULL ||
-      !PKCS7_get_raw_certificates(raw, cbs, NULL)) {
+  if (raw == NULL || !PKCS7_get_raw_certificates(raw, cbs, NULL)) {
     goto err;
   }
 
   for (size_t i = 0; i < sk_CRYPTO_BUFFER_num(raw); i++) {
     CRYPTO_BUFFER *buf = sk_CRYPTO_BUFFER_value(raw, i);
     X509 *x509 = X509_parse_from_buffer(buf);
-    if (x509 == NULL ||
-        !sk_X509_push(out_certs, x509)) {
+    if (x509 == NULL || !sk_X509_push(out_certs, x509)) {
       X509_free(x509);
       goto err;
     }
@@ -171,7 +169,7 @@ int PKCS7_get_PEM_CRLs(STACK_OF(X509_CRL) *out_crls, BIO *pem_bio) {
 }
 
 static int pkcs7_bundle_certificates_cb(CBB *out, const void *arg) {
-  const STACK_OF(X509) *certs = arg;
+  const STACK_OF(X509) *certs = reinterpret_cast<const STACK_OF(X509) *>(arg);
   size_t i;
   CBB certificates;
 
@@ -186,8 +184,7 @@ static int pkcs7_bundle_certificates_cb(CBB *out, const void *arg) {
     uint8_t *buf;
     int len = i2d_X509(x509, NULL);
 
-    if (len < 0 ||
-        !CBB_add_space(&certificates, &buf, len) ||
+    if (len < 0 || !CBB_add_space(&certificates, &buf, len) ||
         i2d_X509(x509, &buf) < 0) {
       return 0;
     }
@@ -204,7 +201,8 @@ int PKCS7_bundle_certificates(CBB *out, const STACK_OF(X509) *certs) {
 }
 
 static int pkcs7_bundle_crls_cb(CBB *out, const void *arg) {
-  const STACK_OF(X509_CRL) *crls = arg;
+  const STACK_OF(X509_CRL) *crls =
+      reinterpret_cast<const STACK_OF(X509_CRL) *>(arg);
   size_t i;
   CBB crl_data;
 
@@ -219,8 +217,7 @@ static int pkcs7_bundle_crls_cb(CBB *out, const void *arg) {
     uint8_t *buf;
     int len = i2d_X509_CRL(crl, NULL);
 
-    if (len < 0 ||
-        !CBB_add_space(&crl_data, &buf, len) ||
+    if (len < 0 || !CBB_add_space(&crl_data, &buf, len) ||
         i2d_X509_CRL(crl, &buf) < 0) {
       return 0;
     }
@@ -237,18 +234,19 @@ int PKCS7_bundle_CRLs(CBB *out, const STACK_OF(X509_CRL) *crls) {
 }
 
 static PKCS7 *pkcs7_new(CBS *cbs) {
-  PKCS7 *ret = OPENSSL_zalloc(sizeof(PKCS7));
+  CBS copy = *cbs, copy2 = *cbs;
+  PKCS7 *ret = reinterpret_cast<PKCS7 *>(OPENSSL_zalloc(sizeof(PKCS7)));
   if (ret == NULL) {
     return NULL;
   }
   ret->type = OBJ_nid2obj(NID_pkcs7_signed);
-  ret->d.sign = OPENSSL_malloc(sizeof(PKCS7_SIGNED));
+  ret->d.sign =
+      reinterpret_cast<PKCS7_SIGNED *>(OPENSSL_malloc(sizeof(PKCS7_SIGNED)));
   if (ret->d.sign == NULL) {
     goto err;
   }
   ret->d.sign->cert = sk_X509_new_null();
   ret->d.sign->crl = sk_X509_CRL_new_null();
-  CBS copy = *cbs, copy2 = *cbs;
   if (ret->d.sign->cert == NULL || ret->d.sign->crl == NULL ||
       !PKCS7_get_certificates(ret->d.sign->cert, &copy) ||
       !PKCS7_get_CRLs(ret->d.sign->crl, cbs)) {
@@ -266,7 +264,8 @@ static PKCS7 *pkcs7_new(CBS *cbs) {
   }
 
   ret->ber_len = CBS_len(&copy2) - CBS_len(cbs);
-  ret->ber_bytes = OPENSSL_memdup(CBS_data(&copy2), ret->ber_len);
+  ret->ber_bytes = reinterpret_cast<uint8_t *>(
+      OPENSSL_memdup(CBS_data(&copy2), ret->ber_len));
   if (ret->ber_bytes == NULL) {
     goto err;
   }
@@ -278,8 +277,7 @@ err:
   return NULL;
 }
 
-PKCS7 *d2i_PKCS7(PKCS7 **out, const uint8_t **inp,
-                 size_t len) {
+PKCS7 *d2i_PKCS7(PKCS7 **out, const uint8_t **inp, size_t len) {
   CBS cbs;
   CBS_init(&cbs, *inp, len);
   PKCS7 *ret = pkcs7_new(&cbs);
@@ -325,7 +323,8 @@ int i2d_PKCS7(const PKCS7 *p7, uint8_t **out) {
   }
 
   if (*out == NULL) {
-    *out = OPENSSL_memdup(p7->ber_bytes, p7->ber_len);
+    *out =
+        reinterpret_cast<uint8_t *>(OPENSSL_memdup(p7->ber_bytes, p7->ber_len));
     if (*out == NULL) {
       return -1;
     }
@@ -382,7 +381,7 @@ static int write_sha256_ai(CBB *digest_algos_set, const void *arg) {
 static int sign_sha256(uint8_t *out_sig, size_t *out_sig_len,
                        size_t max_out_sig, EVP_PKEY *pkey, BIO *data) {
   static const size_t kBufSize = 4096;
-  uint8_t *buffer = OPENSSL_malloc(kBufSize);
+  uint8_t *buffer = reinterpret_cast<uint8_t *>(OPENSSL_malloc(kBufSize));
   if (!buffer) {
     return 0;
   }
@@ -427,7 +426,8 @@ struct signer_info_data {
 // https://datatracker.ietf.org/doc/html/rfc2315#section-9.2 to |out|. It
 // returns one on success or zero on error.
 static int write_signer_info(CBB *out, const void *arg) {
-  const struct signer_info_data *const si_data = arg;
+  const struct signer_info_data *const si_data =
+      reinterpret_cast<const struct signer_info_data *>(arg);
 
   int ret = 0;
   uint8_t *subject_bytes = NULL;
@@ -440,8 +440,7 @@ static int write_signer_info(CBB *out, const void *arg) {
       &serial_bytes);
 
   CBB seq, issuer_and_serial, signing_algo, null, signature;
-  if (subject_len < 0 ||
-      serial_len < 0 ||
+  if (subject_len < 0 || serial_len < 0 ||
       !CBB_add_asn1(out, &seq, CBS_ASN1_SEQUENCE) ||
       // version
       !CBB_add_asn1_uint64(&seq, 1) ||
@@ -490,8 +489,10 @@ PKCS7 *PKCS7_sign(X509 *sign_cert, EVP_PKEY *pkey, STACK_OF(X509) *certs,
     // sign-file.c from the Linux kernel.
     const size_t signature_max_len = EVP_PKEY_size(pkey);
     struct signer_info_data si_data = {
-      .sign_cert = sign_cert,
-      .signature = OPENSSL_malloc(signature_max_len),
+        /*sign_cert=*/sign_cert,
+        /*signature=*/
+        reinterpret_cast<uint8_t *>(OPENSSL_malloc(signature_max_len)),
+        /*signature_len=*/0,
     };
 
     if (!si_data.signature ||

data/third_party/boringssl-with-bazel/src/crypto/pkcs8/internal.h

@@ -1,5 +1,5 @@
-/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
- * project 1999.
+/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
+ * 1999.
  */
 /* ====================================================================
  * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.

data/third_party/boringssl-with-bazel/src/crypto/pkcs8/{p5_pbev2.c → p5_pbev2.cc}

@@ -1,5 +1,5 @@
-/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
- * project 1999-2004.
+/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
+ * 1999-2004.
  */
 /* ====================================================================
  * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.