Various Updates

.gitignore

@@ -33,6 +33,7 @@
 /util/bot/sde-linux64.tar.xz
 /util/bot/sde-win32
 /util/bot/sde-win32.tar.xz
+/util/bot/tools
 /util/bot/win_toolchain
 /util/bot/win_toolchain.json
 

AUTHORS

@@ -6,6 +6,7 @@
 # source control.
 Google LLC
 Brian Smith
+Apple Inc
 
 # Additionally, much of the code in BoringSSL is derived from code in the
 # OpenSSL project. We thank the OpenSSL project’s contributors for their

CMakeLists.txt

@@ -1,3 +1,17 @@
+# 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
+# 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.
+
 cmake_minimum_required(VERSION 3.16)
 
 # Defer enabling C and CXX languages.
@@ -188,6 +202,8 @@ elseif(MSVC)
       "C4244" # 'function' : conversion from 'int' to 'uint8_t',
               # possible loss of data
       "C4267" # conversion from 'size_t' to 'int', possible loss of data
+      "C4702" # unreachable code; MSVC's warning is too aggressive. See
+              # https://crbug.com/385161043
       "C4706" # assignment within conditional expression
       )
   string(REPLACE "C" " -wd" MSVC_DISABLED_WARNINGS_STR

MODULE.bazel

@@ -16,7 +16,7 @@
 # the revision where we bump the version.
 module(
     name = "boringssl",
-    version = "0.20241209.0",
+    version = "0.20250114.0",
     compatibility_level = 2,
 )
 
@@ -32,6 +32,6 @@ module(
 # this.
 bazel_dep(name = "googletest", version = "1.15.2")
 
-bazel_dep(name = "platforms", version = "0.0.10")
+bazel_dep(name = "platforms", version = "0.0.11")
 bazel_dep(name = "rules_cc", version = "0.1.0")
 bazel_dep(name = "rules_license", version = "1.0.0")

README.md

@@ -28,7 +28,7 @@ Both liboqs and this fork are part of the **Open Quantum Safe (OQS) project**, w
 
 ## Status
 
-This fork is built on top of [commit be21ef7](https://github.com/google/boringssl/commit/be21ef7012f0812bb1c0c8fc226979fa6c301e8d), and adds:
+This fork is built on top of [commit d4b6eb5](https://github.com/open-quantum-safe/boringssl/commit/d4b6eb542d4fd109baacd550935efd00c521e674), and adds:
 
 - quantum-safe key exchange
 - hybrid (quantum-safe + elliptic curve) key exchange

build.json

@@ -141,6 +141,7 @@
         "perlasm_x86_64": [
             {"src": "crypto/fipsmodule/modes/asm/aesni-gcm-x86_64.pl"},
             {"src": "crypto/fipsmodule/modes/asm/aes-gcm-avx10-x86_64.pl"},
+            {"src": "crypto/fipsmodule/modes/asm/aes-gcm-avx2-x86_64.pl"},
             {"src": "crypto/fipsmodule/aes/asm/aesni-x86_64.pl"},
             {"src": "crypto/fipsmodule/modes/asm/ghash-ssse3-x86_64.pl"},
             {"src": "crypto/fipsmodule/modes/asm/ghash-x86_64.pl"},
@@ -198,26 +199,26 @@
             "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/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/get_cipher.cc",
+            "crypto/cipher/e_aesctrhmac.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/tls_cbc.cc",
             "crypto/conf/conf.cc",
             "crypto/cpu_aarch64_apple.cc",
             "crypto/cpu_aarch64_fuchsia.cc",
@@ -233,16 +234,16 @@
             "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/engine/engine.cc",
             "crypto/err/err.cc",
             "crypto/evp/evp.cc",
@@ -296,27 +297,28 @@
             "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/slhdsa/slhdsa.cc",
             "crypto/sha/sha1.cc",
             "crypto/sha/sha256.cc",
             "crypto/sha/sha512.cc",
             "crypto/siphash/siphash.cc",
+            "crypto/spake2plus/spake2plus.cc",
             "crypto/stack/stack.cc",
             "crypto/thread.cc",
             "crypto/thread_none.cc",
@@ -490,14 +492,14 @@
             "crypto/bio/internal.h",
             "crypto/bytestring/internal.h",
             "crypto/chacha/internal.h",
-            "crypto/cipher_extra/internal.h",
+            "crypto/cipher/internal.h",
             "crypto/conf/internal.h",
             "crypto/cpu_arm_linux.h",
             "crypto/curve25519/curve25519_tables.h",
             "crypto/curve25519/internal.h",
             "crypto/des/internal.h",
             "crypto/dsa/internal.h",
-            "crypto/ec_extra/internal.h",
+            "crypto/ec/internal.h",
             "crypto/err/internal.h",
             "crypto/evp/internal.h",
             "crypto/fipsmodule/aes/internal.h",
@@ -535,13 +537,15 @@
             "crypto/lhash/internal.h",
             "crypto/md5/internal.h",
             "crypto/obj/obj_dat.h",
+            "crypto/pem/internal.h",
             "crypto/pkcs7/internal.h",
             "crypto/pkcs8/internal.h",
             "crypto/poly1305/internal.h",
             "crypto/pool/internal.h",
-            "crypto/rand_extra/getrandom_fillin.h",
-            "crypto/rand_extra/sysrand_internal.h",
-            "crypto/rsa_extra/internal.h",
+            "crypto/rand/getrandom_fillin.h",
+            "crypto/rand/sysrand_internal.h",
+            "crypto/rsa/internal.h",
+            "crypto/spake2plus/internal.h",
             "crypto/trust_token/internal.h",
             "crypto/x509/ext_dat.h",
             "crypto/x509/internal.h",
@@ -565,7 +569,7 @@
         ],
         "perlasm_aarch64": [
             {"src": "crypto/chacha/asm/chacha-armv8.pl"},
-            {"src": "crypto/cipher_extra/asm/chacha20_poly1305_armv8.pl"}
+            {"src": "crypto/cipher/asm/chacha20_poly1305_armv8.pl"}
         ],
         "perlasm_arm": [
             {"src": "crypto/chacha/asm/chacha-armv4.pl"}
@@ -576,8 +580,8 @@
         ],
         "perlasm_x86_64": [
             {"src": "crypto/chacha/asm/chacha-x86_64.pl"},
-            {"src": "crypto/cipher_extra/asm/aes128gcmsiv-x86_64.pl"},
-            {"src": "crypto/cipher_extra/asm/chacha20_poly1305_x86_64.pl"},
+            {"src": "crypto/cipher/asm/aes128gcmsiv-x86_64.pl"},
+            {"src": "crypto/cipher/asm/chacha20_poly1305_x86_64.pl"},
             {"src": "crypto/md5/asm/md5-x86_64.pl"}
         ]
     },
@@ -803,8 +807,8 @@
             "crypto/buf/buf_test.cc",
             "crypto/bytestring/bytestring_test.cc",
             "crypto/chacha/chacha_test.cc",
-            "crypto/cipher_extra/aead_test.cc",
-            "crypto/cipher_extra/cipher_test.cc",
+            "crypto/cipher/aead_test.cc",
+            "crypto/cipher/cipher_test.cc",
             "crypto/compiler_test.cc",
             "crypto/conf/conf_test.cc",
             "crypto/constant_time_test.cc",
@@ -813,10 +817,10 @@
             "crypto/curve25519/ed25519_test.cc",
             "crypto/curve25519/spake25519_test.cc",
             "crypto/curve25519/x25519_test.cc",
-            "crypto/dh_extra/dh_test.cc",
-            "crypto/digest_extra/digest_test.cc",
+            "crypto/dh/dh_test.cc",
+            "crypto/digest/digest_test.cc",
             "crypto/dsa/dsa_test.cc",
-            "crypto/ecdh_extra/ecdh_test.cc",
+            "crypto/ecdh/ecdh_test.cc",
             "crypto/err/err_test.cc",
             "crypto/evp/evp_extra_test.cc",
             "crypto/evp/evp_test.cc",
@@ -835,7 +839,7 @@
             "crypto/fipsmodule/rand/ctrdrbg_test.cc",
             "crypto/fipsmodule/service_indicator/service_indicator_test.cc",
             "crypto/fipsmodule/sha/sha_test.cc",
-            "crypto/hmac_extra/hmac_test.cc",
+            "crypto/hmac/hmac_test.cc",
             "crypto/hpke/hpke_test.cc",
             "crypto/hrss/hrss_test.cc",
             "crypto/impl_dispatch_test.cc",
@@ -851,14 +855,15 @@
             "crypto/pkcs8/pkcs8_test.cc",
             "crypto/poly1305/poly1305_test.cc",
             "crypto/pool/pool_test.cc",
-            "crypto/rand_extra/fork_detect_test.cc",
-            "crypto/rand_extra/getentropy_test.cc",
-            "crypto/rand_extra/rand_test.cc",
+            "crypto/rand/fork_detect_test.cc",
+            "crypto/rand/getentropy_test.cc",
+            "crypto/rand/rand_test.cc",
             "crypto/refcount_test.cc",
-            "crypto/rsa_extra/rsa_test.cc",
+            "crypto/rsa/rsa_test.cc",
             "crypto/self_test.cc",
             "crypto/siphash/siphash_test.cc",
             "crypto/slhdsa/slhdsa_test.cc",
+            "crypto/spake2plus/spake2plus_test.cc",
             "crypto/stack/stack_test.cc",
             "crypto/test/gtest_main.cc",
             "crypto/thread_test.cc",
@@ -869,10 +874,10 @@
         ],
         "data": [
             "crypto/blake2/blake2b256_tests.txt",
-            "crypto/cipher_extra/test/*.txt",
-            "crypto/cipher_extra/test/nist_cavp/*.txt",
+            "crypto/cipher/test/*.txt",
+            "crypto/cipher/test/nist_cavp/*.txt",
             "crypto/curve25519/ed25519_tests.txt",
-            "crypto/ecdh_extra/ecdh_tests.txt",
+            "crypto/ecdh/ecdh_tests.txt",
             "crypto/evp/evp_tests.txt",
             "crypto/evp/scrypt_tests.txt",
             "crypto/fipsmodule/aes/aes_tests.txt",
@@ -887,7 +892,7 @@
             "crypto/fipsmodule/ecdsa/ecdsa_verify_tests.txt",
             "crypto/fipsmodule/keccak/keccak_tests.txt",
             "crypto/fipsmodule/rand/ctrdrbg_vectors.txt",
-            "crypto/hmac_extra/hmac_tests.txt",
+            "crypto/hmac/hmac_tests.txt",
             "crypto/hpke/hpke_test_vectors.txt",
             "crypto/kyber/kyber_tests.txt",
             "crypto/mldsa/mldsa_nist_keygen_65_tests.txt",
@@ -917,7 +922,7 @@
     },
     "urandom_test": {
         "srcs": [
-            "crypto/rand_extra/urandom_test.cc"
+            "crypto/rand/urandom_test.cc"
         ]
     },
     "pki_test": {

cmake/OpenSSLConfig.cmake

@@ -1,3 +1,17 @@
+# Copyright 2022 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
+# 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.
+
 include(${CMAKE_CURRENT_LIST_DIR}/OpenSSLTargets.cmake)
 
 # Recursively collect dependency locations for the imported targets.

cmake/go.cmake

@@ -1,3 +1,17 @@
+# 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
+# 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.
+
 # Go is an optional dependency. It's a necessary dependency if running tests or
 # the FIPS build, which will check these.
 find_program(GO_EXECUTABLE go)