Update BoringSSL to 035e720641f385e82c72b7b0a9e1d89e58cb5ed5 (#356)

This patch updates BoringSSL to
035e720641f385e82c72b7b0a9e1d89e58cb5ed5. As with all of our patch
updates to BoringSSL, this comes in multiple commits. The first contains
the changes to the vendoring script, and the last contains the tweaks to
product code. The middle commit can be ignored for review purposes.

Author: Lukasa

Package.swift

@@ -20,7 +20,7 @@
 // Sources/CCryptoBoringSSL directory. The source repository is at
 // https://boringssl.googlesource.com/boringssl.
 //
-// BoringSSL Commit: aefa5d24da34ef77ac797bdbe684734e5bd870f4
+// BoringSSL Commit: 035e720641f385e82c72b7b0a9e1d89e58cb5ed5
 
 import PackageDescription
 
@@ -195,7 +195,7 @@ let package = Package(
         ),
         .testTarget(name: "CryptoBoringWrapperTests", dependencies: ["CryptoBoringWrapper"]),
     ],
-    cxxLanguageStandard: .cxx14
+    cxxLanguageStandard: .cxx17
 )
 
 // Switch between local and remote dependencies depending on an environment variable

Sources/CCryptoBoringSSL/CMakeLists.txt

@@ -13,6 +13,7 @@
 ##===----------------------------------------------------------------------===##
 
 add_library(CCryptoBoringSSL STATIC
+  "crypto/aes/aes.cc"
   "crypto/asn1/a_bitstr.cc"
   "crypto/asn1/a_bool.cc"
   "crypto/asn1/a_d2i_fp.cc"
@@ -53,26 +54,31 @@ add_library(CCryptoBoringSSL STATIC
   "crypto/bio/socket.cc"
   "crypto/bio/socket_helper.cc"
   "crypto/blake2/blake2.cc"
-  "crypto/bn_extra/bn_asn1.cc"
-  "crypto/bn_extra/convert.cc"
+  "crypto/bn/bn_asn1.cc"
+  "crypto/bn/convert.cc"
+  "crypto/bn/div.cc"
+  "crypto/bn/exponentiation.cc"
+  "crypto/bn/sqrt.cc"
   "crypto/buf/buf.cc"
   "crypto/bytestring/asn1_compat.cc"
   "crypto/bytestring/ber.cc"
   "crypto/bytestring/cbb.cc"
   "crypto/bytestring/cbs.cc"
   "crypto/bytestring/unicode.cc"
   "crypto/chacha/chacha.cc"
-  "crypto/cipher_extra/cipher_extra.cc"
-  "crypto/cipher_extra/derive_key.cc"
-  "crypto/cipher_extra/e_aesctrhmac.cc"
-  "crypto/cipher_extra/e_aesgcmsiv.cc"
-  "crypto/cipher_extra/e_chacha20poly1305.cc"
-  "crypto/cipher_extra/e_des.cc"
-  "crypto/cipher_extra/e_null.cc"
-  "crypto/cipher_extra/e_rc2.cc"
-  "crypto/cipher_extra/e_rc4.cc"
-  "crypto/cipher_extra/e_tls.cc"
-  "crypto/cipher_extra/tls_cbc.cc"
+  "crypto/cipher/derive_key.cc"
+  "crypto/cipher/e_aesctrhmac.cc"
+  "crypto/cipher/e_aeseax.cc"
+  "crypto/cipher/e_aesgcmsiv.cc"
+  "crypto/cipher/e_chacha20poly1305.cc"
+  "crypto/cipher/e_des.cc"
+  "crypto/cipher/e_null.cc"
+  "crypto/cipher/e_rc2.cc"
+  "crypto/cipher/e_rc4.cc"
+  "crypto/cipher/e_tls.cc"
+  "crypto/cipher/get_cipher.cc"
+  "crypto/cipher/tls_cbc.cc"
+  "crypto/cms/cms.cc"
   "crypto/conf/conf.cc"
   "crypto/cpu_aarch64_apple.cc"
   "crypto/cpu_aarch64_fuchsia.cc"
@@ -88,16 +94,17 @@ add_library(CCryptoBoringSSL STATIC
   "crypto/curve25519/curve25519_64_adx.cc"
   "crypto/curve25519/spake25519.cc"
   "crypto/des/des.cc"
-  "crypto/dh_extra/dh_asn1.cc"
-  "crypto/dh_extra/params.cc"
-  "crypto/digest_extra/digest_extra.cc"
+  "crypto/dh/dh_asn1.cc"
+  "crypto/dh/params.cc"
+  "crypto/digest/digest_extra.cc"
   "crypto/dsa/dsa.cc"
   "crypto/dsa/dsa_asn1.cc"
-  "crypto/ec_extra/ec_asn1.cc"
-  "crypto/ec_extra/ec_derive.cc"
-  "crypto/ec_extra/hash_to_curve.cc"
-  "crypto/ecdh_extra/ecdh_extra.cc"
-  "crypto/ecdsa_extra/ecdsa_asn1.cc"
+  "crypto/ec/ec_asn1.cc"
+  "crypto/ec/ec_derive.cc"
+  "crypto/ec/hash_to_curve.cc"
+  "crypto/ecdh/ecdh.cc"
+  "crypto/ecdsa/ecdsa_asn1.cc"
+  "crypto/ecdsa/ecdsa_p1363.cc"
   "crypto/engine/engine.cc"
   "crypto/err/err.cc"
   "crypto/evp/evp.cc"
@@ -122,6 +129,7 @@ add_library(CCryptoBoringSSL STATIC
   "crypto/ex_data.cc"
   "crypto/fipsmodule/bcm.cc"
   "crypto/fipsmodule/fips_shared_support.cc"
+  "crypto/fuzzer_mode.cc"
   "crypto/hpke/hpke.cc"
   "crypto/hrss/hrss.cc"
   "crypto/kyber/kyber.cc"
@@ -150,31 +158,28 @@ add_library(CCryptoBoringSSL STATIC
   "crypto/poly1305/poly1305_arm.cc"
   "crypto/poly1305/poly1305_vec.cc"
   "crypto/pool/pool.cc"
-  "crypto/rand_extra/deterministic.cc"
-  "crypto/rand_extra/fork_detect.cc"
-  "crypto/rand_extra/forkunsafe.cc"
-  "crypto/rand_extra/getentropy.cc"
-  "crypto/rand_extra/ios.cc"
-  "crypto/rand_extra/passive.cc"
-  "crypto/rand_extra/rand_extra.cc"
-  "crypto/rand_extra/trusty.cc"
-  "crypto/rand_extra/urandom.cc"
-  "crypto/rand_extra/windows.cc"
+  "crypto/rand/deterministic.cc"
+  "crypto/rand/fork_detect.cc"
+  "crypto/rand/forkunsafe.cc"
+  "crypto/rand/getentropy.cc"
+  "crypto/rand/ios.cc"
+  "crypto/rand/passive.cc"
+  "crypto/rand/rand.cc"
+  "crypto/rand/trusty.cc"
+  "crypto/rand/urandom.cc"
+  "crypto/rand/windows.cc"
   "crypto/rc4/rc4.cc"
   "crypto/refcount.cc"
-  "crypto/rsa_extra/rsa_asn1.cc"
-  "crypto/rsa_extra/rsa_crypt.cc"
-  "crypto/rsa_extra/rsa_extra.cc"
-  "crypto/rsa_extra/rsa_print.cc"
+  "crypto/rsa/rsa_asn1.cc"
+  "crypto/rsa/rsa_crypt.cc"
+  "crypto/rsa/rsa_extra.cc"
+  "crypto/rsa/rsa_print.cc"
   "crypto/sha/sha1.cc"
   "crypto/sha/sha256.cc"
   "crypto/sha/sha512.cc"
   "crypto/siphash/siphash.cc"
-  "crypto/slhdsa/fors.cc"
-  "crypto/slhdsa/merkle.cc"
   "crypto/slhdsa/slhdsa.cc"
-  "crypto/slhdsa/thash.cc"
-  "crypto/slhdsa/wots.cc"
+  "crypto/spake2plus/spake2plus.cc"
   "crypto/stack/stack.cc"
   "crypto/thread.cc"
   "crypto/thread_none.cc"
@@ -253,6 +258,7 @@ add_library(CCryptoBoringSSL STATIC
   "crypto/x509/x_val.cc"
   "crypto/x509/x_x509.cc"
   "crypto/x509/x_x509a.cc"
+  "crypto/xwing/xwing.cc"
   "gen/crypto/err_data.cc"
   "$<$<NOT:$<PLATFORM_ID:Windows>>:crypto/hrss/asm/poly_rq_mul.S>"
   "$<$<NOT:$<PLATFORM_ID:Windows>>:third_party/fiat/asm/fiat_curve25519_adx_mul.S>"
@@ -262,7 +268,8 @@ add_library(CCryptoBoringSSL STATIC
 
 if(CMAKE_SYSTEM_NAME STREQUAL Darwin AND CMAKE_SYSTEM_PROCESSOR MATCHES "amd64|x86_64")
   target_sources(CCryptoBoringSSL PRIVATE
-    gen/bcm/aes-gcm-avx10-x86_64-apple.S
+    gen/bcm/aes-gcm-avx2-x86_64-apple.S
+    gen/bcm/aes-gcm-avx512-x86_64-apple.S
     gen/bcm/aesni-gcm-x86_64-apple.S
     gen/bcm/aesni-x86_64-apple.S
     gen/bcm/ghash-ssse3-x86_64-apple.S
@@ -283,7 +290,8 @@ if(CMAKE_SYSTEM_NAME STREQUAL Darwin AND CMAKE_SYSTEM_PROCESSOR MATCHES "amd64|x
     gen/crypto/md5-x86_64-apple.S)
 elseif(CMAKE_SYSTEM_NAME MATCHES "Linux|Android|FreeBSD|OpenBSD" AND CMAKE_SYSTEM_PROCESSOR MATCHES "amd64|x86_64")
   target_sources(CCryptoBoringSSL PRIVATE
-    gen/bcm/aes-gcm-avx10-x86_64-linux.S
+    gen/bcm/aes-gcm-avx2-x86_64-linux.S
+    gen/bcm/aes-gcm-avx512-x86_64-linux.S
     gen/bcm/aesni-gcm-x86_64-linux.S
     gen/bcm/aesni-x86_64-linux.S
     gen/bcm/ghash-ssse3-x86_64-linux.S

Sources/CCryptoBoringSSL/crypto/aes/aes.cc

@@ -0,0 +1,41 @@
+// Copyright 2025 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.
+
+#include <assert.h>
+
+#include <CCryptoBoringSSL_aes.h>
+
+#include "../fipsmodule/bcm_interface.h"
+
+void AES_encrypt(const uint8_t *in, uint8_t *out, const AES_KEY *key) {
+  BCM_aes_encrypt(in, out, key);
+}
+
+void AES_decrypt(const uint8_t *in, uint8_t *out, const AES_KEY *key) {
+  BCM_aes_decrypt(in, out, key);
+}
+
+int AES_set_encrypt_key(const uint8_t *key, unsigned bits, AES_KEY *aeskey) {
+  if (bits != 128 && bits != 192 && bits != 256) {
+    return -2;
+  }
+  return bcm_success(BCM_aes_set_encrypt_key(key, bits, aeskey)) ? 0 : -1;
+}
+
+int AES_set_decrypt_key(const uint8_t *key, unsigned bits, AES_KEY *aeskey) {
+  if (bits != 128 && bits != 192 && bits != 256) {
+    return -2;
+  }
+  return bcm_success(BCM_aes_set_decrypt_key(key, bits, aeskey)) ? 0 : -1;
+}

Sources/CCryptoBoringSSL/crypto/asn1/a_bitstr.cc

@@ -1,64 +1,23 @@
-/* Copyright (C) 1995-1998 Eric Young ([email protected])
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young ([email protected]).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson ([email protected]).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * 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 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 acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young ([email protected])"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson ([email protected])"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS 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 AUTHOR OR 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.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.] */
+// Copyright 1995-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 <CCryptoBoringSSL_asn1.h>
 
 #include <limits.h>
 #include <string.h>
 
+#include <CCryptoBoringSSL_bytestring.h>
 #include <CCryptoBoringSSL_err.h>
 #include <CCryptoBoringSSL_mem.h>
 
@@ -136,6 +95,21 @@ int i2c_ASN1_BIT_STRING(const ASN1_BIT_STRING *a, unsigned char **pp) {
   return ret;
 }
 
+int asn1_marshal_bit_string(CBB *out, const ASN1_BIT_STRING *in,
+                            CBS_ASN1_TAG tag) {
+  int len = i2c_ASN1_BIT_STRING(in, nullptr);
+  if (len <= 0) {
+    return 0;
+  }
+  tag = tag == 0 ? CBS_ASN1_BITSTRING : tag;
+  CBB child;
+  uint8_t *ptr;
+  return CBB_add_asn1(out, &child, tag) &&                         //
+         CBB_add_space(&child, &ptr, static_cast<size_t>(len)) &&  //
+         i2c_ASN1_BIT_STRING(in, &ptr) == len &&                   //
+         CBB_flush(out);
+}
+
 ASN1_BIT_STRING *c2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a,
                                      const unsigned char **pp, long len) {
   ASN1_BIT_STRING *ret = NULL;

Sources/CCryptoBoringSSL/crypto/asn1/a_bool.cc

@@ -1,58 +1,16 @@
-/* Copyright (C) 1995-1998 Eric Young ([email protected])
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young ([email protected]).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson ([email protected]).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * 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 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 acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young ([email protected])"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson ([email protected])"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS 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 AUTHOR OR 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.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.] */
+// Copyright 1995-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 <CCryptoBoringSSL_asn1.h>