grpc 1.84.0 → 1.85.0.pre1

data/third_party/boringssl-with-bazel/crypto/pem/pem_oth.cc

@@ -27,17 +27,17 @@
 
 void *PEM_ASN1_read_bio(d2i_of_void *d2i, const char *name, BIO *bp, void **x,
                         pem_password_cb *cb, void *u) {
-  const unsigned char *p = NULL;
-  unsigned char *data = NULL;
+  const unsigned char *p = nullptr;
+  unsigned char *data = nullptr;
   long len;
-  char *ret = NULL;
+  char *ret = nullptr;
 
-  if (!PEM_bytes_read_bio(&data, &len, NULL, name, bp, cb, u)) {
-    return NULL;
+  if (!PEM_bytes_read_bio(&data, &len, nullptr, name, bp, cb, u)) {
+    return nullptr;
   }
   p = data;
   ret = reinterpret_cast<char *>(d2i(x, &p, len));
-  if (ret == NULL) {
+  if (ret == nullptr) {
     OPENSSL_PUT_ERROR(PEM, ERR_R_ASN1_LIB);
   }
   OPENSSL_free(data);

data/third_party/boringssl-with-bazel/crypto/pem/pem_pk8.cc

@@ -37,7 +37,7 @@ static int do_pk8pkey_fp(FILE *bp, const EVP_PKEY *x, int isder, int nid,
 int PEM_write_bio_PKCS8PrivateKey_nid(BIO *bp, const EVP_PKEY *x, int nid,
                                       const char *pass, int pass_len,
                                       pem_password_cb *cb, void *u) {
-  return do_pk8pkey(bp, x, 0, nid, NULL, pass, pass_len, cb, u);
+  return do_pk8pkey(bp, x, 0, nid, nullptr, pass, pass_len, cb, u);
 }
 
 int PEM_write_bio_PKCS8PrivateKey(BIO *bp, const EVP_PKEY *x,
@@ -55,7 +55,7 @@ int i2d_PKCS8PrivateKey_bio(BIO *bp, const EVP_PKEY *x, const EVP_CIPHER *enc,
 int i2d_PKCS8PrivateKey_nid_bio(BIO *bp, const EVP_PKEY *x, int nid,
                                 const char *pass, int pass_len,
                                 pem_password_cb *cb, void *u) {
-  return do_pk8pkey(bp, x, 1, nid, NULL, pass, pass_len, cb, u);
+  return do_pk8pkey(bp, x, 1, nid, nullptr, pass, pass_len, cb, u);
 }
 
 static int do_pk8pkey(BIO *bp, const EVP_PKEY *x, int isder, int nid,
@@ -83,7 +83,7 @@ static int do_pk8pkey(BIO *bp, const EVP_PKEY *x, int isder, int nid,
 
       pass = buf;
     }
-    p8 = PKCS8_encrypt(nid, enc, pass, pass_len, NULL, 0, 0, p8inf);
+    p8 = PKCS8_encrypt(nid, enc, pass, pass_len, nullptr, 0, 0, p8inf);
     if (pass == buf) {
       OPENSSL_cleanse(buf, pass_len);
     }
@@ -108,14 +108,14 @@ static int do_pk8pkey(BIO *bp, const EVP_PKEY *x, int isder, int nid,
 
 EVP_PKEY *d2i_PKCS8PrivateKey_bio(BIO *bp, EVP_PKEY **x, pem_password_cb *cb,
                                   void *u) {
-  PKCS8_PRIV_KEY_INFO *p8inf = NULL;
-  X509_SIG *p8 = NULL;
+  PKCS8_PRIV_KEY_INFO *p8inf = nullptr;
+  X509_SIG *p8 = nullptr;
   int pass_len;
   EVP_PKEY *ret;
   char psbuf[PEM_BUFSIZE];
-  p8 = d2i_PKCS8_bio(bp, NULL);
+  p8 = d2i_PKCS8_bio(bp, nullptr);
   if (!p8) {
-    return NULL;
+    return nullptr;
   }
 
   pass_len = 0;
@@ -126,18 +126,18 @@ EVP_PKEY *d2i_PKCS8PrivateKey_bio(BIO *bp, EVP_PKEY **x, pem_password_cb *cb,
   if (pass_len < 0) {
     OPENSSL_PUT_ERROR(PEM, PEM_R_BAD_PASSWORD_READ);
     X509_SIG_free(p8);
-    return NULL;
+    return nullptr;
   }
   p8inf = PKCS8_decrypt(p8, psbuf, pass_len);
   X509_SIG_free(p8);
   OPENSSL_cleanse(psbuf, pass_len);
   if (!p8inf) {
-    return NULL;
+    return nullptr;
   }
   ret = EVP_PKCS82PKEY(p8inf);
   PKCS8_PRIV_KEY_INFO_free(p8inf);
   if (!ret) {
-    return NULL;
+    return nullptr;
   }
   if (x) {
     if (*x) {
@@ -158,13 +158,13 @@ int i2d_PKCS8PrivateKey_fp(FILE *fp, const EVP_PKEY *x, const EVP_CIPHER *enc,
 int i2d_PKCS8PrivateKey_nid_fp(FILE *fp, const EVP_PKEY *x, int nid,
                                const char *pass, int pass_len,
                                pem_password_cb *cb, void *u) {
-  return do_pk8pkey_fp(fp, x, 1, nid, NULL, pass, pass_len, cb, u);
+  return do_pk8pkey_fp(fp, x, 1, nid, nullptr, pass, pass_len, cb, u);
 }
 
 int PEM_write_PKCS8PrivateKey_nid(FILE *fp, const EVP_PKEY *x, int nid,
                                   const char *pass, int pass_len,
                                   pem_password_cb *cb, void *u) {
-  return do_pk8pkey_fp(fp, x, 0, nid, NULL, pass, pass_len, cb, u);
+  return do_pk8pkey_fp(fp, x, 0, nid, nullptr, pass, pass_len, cb, u);
 }
 
 int PEM_write_PKCS8PrivateKey(FILE *fp, const EVP_PKEY *x,
@@ -193,7 +193,7 @@ EVP_PKEY *d2i_PKCS8PrivateKey_fp(FILE *fp, EVP_PKEY **x, pem_password_cb *cb,
   EVP_PKEY *ret;
   if (!(bp = BIO_new_fp(fp, BIO_NOCLOSE))) {
     OPENSSL_PUT_ERROR(PEM, ERR_R_BUF_LIB);
-    return NULL;
+    return nullptr;
   }
   ret = d2i_PKCS8PrivateKey_bio(bp, x, cb, u);
   BIO_free(bp);

data/third_party/boringssl-with-bazel/crypto/pem/pem_pkey.cc

@@ -28,20 +28,20 @@
 
 EVP_PKEY *PEM_read_bio_PrivateKey(BIO *bp, EVP_PKEY **x, pem_password_cb *cb,
                                   void *u) {
-  char *nm = NULL;
-  const unsigned char *p = NULL;
-  unsigned char *data = NULL;
+  char *nm = nullptr;
+  const unsigned char *p = nullptr;
+  unsigned char *data = nullptr;
   long len;
-  EVP_PKEY *ret = NULL;
+  EVP_PKEY *ret = nullptr;
 
   if (!PEM_bytes_read_bio(&data, &len, &nm, PEM_STRING_EVP_PKEY, bp, cb, u)) {
-    return NULL;
+    return nullptr;
   }
   p = data;
 
   if (strcmp(nm, PEM_STRING_PKCS8INF) == 0) {
     PKCS8_PRIV_KEY_INFO *p8inf;
-    p8inf = d2i_PKCS8_PRIV_KEY_INFO(NULL, &p, len);
+    p8inf = d2i_PKCS8_PRIV_KEY_INFO(nullptr, &p, len);
     if (!p8inf) {
       goto p8err;
     }
@@ -58,7 +58,7 @@ EVP_PKEY *PEM_read_bio_PrivateKey(BIO *bp, EVP_PKEY **x, pem_password_cb *cb,
     X509_SIG *p8;
     int pass_len;
     char psbuf[PEM_BUFSIZE];
-    p8 = d2i_X509_SIG(NULL, &p, len);
+    p8 = d2i_X509_SIG(nullptr, &p, len);
     if (!p8) {
       goto p8err;
     }
@@ -98,7 +98,7 @@ EVP_PKEY *PEM_read_bio_PrivateKey(BIO *bp, EVP_PKEY **x, pem_password_cb *cb,
     ret = d2i_PrivateKey(EVP_PKEY_DSA, x, &p, len);
   }
 p8err:
-  if (ret == NULL) {
+  if (ret == nullptr) {
     OPENSSL_PUT_ERROR(PEM, ERR_R_ASN1_LIB);
   }
 
@@ -118,9 +118,9 @@ int PEM_write_bio_PrivateKey(BIO *bp, EVP_PKEY *x, const EVP_CIPHER *enc,
 EVP_PKEY *PEM_read_PrivateKey(FILE *fp, EVP_PKEY **x, pem_password_cb *cb,
                               void *u) {
   BIO *b = BIO_new_fp(fp, BIO_NOCLOSE);
-  if (b == NULL) {
+  if (b == nullptr) {
     OPENSSL_PUT_ERROR(PEM, ERR_R_BUF_LIB);
-    return NULL;
+    return nullptr;
   }
   EVP_PKEY *ret = PEM_read_bio_PrivateKey(b, x, cb, u);
   BIO_free(b);
@@ -131,7 +131,7 @@ int PEM_write_PrivateKey(FILE *fp, EVP_PKEY *x, const EVP_CIPHER *enc,
                          const unsigned char *pass, int pass_len,
                          pem_password_cb *cb, void *u) {
   BIO *b = BIO_new_fp(fp, BIO_NOCLOSE);
-  if (b == NULL) {
+  if (b == nullptr) {
     OPENSSL_PUT_ERROR(PEM, ERR_R_BUF_LIB);
     return 0;
   }

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

@@ -17,22 +17,20 @@
 
 #include <openssl/base.h>
 
-#if defined(__cplusplus)
-extern "C" {
-#endif
 
+BSSL_NAMESPACE_BEGIN
 
 // pkcs7_parse_header reads the non-certificate/non-CRL prefix of a PKCS#7
-// SignedData blob from |cbs| and sets |*out| to point to the rest of the
-// input. If the input is in BER format, then |*der_bytes| will be set to a
+// SignedData blob from `cbs` and sets `*out` to point to the rest of the
+// input. If the input is in BER format, then `*der_bytes` will be set to a
 // pointer that needs to be freed by the caller once they have finished
-// processing |*out| (which will be pointing into |*der_bytes|).
+// processing `*out` (which will be pointing into `*der_bytes`).
 //
-// It returns one on success or zero on error. On error, |*der_bytes| is
+// It returns one on success or zero on error. On error, `*der_bytes` is
 // NULL.
 int pkcs7_parse_header(uint8_t **der_bytes, CBS *out, CBS *cbs);
 
-// pkcs7_add_signed_data writes a PKCS#7, SignedData structure to |out|. While
+// pkcs7_add_signed_data writes a PKCS#7, SignedData structure to `out`. While
 // doing so it makes callbacks to let the caller fill in parts of the structure.
 // All callbacks are ignored if NULL and return one on success or zero on error.
 //
@@ -40,9 +38,9 @@ int pkcs7_parse_header(uint8_t **der_bytes, CBS *out, CBS *cbs);
 //       it is always 1. In CMS, it depends on the features used.
 //   digest_algos_cb: may write AlgorithmIdentifiers into the given CBB, which
 //       is a SET of digest algorithms.
-//   cert_crl_cb: may write the |certificates| or |crls| fields.
+//   cert_crl_cb: may write the `certificates` or `crls` fields.
 //       (See https://datatracker.ietf.org/doc/html/rfc2315#section-9.1)
-//   signer_infos_cb: may write the contents of the |signerInfos| field.
+//   signer_infos_cb: may write the contents of the `signerInfos` field.
 //       (See https://datatracker.ietf.org/doc/html/rfc2315#section-9.1)
 //
 // pkcs7_add_signed_data returns one on success or zero on error.
@@ -53,9 +51,9 @@ int pkcs7_add_signed_data(CBB *out, uint64_t signed_data_version,
                           void *arg);
 
 // pkcs7_add_external_signature writes a PKCS#7 or CMS SignedData structure to
-// |out|, containing an external (i.e. the contents are not included) signature,
-// using |sign_cert| and |key| to sign the contents of |data| with |md|. If
-// |use_key_id| is true (CMS-only), the SignerInfo specifies the signer with key
+// `out`, containing an external (i.e. the contents are not included) signature,
+// using `sign_cert` and `key` to sign the contents of `data` with `md`. If
+// `use_key_id` is true (CMS-only), the SignerInfo specifies the signer with key
 // identifier. Otherwise, it uses issuer and serial number (PKCS#7 or CMS v1).
 // The SignedData will have no embedded certificates and no attributes.
 //
@@ -64,9 +62,6 @@ int pkcs7_add_signed_data(CBB *out, uint64_t signed_data_version,
 int pkcs7_add_external_signature(CBB *out, X509 *sign_cert, EVP_PKEY *key,
                                  const EVP_MD *md, BIO *data, bool use_key_id);
 
-
-#if defined(__cplusplus)
-}  // extern C
-#endif
+BSSL_NAMESPACE_END
 
 #endif  // OPENSSL_HEADER_CRYPTO_PKCS7_INTERNAL_H

data/third_party/boringssl-with-bazel/crypto/pkcs7/pkcs7.cc

@@ -24,6 +24,8 @@
 #include "internal.h"
 
 
+using namespace bssl;
+
 // 1.2.840.113549.1.7.1
 static const uint8_t kPKCS7Data[] = {0x2a, 0x86, 0x48, 0x86, 0xf7,
                                      0x0d, 0x01, 0x07, 0x01};
@@ -33,19 +35,19 @@ static const uint8_t kPKCS7SignedData[] = {0x2a, 0x86, 0x48, 0x86, 0xf7,
                                            0x0d, 0x01, 0x07, 0x02};
 
 // pkcs7_parse_header reads the non-certificate/non-CRL prefix of a PKCS#7
-// SignedData blob from |cbs| and sets |*out| to point to the rest of the
-// input. If the input is in BER format, then |*der_bytes| will be set to a
+// SignedData blob from `cbs` and sets `*out` to point to the rest of the
+// input. If the input is in BER format, then `*der_bytes` will be set to a
 // pointer that needs to be freed by the caller once they have finished
-// processing |*out| (which will be pointing into |*der_bytes|).
+// processing `*out` (which will be pointing into `*der_bytes`).
 //
-// It returns one on success or zero on error. On error, |*der_bytes| is
+// It returns one on success or zero on error. On error, `*der_bytes` is
 // NULL.
-int pkcs7_parse_header(uint8_t **der_bytes, CBS *out, CBS *cbs) {
+int bssl::pkcs7_parse_header(uint8_t **der_bytes, CBS *out, CBS *cbs) {
   CBS in, content_info, content_type, wrapped_signed_data, signed_data;
   uint64_t version;
 
   // The input may be in BER format.
-  *der_bytes = NULL;
+  *der_bytes = nullptr;
   if (!CBS_asn1_ber_to_der(cbs, &in, der_bytes) ||
       // See https://tools.ietf.org/html/rfc2315#section-7
       !CBS_get_asn1(&in, &content_info, CBS_ASN1_SEQUENCE) ||
@@ -64,8 +66,8 @@ int pkcs7_parse_header(uint8_t **der_bytes, CBS *out, CBS *cbs) {
                     CBS_ASN1_CONTEXT_SPECIFIC | CBS_ASN1_CONSTRUCTED | 0) ||
       !CBS_get_asn1(&wrapped_signed_data, &signed_data, CBS_ASN1_SEQUENCE) ||
       !CBS_get_asn1_uint64(&signed_data, &version) ||
-      !CBS_get_asn1(&signed_data, NULL /* digests */, CBS_ASN1_SET) ||
-      !CBS_get_asn1(&signed_data, NULL /* content */, CBS_ASN1_SEQUENCE)) {
+      !CBS_get_asn1(&signed_data, nullptr /* digests */, CBS_ASN1_SET) ||
+      !CBS_get_asn1(&signed_data, nullptr /* content */, CBS_ASN1_SEQUENCE)) {
     goto err;
   }
 
@@ -79,14 +81,14 @@ int pkcs7_parse_header(uint8_t **der_bytes, CBS *out, CBS *cbs) {
 
 err:
   OPENSSL_free(*der_bytes);
-  *der_bytes = NULL;
+  *der_bytes = nullptr;
   return 0;
 }
 
 int PKCS7_get_raw_certificates(STACK_OF(CRYPTO_BUFFER) *out_certs, CBS *cbs,
                                CRYPTO_BUFFER_POOL *pool) {
   CBS signed_data, certificates;
-  uint8_t *der_bytes = NULL;
+  uint8_t *der_bytes = nullptr;
   int ret = 0, has_certificates;
   const size_t initial_certs_len = sk_CRYPTO_BUFFER_num(out_certs);
 
@@ -99,7 +101,7 @@ int PKCS7_get_raw_certificates(STACK_OF(CRYPTO_BUFFER) *out_certs, CBS *cbs,
   }
 
   if (!has_certificates) {
-    CBS_init(&certificates, NULL, 0);
+    CBS_init(&certificates, nullptr, 0);
   }
 
   while (CBS_len(&certificates) > 0) {
@@ -109,7 +111,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 == nullptr || !sk_CRYPTO_BUFFER_push(out_certs, buf)) {
       CRYPTO_BUFFER_free(buf);
       goto err;
     }
@@ -149,7 +151,7 @@ static int pkcs7_bundle_raw_certificates_cb(CBB *out, void *arg) {
     }
   }
 
-  // |certificates| is a implicitly-tagged SET OF.
+  // `certificates` is a implicitly-tagged SET OF.
   return CBB_flush_asn1_set_of(&certificates) && CBB_flush(out);
 }
 
@@ -162,32 +164,32 @@ int PKCS7_bundle_raw_certificates(CBB *out,
                                const_cast<STACK_OF(CRYPTO_BUFFER) *>(certs));
 }
 
-int pkcs7_add_signed_data(CBB *out, uint64_t signed_data_version,
-                          int (*digest_algos_cb)(CBB *out, void *arg),
-                          int (*cert_crl_cb)(CBB *out, void *arg),
-                          int (*signer_infos_cb)(CBB *out, void *arg),
-                          void *arg) {
-  CBB outer_seq, oid, wrapped_seq, seq, digest_algos_set, content_info,
-      signer_infos;
+int bssl::pkcs7_add_signed_data(CBB *out, uint64_t signed_data_version,
+                                int (*digest_algos_cb)(CBB *out, void *arg),
+                                int (*cert_crl_cb)(CBB *out, void *arg),
+                                int (*signer_infos_cb)(CBB *out, void *arg),
+                                void *arg) {
+  CBB outer_seq, wrapped_seq, seq, digest_algos_set, content_info, signer_infos;
 
   // See https://tools.ietf.org/html/rfc2315#section-7
   if (!CBB_add_asn1(out, &outer_seq, CBS_ASN1_SEQUENCE) ||
-      !CBB_add_asn1(&outer_seq, &oid, CBS_ASN1_OBJECT) ||
-      !CBB_add_bytes(&oid, kPKCS7SignedData, sizeof(kPKCS7SignedData)) ||
+      !CBB_add_asn1_element(&outer_seq, CBS_ASN1_OBJECT, kPKCS7SignedData,
+                            sizeof(kPKCS7SignedData)) ||
       !CBB_add_asn1(&outer_seq, &wrapped_seq,
                     CBS_ASN1_CONTEXT_SPECIFIC | CBS_ASN1_CONSTRUCTED | 0) ||
       // See https://tools.ietf.org/html/rfc2315#section-9.1
       !CBB_add_asn1(&wrapped_seq, &seq, CBS_ASN1_SEQUENCE) ||
       !CBB_add_asn1_uint64(&seq, signed_data_version) ||
       !CBB_add_asn1(&seq, &digest_algos_set, CBS_ASN1_SET) ||
-      (digest_algos_cb != NULL && !digest_algos_cb(&digest_algos_set, arg)) ||
+      (digest_algos_cb != nullptr &&
+       !digest_algos_cb(&digest_algos_set, arg)) ||
       !CBB_flush_asn1_set_of(&digest_algos_set) ||
       !CBB_add_asn1(&seq, &content_info, CBS_ASN1_SEQUENCE) ||
-      !CBB_add_asn1(&content_info, &oid, CBS_ASN1_OBJECT) ||
-      !CBB_add_bytes(&oid, kPKCS7Data, sizeof(kPKCS7Data)) ||
-      (cert_crl_cb != NULL && !cert_crl_cb(&seq, arg)) ||
+      !CBB_add_asn1_element(&content_info, CBS_ASN1_OBJECT, kPKCS7Data,
+                            sizeof(kPKCS7Data)) ||
+      (cert_crl_cb != nullptr && !cert_crl_cb(&seq, arg)) ||
       !CBB_add_asn1(&seq, &signer_infos, CBS_ASN1_SET) ||
-      (signer_infos_cb != NULL && !signer_infos_cb(&signer_infos, arg)) ||
+      (signer_infos_cb != nullptr && !signer_infos_cb(&signer_infos, arg)) ||
       !CBB_flush_asn1_set_of(&signer_infos)) {
     return 0;
   }