Feature gate boringssl

Author: kaukabrizvi

bindings/rust/standard/integration/Cargo.toml

@@ -18,6 +18,8 @@ no-sensitive-tests = []
 # can be disabled by turning off this feature.
 pq = [ "s2n-tls/pq" ]
 
+boringssl = ["tls-harness/boringssl"]
+
 [dependencies]
 s2n-tls = { path = "../../extended/s2n-tls", features = ["unstable-testing", "unstable-crl"]}
 s2n-tls-hyper = { path = "../s2n-tls-hyper" }

bindings/rust/standard/integration/src/mtls/mod.rs

@@ -27,7 +27,7 @@ use std::{
 
 // NOTE: BoringSSL tests are disabled on macOS to avoid symbol collisions with
 // OpenSSL; see https://github.com/aws/s2n-tls/pull/5659 for details.
-#[cfg(not(target_os = "macos"))]
+#[cfg(all(feature = "boringssl", not(target_os = "macos")))]
 use boring::ssl::SslVersion;
 use rustls::ClientConfig;
 
@@ -50,7 +50,7 @@ use tls_harness::{
     PemType, SigType, TlsConnPair, TlsConnection,
 };
 
-#[cfg(not(target_os = "macos"))]
+#[cfg(all(feature = "boringssl", not(target_os = "macos")))]
 use tls_harness::cohort::{BoringSslConfig, BoringSslConnection};
 
 const APP_DATA_SIZE: usize = 100_000;
@@ -217,7 +217,7 @@ fn rustls_mtls_server(
     server.into()
 }
 
-#[cfg(not(target_os = "macos"))]
+#[cfg(all(feature = "boringssl", not(target_os = "macos")))]
 fn boringssl_mtls_client(sig_type: SigType, version: SslVersion) -> BoringSslConfig {
     use tls_harness::harness::{Mode, TlsConfigBuilder};
 
@@ -248,7 +248,7 @@ fn boringssl_mtls_client(sig_type: SigType, version: SslVersion) -> BoringSslCon
     }
 }
 
-#[cfg(not(target_os = "macos"))]
+#[cfg(all(feature = "boringssl", not(target_os = "macos")))]
 fn boringssl_mtls_server(sig_type: SigType, version: SslVersion) -> BoringSslConfig {
     use tls_harness::harness::{Mode, TlsConfigBuilder};
 
@@ -335,7 +335,7 @@ fn rustls_client_basic() {
 }
 
 // s2n client, boringssl server
-#[cfg(not(target_os = "macos"))]
+#[cfg(all(feature = "boringssl", not(target_os = "macos")))]
 #[test]
 fn boringssl_server_basic() {
     // TLS 1.2
@@ -361,7 +361,7 @@ fn boringssl_server_basic() {
 }
 
 // boringssl client, s2n server
-#[cfg(not(target_os = "macos"))]
+#[cfg(all(feature = "boringssl", not(target_os = "macos")))]
 #[test]
 fn boringssl_client_basic() {
     // TLS 1.2
@@ -469,7 +469,7 @@ fn rustls_client_sync_callback() {
 }
 
 // s2n client with sync callback, boringssl server
-#[cfg(not(target_os = "macos"))]
+#[cfg(all(feature = "boringssl", not(target_os = "macos")))]
 #[test]
 fn boringssl_server_sync_callback() {
     // TLS 1.2
@@ -501,7 +501,7 @@ fn boringssl_server_sync_callback() {
 }
 
 // boringssl client, s2n server with sync callback
-#[cfg(not(target_os = "macos"))]
+#[cfg(all(feature = "boringssl", not(target_os = "macos")))]
 #[test]
 fn boringssl_client_sync_callback() {
     // TLS 1.2
@@ -669,7 +669,7 @@ fn rustls_client_async_callback() {
 }
 
 // s2n client with async callback, boringssl server
-#[cfg(not(target_os = "macos"))]
+#[cfg(all(feature = "boringssl", not(target_os = "macos")))]
 #[test]
 fn boringssl_server_async_callback() {
     // TLS 1.2
@@ -703,7 +703,7 @@ fn boringssl_server_async_callback() {
 }
 
 // boringssl client, s2n server with async callback
-#[cfg(not(target_os = "macos"))]
+#[cfg(all(feature = "boringssl", not(target_os = "macos")))]
 #[test]
 fn boringssl_client_async_callback() {
     // TLS 1.2

bindings/rust/standard/tls-harness/Cargo.toml

@@ -1,3 +1,7 @@
+[features]
+default = []
+boringssl = ["dep:boring"]
+
 [package]
 name = "tls-harness"
 version = "0.1.0"
@@ -14,6 +18,7 @@ rustls-pemfile = "2.2.0"
 openssl = { version = "0.10.73", features = ["vendored"] }
 openssl-sys = "0.9.109"
 byteorder = "1.5.0"
+boring = { git = "https://github.com/kaukabrizvi/boring.git", branch = "symbol-prefixing", features = ["prefix-symbols"], optional = true }
 
 brass-aphid-wire-decryption = "0.0.1"
 brass-aphid-wire-messages = "0.0.1"

bindings/rust/standard/tls-harness/src/cohort/mod.rs

@@ -15,12 +15,12 @@ pub mod s2n_tls;
 
 // NOTE: BoringSSL is disabled on macOS to avoid symbol collisions with
 // OpenSSL; see https://github.com/aws/s2n-tls/pull/5659 for details.
-#[cfg(not(target_os = "macos"))]
+#[cfg(all(feature = "boringssl", not(target_os = "macos")))]
 pub mod boringssl;
 
 pub use openssl::{OpenSslConfig, OpenSslConnection};
 pub use rustls::{RustlsConfig, RustlsConnection};
 pub use s2n_tls::{S2NConfig, S2NConnection};
 
-#[cfg(not(target_os = "macos"))]
+#[cfg(all(feature = "boringssl", not(target_os = "macos")))]
 pub use boringssl::{BoringSslConfig, BoringSslConnection};

nix/shell.sh

@@ -256,5 +256,5 @@ function rust_test {(set -e
     export S2N_TLS_LIB_DIR=$(pwd)/build/lib
     export S2N_TLS_INCLUDE_DIR=$(pwd)/api
     echo "rust_test: Running Rust integration tests"
-    cargo test --manifest-path bindings/rust/standard/integration/Cargo.toml 
+    cargo test --manifest-path bindings/rust/standard/integration/Cargo.toml --features boringssl
 )}