Skip to content

Commit eafb8cc

Browse files
committed
Bump BoringSSL submodule to 4a3cda40b (API version 40)
Update the BoringSSL submodule from 91a66a59b (API version 37) to 4a3cda40b965bbda7cebf86e35c1ed6890ebcc34 (API version 40), moving the dependency forward by 653 commits. Changes: boring-pq.patch: Updated context lines in crypto/obj/obj_dat.h and tool/client.cc to match the new BoringSSL source. rpk.patch removed: Raw Public Key (RPK) support is now native to upstream BoringSSL as of this version, so the Cloudflare-maintained patch is no longer needed. The upstream implementation provides equivalent functionality under different API names: SSL_CREDENTIAL_new_raw_public_key(void) -> SSL_CREDENTIAL_new_raw_public_key(EVP_PKEY*) SSL_get0_peer_pubkey -> SSL_get0_peer_rpk SSL_CTX_set_server_certificate_types -> SSL_CTX_set1_accepted_peer_cert_types SSL_set_server_certificate_types -> SSL_set1_accepted_peer_cert_types SSL_get_server_certificate_type_selected -> SSL_get_peer_cert_type TLS_CERTIFICATE_TYPE_X509 -> TLSEXT_cert_type_x509 TLS_CERTIFICATE_TYPE_RAW_PUBLIC_KEY -> TLSEXT_cert_type_rpk SSL_CREDENTIAL_set1_spki has no upstream equivalent; the upstream constructor takes EVP_PKEY* directly, so set_spki_bytes is removed from the Rust API. SSL_CTX_get0_server_certificate_types and SSL_get0_server_certificate_types have no upstream equivalent and are removed from the Rust API. The rpk Cargo feature flag is preserved and continues to gate the Rust API surface. boring-sys/Cargo.toml: Added *.cpp and *.in to the include list for cargo publish, as the new BoringSSL version includes third_party/benchmark files that use these extensions.
1 parent 3921f35 commit eafb8cc

9 files changed

Lines changed: 71 additions & 182 deletions

File tree

boring-sys/Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ include = [
3333
"/deps/boringssl/crypto/err/*.errordata",
3434
"/deps/boringssl/**/*.bzl",
3535
"/deps/boringssl/**/*.cc",
36+
"/deps/boringssl/**/*.cpp",
37+
"/deps/boringssl/**/*.in",
3638
"/deps/boringssl/**/CMakeLists.txt",
3739
"/deps/boringssl/**/sources.cmake",
3840
"/deps/boringssl/**/util/go_tests.txt",

boring-sys/build/config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ impl Config {
107107
);
108108
}
109109

110-
let features_with_patches_enabled = self.features.rpk || self.features.underscore_wildcards;
110+
let features_with_patches_enabled = self.features.underscore_wildcards;
111111

112112
let patches_required = features_with_patches_enabled && !self.env.assume_patched;
113113

boring-sys/build/main.rs

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -443,13 +443,10 @@ fn ensure_patches_applied(config: &Config) -> io::Result<()> {
443443
native BoringSSL is expected to have the patches included"
444444
);
445445
return Ok(());
446-
} else if config.env.source_path.is_some()
447-
&& (config.features.rpk || config.features.underscore_wildcards)
448-
{
446+
} else if config.env.source_path.is_some() && config.features.underscore_wildcards {
449447
panic!(
450448
"BORING_BSSL_ASSUME_PATCHED must be set when setting
451-
BORING_BSSL_SOURCE_PATH and using any of the following
452-
features: rpk, underscore-wildcards"
449+
BORING_BSSL_SOURCE_PATH and using the underscore-wildcards feature"
453450
);
454451
}
455452

@@ -467,10 +464,7 @@ fn ensure_patches_applied(config: &Config) -> io::Result<()> {
467464
println!("cargo:warning=applying post quantum crypto patch to boringssl");
468465
apply_patch(config, "boring-pq.patch")?;
469466

470-
if config.features.rpk {
471-
println!("cargo:warning=applying RPK patch to boringssl");
472-
apply_patch(config, "rpk.patch")?;
473-
}
467+
// RPK support is now native to BoringSSL; no patch needed.
474468

475469
if config.features.underscore_wildcards {
476470
println!("cargo:warning=applying underscore wildcards patch to boringssl");

boring-sys/deps/boringssl

Submodule boringssl updated 1419 files

0 commit comments

Comments
 (0)