grpc 1.69.0 → 1.71.0

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

@@ -1,70 +1,29 @@
-/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
- * project 1999.
- */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com). */
+// Copyright 1999-2016 The OpenSSL Project Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 #include <openssl/pkcs8.h>
 
 #include <limits.h>
 
-#include <openssl/asn1t.h>
 #include <openssl/asn1.h>
+#include <openssl/asn1t.h>
 #include <openssl/bio.h>
 #include <openssl/buf.h>
 #include <openssl/bytestring.h>
+#include <openssl/digest.h>
 #include <openssl/err.h>
 #include <openssl/evp.h>
-#include <openssl/digest.h>
 #include <openssl/hmac.h>
 #include <openssl/mem.h>
 #include <openssl/rand.h>
@@ -126,13 +85,12 @@ PKCS8_PRIV_KEY_INFO *EVP_PKEY2PKCS8(const EVP_PKEY *pkey) {
   CBB cbb;
   uint8_t *der = NULL;
   size_t der_len;
-  if (!CBB_init(&cbb, 0) ||
-      !EVP_marshal_private_key(&cbb, pkey) ||
-      !CBB_finish(&cbb, &der, &der_len) ||
-      der_len > LONG_MAX) {
+  if (!CBB_init(&cbb, 0) || !EVP_marshal_private_key(&cbb, pkey) ||
+      !CBB_finish(&cbb, &der, &der_len) || der_len > LONG_MAX) {
     CBB_cleanup(&cbb);
     OPENSSL_PUT_ERROR(PKCS8, PKCS8_R_ENCODE_ERROR);
-    goto err;
+    OPENSSL_free(der);
+    return NULL;
   }
 
   const uint8_t *p = der;
@@ -203,6 +161,7 @@ X509_SIG *PKCS8_encrypt(int pbe_nid, const EVP_CIPHER *cipher, const char *pass,
 
   X509_SIG *ret = NULL;
   uint8_t *der = NULL;
+  const uint8_t *ptr;
   size_t der_len;
   CBB cbb;
   if (!CBB_init(&cbb, 128) ||
@@ -215,7 +174,7 @@ X509_SIG *PKCS8_encrypt(int pbe_nid, const EVP_CIPHER *cipher, const char *pass,
   }
 
   // Convert back to legacy ASN.1 objects.
-  const uint8_t *ptr = der;
+  ptr = der;
   ret = d2i_X509_SIG(NULL, &ptr, der_len);
   if (ret == NULL || ptr != der + der_len) {
     OPENSSL_PUT_ERROR(PKCS8, ERR_R_INTERNAL_ERROR);
@@ -255,8 +214,7 @@ static int PKCS12_handle_sequence(
   }
 
   CBS child;
-  if (!CBS_get_asn1(&in, &child, CBS_ASN1_SEQUENCE) ||
-      CBS_len(&in) != 0) {
+  if (!CBS_get_asn1(&in, &child, CBS_ASN1_SEQUENCE) || CBS_len(&in) != 0) {
     OPENSSL_PUT_ERROR(PKCS8, PKCS8_R_BAD_PKCS12_DATA);
     goto err;
   }
@@ -318,8 +276,7 @@ static int parse_bag_attributes(CBS *attrs, uint8_t **out_friendly_name,
     CBS attr, oid, values;
     if (!CBS_get_asn1(attrs, &attr, CBS_ASN1_SEQUENCE) ||
         !CBS_get_asn1(&attr, &oid, CBS_ASN1_OBJECT) ||
-        !CBS_get_asn1(&attr, &values, CBS_ASN1_SET) ||
-        CBS_len(&attr) != 0) {
+        !CBS_get_asn1(&attr, &values, CBS_ASN1_SET) || CBS_len(&attr) != 0) {
       OPENSSL_PUT_ERROR(PKCS8, PKCS8_R_BAD_PKCS12_DATA);
       goto err;
     }
@@ -328,8 +285,7 @@ static int parse_bag_attributes(CBS *attrs, uint8_t **out_friendly_name,
       CBS value;
       if (*out_friendly_name != NULL ||
           !CBS_get_asn1(&values, &value, CBS_ASN1_BMPSTRING) ||
-          CBS_len(&values) != 0 ||
-          CBS_len(&value) == 0) {
+          CBS_len(&values) != 0 || CBS_len(&value) == 0) {
         OPENSSL_PUT_ERROR(PKCS8, PKCS8_R_BAD_PKCS12_DATA);
         goto err;
       }
@@ -340,8 +296,7 @@ static int parse_bag_attributes(CBS *attrs, uint8_t **out_friendly_name,
       }
       while (CBS_len(&value) != 0) {
         uint32_t c;
-        if (!CBS_get_ucs2_be(&value, &c) ||
-            !CBB_add_utf8(&cbb, c)) {
+        if (!CBS_get_ucs2_be(&value, &c) || !CBB_add_utf8(&cbb, c)) {
           OPENSSL_PUT_ERROR(PKCS8, PKCS8_R_INVALID_CHARACTERS);
           CBB_cleanup(&cbb);
           goto err;
@@ -454,8 +409,7 @@ static int PKCS12_handle_safe_bag(CBS *safe_bag, struct pkcs12_context *ctx) {
     int ok = friendly_name_len == 0 ||
              X509_alias_set1(x509, friendly_name, friendly_name_len);
     OPENSSL_free(friendly_name);
-    if (!ok ||
-        0 == sk_X509_push(ctx->out_certs, x509)) {
+    if (!ok || 0 == sk_X509_push(ctx->out_certs, x509)) {
       X509_free(x509);
       return 0;
     }
@@ -485,7 +439,7 @@ static int PKCS12_handle_content_info(CBS *content_info,
 
   if (!CBS_get_asn1(content_info, &content_type, CBS_ASN1_OBJECT) ||
       !CBS_get_asn1(content_info, &wrapped_contents,
-                        CBS_ASN1_CONTEXT_SPECIFIC | CBS_ASN1_CONSTRUCTED | 0) ||
+                    CBS_ASN1_CONTEXT_SPECIFIC | CBS_ASN1_CONSTRUCTED | 0) ||
       CBS_len(content_info) != 0) {
     OPENSSL_PUT_ERROR(PKCS8, PKCS8_R_BAD_PKCS12_DATA);
     goto err;
@@ -511,9 +465,9 @@ static int PKCS12_handle_content_info(CBS *content_info,
         // AlgorithmIdentifier, see
         // https://tools.ietf.org/html/rfc5280#section-4.1.1.2
         !CBS_get_asn1(&eci, &ai, CBS_ASN1_SEQUENCE) ||
-        !CBS_get_asn1_implicit_string(
-            &eci, &encrypted_contents, &storage,
-            CBS_ASN1_CONTEXT_SPECIFIC | 0, CBS_ASN1_OCTETSTRING)) {
+        !CBS_get_asn1_implicit_string(&eci, &encrypted_contents, &storage,
+                                      CBS_ASN1_CONTEXT_SPECIFIC | 0,
+                                      CBS_ASN1_OCTETSTRING)) {
       OPENSSL_PUT_ERROR(PKCS8, PKCS8_R_BAD_PKCS12_DATA);
       goto err;
     }
@@ -605,8 +559,7 @@ int PKCS12_get_key_and_certs(EVP_PKEY **out_key, STACK_OF(X509) *out_certs,
 
   // See ftp://ftp.rsasecurity.com/pub/pkcs/pkcs-12/pkcs-12v1.pdf, section
   // four.
-  if (!CBS_get_asn1(&in, &pfx, CBS_ASN1_SEQUENCE) ||
-      CBS_len(&in) != 0 ||
+  if (!CBS_get_asn1(&in, &pfx, CBS_ASN1_SEQUENCE) || CBS_len(&in) != 0 ||
       !CBS_get_asn1_uint64(&pfx, &version)) {
     OPENSSL_PUT_ERROR(PKCS8, PKCS8_R_BAD_PKCS12_DATA);
     goto err;
@@ -636,7 +589,7 @@ int PKCS12_get_key_and_certs(EVP_PKEY **out_key, STACK_OF(X509) *out_certs,
   // https://tools.ietf.org/html/rfc2315#section-7.
   if (!CBS_get_asn1(&authsafe, &content_type, CBS_ASN1_OBJECT) ||
       !CBS_get_asn1(&authsafe, &wrapped_authsafes,
-                        CBS_ASN1_CONTEXT_SPECIFIC | CBS_ASN1_CONSTRUCTED | 0)) {
+                    CBS_ASN1_CONTEXT_SPECIFIC | CBS_ASN1_CONSTRUCTED | 0)) {
     OPENSSL_PUT_ERROR(PKCS8, PKCS8_R_BAD_PKCS12_DATA);
     goto err;
   }
@@ -742,12 +695,13 @@ struct pkcs12_st {
 
 PKCS12 *d2i_PKCS12(PKCS12 **out_p12, const uint8_t **ber_bytes,
                    size_t ber_len) {
-  PKCS12 *p12 = OPENSSL_malloc(sizeof(PKCS12));
+  PKCS12 *p12 = reinterpret_cast<PKCS12 *>(OPENSSL_malloc(sizeof(PKCS12)));
   if (!p12) {
     return NULL;
   }
 
-  p12->ber_bytes = OPENSSL_memdup(*ber_bytes, ber_len);
+  p12->ber_bytes =
+      reinterpret_cast<uint8_t *>(OPENSSL_memdup(*ber_bytes, ber_len));
   if (!p12->ber_bytes) {
     OPENSSL_free(p12);
     return NULL;
@@ -764,7 +718,7 @@ PKCS12 *d2i_PKCS12(PKCS12 **out_p12, const uint8_t **ber_bytes,
   return p12;
 }
 
-PKCS12* d2i_PKCS12_bio(BIO *bio, PKCS12 **out_p12) {
+PKCS12 *d2i_PKCS12_bio(BIO *bio, PKCS12 **out_p12) {
   size_t used = 0;
   BUF_MEM *buf;
   const uint8_t *dummy;
@@ -801,13 +755,12 @@ PKCS12* d2i_PKCS12_bio(BIO *bio, PKCS12 **out_p12) {
       continue;
     }
 
-    if (buf->length > kMaxSize ||
-        BUF_MEM_grow(buf, buf->length * 2) == 0) {
+    if (buf->length > kMaxSize || BUF_MEM_grow(buf, buf->length * 2) == 0) {
       goto out;
     }
   }
 
-  dummy = (uint8_t*) buf->data;
+  dummy = (uint8_t *)buf->data;
   ret = d2i_PKCS12(out_p12, &dummy, used);
 
 out:
@@ -815,7 +768,7 @@ out:
   return ret;
 }
 
-PKCS12* d2i_PKCS12_fp(FILE *fp, PKCS12 **out_p12) {
+PKCS12 *d2i_PKCS12_fp(FILE *fp, PKCS12 **out_p12) {
   BIO *bio;
   PKCS12 *ret;
 
@@ -840,7 +793,8 @@ int i2d_PKCS12(const PKCS12 *p12, uint8_t **out) {
   }
 
   if (*out == NULL) {
-    *out = OPENSSL_memdup(p12->ber_bytes, p12->ber_len);
+    *out = reinterpret_cast<uint8_t *>(
+        OPENSSL_memdup(p12->ber_bytes, p12->ber_len));
     if (*out == NULL) {
       return -1;
     }
@@ -968,8 +922,7 @@ static int add_bag_attributes(CBB *bag, const char *name, size_t name_len,
     CBS_init(&name_cbs, (const uint8_t *)name, name_len);
     while (CBS_len(&name_cbs) != 0) {
       uint32_t c;
-      if (!CBS_get_utf8(&name_cbs, &c) ||
-          !CBB_add_ucs2_be(&value, c)) {
+      if (!CBS_get_utf8(&name_cbs, &c) || !CBB_add_ucs2_be(&value, c)) {
         OPENSSL_PUT_ERROR(PKCS8, PKCS8_R_INVALID_CHARACTERS);
         return 0;
       }
@@ -986,14 +939,13 @@ static int add_bag_attributes(CBB *bag, const char *name, size_t name_len,
       return 0;
     }
   }
-  return CBB_flush_asn1_set_of(&attrs) &&
-         CBB_flush(bag);
+  return CBB_flush_asn1_set_of(&attrs) && CBB_flush(bag);
 }
 
 static int add_cert_bag(CBB *cbb, X509 *cert, const char *name,
                         const uint8_t *key_id, size_t key_id_len) {
   CBB bag, bag_oid, bag_contents, cert_bag, cert_type, wrapped_cert, cert_value;
-  if (// See https://tools.ietf.org/html/rfc7292#section-4.2.
+  if (  // See https://tools.ietf.org/html/rfc7292#section-4.2.
       !CBB_add_asn1(cbb, &bag, CBS_ASN1_SEQUENCE) ||
       !CBB_add_asn1(&bag, &bag_oid, CBS_ASN1_OBJECT) ||
       !CBB_add_bytes(&bag_oid, kCertBag, sizeof(kCertBag)) ||
@@ -1024,8 +976,7 @@ static int add_cert_bag(CBB *cbb, X509 *cert, const char *name,
     name = cert_name;
   }
 
-  if (len < 0 ||
-      !CBB_add_space(&cert_value, &buf, (size_t)len) ||
+  if (len < 0 || !CBB_add_space(&cert_value, &buf, (size_t)len) ||
       i2d_X509(cert, &buf) < 0 ||
       !add_bag_attributes(&bag, name, name_len, key_id, key_id_len) ||
       !CBB_flush(cbb)) {
@@ -1067,7 +1018,7 @@ static int add_encrypted_data(CBB *out, int pbe_nid, const char *password,
   EVP_CIPHER_CTX_init(&ctx);
   CBB content_info, type, wrapper, encrypted_data, encrypted_content_info,
       inner_type, encrypted_content;
-  if (// Add the ContentInfo wrapping.
+  if (  // Add the ContentInfo wrapping.
       !CBB_add_asn1(out, &content_info, CBS_ASN1_SEQUENCE) ||
       !CBB_add_asn1(&content_info, &type, CBS_ASN1_OBJECT) ||
       !CBB_add_bytes(&type, kPKCS7EncryptedData, sizeof(kPKCS7EncryptedData)) ||
@@ -1092,20 +1043,21 @@ static int add_encrypted_data(CBB *out, int pbe_nid, const char *password,
     goto err;
   }
 
-  size_t max_out = in_len + EVP_CIPHER_CTX_block_size(&ctx);
-  if (max_out < in_len) {
-    OPENSSL_PUT_ERROR(PKCS8, PKCS8_R_TOO_LONG);
-    goto err;
-  }
+  {
+    size_t max_out = in_len + EVP_CIPHER_CTX_block_size(&ctx);
+    if (max_out < in_len) {
+      OPENSSL_PUT_ERROR(PKCS8, PKCS8_R_TOO_LONG);
+      goto err;
+    }
 
-  uint8_t *ptr;
-  int n1, n2;
-  if (!CBB_reserve(&encrypted_content, &ptr, max_out) ||
-      !EVP_CipherUpdate(&ctx, ptr, &n1, in, in_len) ||
-      !EVP_CipherFinal_ex(&ctx, ptr + n1, &n2) ||
-      !CBB_did_write(&encrypted_content, n1 + n2) ||
-      !CBB_flush(out)) {
-    goto err;
+    uint8_t *ptr;
+    int n1, n2;
+    if (!CBB_reserve(&encrypted_content, &ptr, max_out) ||
+        !EVP_CipherUpdate(&ctx, ptr, &n1, in, in_len) ||
+        !EVP_CipherFinal_ex(&ctx, ptr + n1, &n2) ||
+        !CBB_did_write(&encrypted_content, n1 + n2) || !CBB_flush(out)) {
+      goto err;
+    }
   }
 
   ret = 1;
@@ -1117,7 +1069,7 @@ err:
 
 PKCS12 *PKCS12_create(const char *password, const char *name,
                       const EVP_PKEY *pkey, X509 *cert,
-                      const STACK_OF(X509)* chain, int key_nid, int cert_nid,
+                      const STACK_OF(X509) *chain, int key_nid, int cert_nid,
                       int iterations, int mac_iterations, int key_type) {
   if (key_nid == 0) {
     key_nid = NID_pbe_WithSHA1And3_Key_TripleDES_CBC;
@@ -1131,8 +1083,8 @@ PKCS12 *PKCS12_create(const char *password, const char *name,
   if (mac_iterations == 0) {
     mac_iterations = 1;
   }
-  if (// In OpenSSL, this specifies a non-standard Microsoft key usage extension
-      // which we do not currently support.
+  if (  // In OpenSSL, this specifies a non-standard Microsoft key usage
+        // extension which we do not currently support.
       key_type != 0 ||
       // In OpenSSL, -1 here means to omit the MAC, which we do not
       // currently support. Omitting it is also invalid for a password-based
@@ -1196,8 +1148,7 @@ PKCS12 *PKCS12_create(const char *password, const char *name,
   CBB cbb, pfx, auth_safe, auth_safe_oid, auth_safe_wrapper, auth_safe_data,
       content_infos;
   uint8_t mac_key[EVP_MAX_MD_SIZE];
-  if (!CBB_init(&cbb, 0) ||
-      !CBB_add_asn1(&cbb, &pfx, CBS_ASN1_SEQUENCE) ||
+  if (!CBB_init(&cbb, 0) || !CBB_add_asn1(&cbb, &pfx, CBS_ASN1_SEQUENCE) ||
       !CBB_add_asn1_uint64(&pfx, 3) ||
       // auth_safe is a data ContentInfo.
       !CBB_add_asn1(&pfx, &auth_safe, CBS_ASN1_SEQUENCE) ||
@@ -1256,7 +1207,7 @@ PKCS12 *PKCS12_create(const char *password, const char *name,
   if (pkey != NULL) {
     CBB content_info, oid, wrapper, data, safe_contents, bag, bag_oid,
         bag_contents;
-    if (// Add another data ContentInfo.
+    if (  // Add another data ContentInfo.
         !CBB_add_asn1(&content_infos, &content_info, CBS_ASN1_SEQUENCE) ||
         !CBB_add_asn1(&content_info, &oid, CBS_ASN1_OBJECT) ||
         !CBB_add_bytes(&oid, kPKCS7Data, sizeof(kPKCS7Data)) ||
@@ -1298,43 +1249,44 @@ PKCS12 *PKCS12_create(const char *password, const char *name,
     }
   }
 
-  // Compute the MAC. Match OpenSSL in using SHA-1 as the hash function. The MAC
-  // covers |auth_safe_data|.
-  const EVP_MD *mac_md = EVP_sha1();
-  uint8_t mac_salt[PKCS5_SALT_LEN];
-  uint8_t mac[EVP_MAX_MD_SIZE];
-  unsigned mac_len;
-  if (!CBB_flush(&auth_safe_data) ||
-      !RAND_bytes(mac_salt, sizeof(mac_salt)) ||
-      !pkcs12_key_gen(password, password_len, mac_salt, sizeof(mac_salt),
-                      PKCS12_MAC_ID, mac_iterations, EVP_MD_size(mac_md),
-                      mac_key, mac_md) ||
-      !HMAC(mac_md, mac_key, EVP_MD_size(mac_md), CBB_data(&auth_safe_data),
-            CBB_len(&auth_safe_data), mac, &mac_len)) {
-    goto err;
-  }
+  {
+    // Compute the MAC. Match OpenSSL in using SHA-1 as the hash function. The
+    // MAC covers |auth_safe_data|.
+    const EVP_MD *mac_md = EVP_sha1();
+    uint8_t mac_salt[PKCS5_SALT_LEN];
+    uint8_t mac[EVP_MAX_MD_SIZE];
+    unsigned mac_len;
+    if (!CBB_flush(&auth_safe_data) ||
+        !RAND_bytes(mac_salt, sizeof(mac_salt)) ||
+        !pkcs12_key_gen(password, password_len, mac_salt, sizeof(mac_salt),
+                        PKCS12_MAC_ID, mac_iterations, EVP_MD_size(mac_md),
+                        mac_key, mac_md) ||
+        !HMAC(mac_md, mac_key, EVP_MD_size(mac_md), CBB_data(&auth_safe_data),
+              CBB_len(&auth_safe_data), mac, &mac_len)) {
+      goto err;
+    }
 
-  CBB mac_data, digest_info, mac_cbb, mac_salt_cbb;
-  if (!CBB_add_asn1(&pfx, &mac_data, CBS_ASN1_SEQUENCE) ||
-      !CBB_add_asn1(&mac_data, &digest_info, CBS_ASN1_SEQUENCE) ||
-      !EVP_marshal_digest_algorithm(&digest_info, mac_md) ||
-      !CBB_add_asn1(&digest_info, &mac_cbb, CBS_ASN1_OCTETSTRING) ||
-      !CBB_add_bytes(&mac_cbb, mac, mac_len) ||
-      !CBB_add_asn1(&mac_data, &mac_salt_cbb, CBS_ASN1_OCTETSTRING) ||
-      !CBB_add_bytes(&mac_salt_cbb, mac_salt, sizeof(mac_salt)) ||
-      // The iteration count has a DEFAULT of 1, but RFC 7292 says "The default
-      // is for historical reasons and its use is deprecated." Thus we
-      // explicitly encode the iteration count, though it is not valid DER.
-      !CBB_add_asn1_uint64(&mac_data, mac_iterations)) {
-    goto err;
-  }
+    CBB mac_data, digest_info, mac_cbb, mac_salt_cbb;
+    if (!CBB_add_asn1(&pfx, &mac_data, CBS_ASN1_SEQUENCE) ||
+        !CBB_add_asn1(&mac_data, &digest_info, CBS_ASN1_SEQUENCE) ||
+        !EVP_marshal_digest_algorithm(&digest_info, mac_md) ||
+        !CBB_add_asn1(&digest_info, &mac_cbb, CBS_ASN1_OCTETSTRING) ||
+        !CBB_add_bytes(&mac_cbb, mac, mac_len) ||
+        !CBB_add_asn1(&mac_data, &mac_salt_cbb, CBS_ASN1_OCTETSTRING) ||
+        !CBB_add_bytes(&mac_salt_cbb, mac_salt, sizeof(mac_salt)) ||
+        // The iteration count has a DEFAULT of 1, but RFC 7292 says "The
+        // default is for historical reasons and its use is deprecated." Thus we
+        // explicitly encode the iteration count, though it is not valid DER.
+        !CBB_add_asn1_uint64(&mac_data, mac_iterations)) {
+      goto err;
+    }
 
-  ret = OPENSSL_malloc(sizeof(PKCS12));
-  if (ret == NULL ||
-      !CBB_finish(&cbb, &ret->ber_bytes, &ret->ber_len)) {
-    OPENSSL_free(ret);
-    ret = NULL;
-    goto err;
+    ret = reinterpret_cast<PKCS12 *>(OPENSSL_malloc(sizeof(PKCS12)));
+    if (ret == NULL || !CBB_finish(&cbb, &ret->ber_bytes, &ret->ber_len)) {
+      OPENSSL_free(ret);
+      ret = NULL;
+      goto err;
+    }
   }
 
 err:

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

@@ -1,16 +1,16 @@
-/* Copyright (c) 2016, Google Inc.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
+// Copyright 2016 The BoringSSL Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 #ifndef OPENSSL_HEADER_POLY1305_INTERNAL_H
 #define OPENSSL_HEADER_POLY1305_INTERNAL_H

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

@@ -1,16 +1,16 @@
-/* Copyright (c) 2014, Google Inc.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
+// Copyright 2014 The BoringSSL Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 // This implementation of poly1305 is by Andrew Moon
 // (https://github.com/floodyberry/poly1305-donna) and released as public
@@ -21,8 +21,8 @@
 #include <assert.h>
 #include <string.h>
 
-#include "internal.h"
 #include "../internal.h"
+#include "internal.h"
 
 
 #if !defined(BORINGSSL_HAS_UINT128) || !defined(OPENSSL_X86_64)
@@ -44,7 +44,7 @@ static_assert(
 
 static inline struct poly1305_state_st *poly1305_aligned_state(
     poly1305_state *state) {
-  return align_pointer(state, 64);
+  return reinterpret_cast<poly1305_state_st *>(align_pointer(state, 64));
 }
 
 // poly1305_blocks updates |state| given some amount of input data. This

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

@@ -1,16 +1,16 @@
-/* Copyright (c) 2014, Google Inc.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
+// Copyright 2014 The BoringSSL Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 // This implementation was taken from the public domain, neon2 version in
 // SUPERCOP by D. J. Bernstein and Peter Schwabe.
@@ -33,11 +33,13 @@ typedef struct {
 #define addmulmod openssl_poly1305_neon2_addmulmod
 #define blocks openssl_poly1305_neon2_blocks
 
+extern "C" {
 extern void addmulmod(fe1305x2 *r, const fe1305x2 *x, const fe1305x2 *y,
                       const fe1305x2 *c);
 
 extern int blocks(fe1305x2 *h, const fe1305x2 *precomp, const uint8_t *in,
                   size_t inlen);
+}
 
 static void freeze(fe1305x2 *r) {
   int i;
@@ -175,7 +177,7 @@ static void fe1305x2_frombytearray(fe1305x2 *r, const uint8_t *x, size_t xlen) {
   }
 }
 
-static const alignas(16) fe1305x2 zero;
+static const fe1305x2 zero alignas(16) = {0};
 
 struct poly1305_state_st {
   uint8_t data[sizeof(fe1305x2[5]) + 128];