Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion boring-sys/build/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,8 @@ impl Config {
);
}

let features_with_patches_enabled = self.features.rpk || self.features.underscore_wildcards;
// RPK support is now native to BoringSSL, no patch needed.
let features_with_patches_enabled = self.features.underscore_wildcards;

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

Expand Down
11 changes: 3 additions & 8 deletions boring-sys/build/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -443,13 +443,11 @@ fn ensure_patches_applied(config: &Config) -> io::Result<()> {
native BoringSSL is expected to have the patches included"
);
return Ok(());
} else if config.env.source_path.is_some()
&& (config.features.rpk || config.features.underscore_wildcards)
{
} else if config.env.source_path.is_some() && config.features.underscore_wildcards {
panic!(
"BORING_BSSL_ASSUME_PATCHED must be set when setting
BORING_BSSL_SOURCE_PATH and using any of the following
features: rpk, underscore-wildcards"
features: underscore-wildcards"
);
}

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

if config.features.rpk {
println!("cargo:warning=applying RPK patch to boringssl");
apply_patch(config, "rpk.patch")?;
}
// RPK support is now native to BoringSSL as of 4a3cda40b, no patch needed.

if config.features.underscore_wildcards {
println!("cargo:warning=applying underscore wildcards patch to boringssl");
Expand Down
2 changes: 1 addition & 1 deletion boring-sys/deps/boringssl
Submodule boringssl updated 1419 files
Loading
Loading