Refactor boringssl_openssl into submodules in preparation for rustl…

…s integration
cloudflare · Aug 30, 2024 · e564cd5 · e564cd5
1 parent 4f45792
commit e564cd5
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 6 deletions.
diff --git a/.bleep b/.bleep
@@ -1 +1 @@
-fdc26b8f9eefd902a1e27d4ef1aafc480a6db305
+3eb2a9750ec02867bec91a4069796faae8cd860c
diff --git a/pingora-core/src/connectors/tls.rs → ...c/connectors/tls/boringssl_openssl/mod.rs b/pingora-core/src/connectors/tls.rs → ...c/connectors/tls/boringssl_openssl/mod.rs
@@ -16,7 +16,7 @@ use log::debug;
 use pingora_error::{Error, ErrorType::*, OrErr, Result};
 use std::sync::{Arc, Once};
 
-use super::ConnectorOptions;
+use crate::connectors::ConnectorOptions;
 use crate::protocols::tls::client::handshake;
 use crate::protocols::tls::SslStream;
 use crate::protocols::IO;

diff --git a/pingora-core/src/connectors/tls/mod.rs b/pingora-core/src/connectors/tls/mod.rs
@@ -0,0 +1,5 @@
+#[cfg(feature = "some_tls")]
+mod boringssl_openssl;
+
+#[cfg(feature = "some_tls")]
+pub use boringssl_openssl::*;
diff --git a/pingora-core/src/listeners/tls.rs → ...rc/listeners/tls/boringssl_openssl/mod.rs b/pingora-core/src/listeners/tls.rs → ...rc/listeners/tls/boringssl_openssl/mod.rs
diff --git a/pingora-core/src/listeners/tls/mod.rs b/pingora-core/src/listeners/tls/mod.rs
@@ -0,0 +1,5 @@
+#[cfg(feature = "some_tls")]
+mod boringssl_openssl;
+
+#[cfg(feature = "some_tls")]
+pub use boringssl_openssl::*;
diff --git a/pingora-core/src/protocols/tls/client.rs → ...protocols/tls/boringssl_openssl/client.rs b/pingora-core/src/protocols/tls/client.rs → ...protocols/tls/boringssl_openssl/client.rs
@@ -14,8 +14,8 @@
 
 //! TLS client specific implementation
 
-use super::SslStream;
 use crate::protocols::raw_connect::ProxyDigest;
+use crate::protocols::tls::SslStream;
 use crate::protocols::{
     GetProxyDigest, GetSocketDigest, GetTimingDigest, SocketDigest, TimingDigest, IO,
 };

diff --git a/pingora-core/src/protocols/tls/boringssl_openssl/mod.rs b/pingora-core/src/protocols/tls/boringssl_openssl/mod.rs
@@ -0,0 +1,2 @@
+pub mod client;
+pub mod server;
diff --git a/pingora-core/src/protocols/tls/server.rs → ...protocols/tls/boringssl_openssl/server.rs b/pingora-core/src/protocols/tls/server.rs → ...protocols/tls/boringssl_openssl/server.rs
@@ -14,7 +14,7 @@
 
 //! TLS server specific implementation
 
-use super::SslStream;
+use crate::protocols::tls::SslStream;
 use crate::protocols::{Shutdown, IO};
 use crate::tls::ext;
 use crate::tls::ext::ssl_from_acceptor;

diff --git a/pingora-core/src/protocols/tls/mod.rs b/pingora-core/src/protocols/tls/mod.rs
@@ -14,9 +14,13 @@
 
 //! The TLS layer implementations
 
-pub mod client;
 pub mod digest;
-pub mod server;
+
+#[cfg(feature = "some_tls")]
+mod boringssl_openssl;
+
+#[cfg(feature = "some_tls")]
+pub use boringssl_openssl::*;
 
 #[cfg(not(feature = "some_tls"))]
 pub mod dummy_tls;
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		fdc26b8f9eefd902a1e27d4ef1aafc480a6db305
		3eb2a9750ec02867bec91a4069796faae8cd860c