remove explicit key log intents and just trust default

plabayo · Sep 19, 2024 · c75e62b · c75e62b
1 parent 0146251
commit c75e62b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 20 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/examples/mtls_tunnel_and_service.rs b/examples/mtls_tunnel_and_service.rs
@@ -52,7 +52,6 @@ use rama::{
     tls::rustls::server::{TlsAcceptorData, TlsAcceptorLayer},
     Context, Layer,
 };
-use rama_net::tls::KeyLogIntent;
 
 // everything else is provided by the standard library, community crates or tokio
 use std::time::Duration;
@@ -87,10 +86,6 @@ async fn main() {
         client_auth: Some(ClientAuth::SelfSigned),
         expose_client_cert: true,
         server_verify_mode: ServerVerifyMode::Disable,
-        key_logger: std::env::var("SSLKEYLOGFILE")
-            .ok()
-            .map(|f| KeyLogIntent::File(f.into()))
-            .unwrap_or(KeyLogIntent::Disabled),
         ..Default::default()
     })
     .expect("create tls connector data for client");

diff --git a/examples/tls_boring_termination.rs b/examples/tls_boring_termination.rs
@@ -38,8 +38,8 @@ use rama::{
     layer::{ConsumeErrLayer, GetExtensionLayer},
     net::forwarded::Forwarded,
     net::stream::{SocketInfo, Stream},
+    net::tls::server::SelfSignedData,
     net::tls::server::{ServerAuth, ServerConfig},
-    net::tls::{server::SelfSignedData, KeyLogIntent},
     proxy::haproxy::{
         client::HaProxyLayer as HaProxyClientLayer, server::HaProxyLayer as HaProxyServerLayer,
     },
@@ -78,9 +78,6 @@ async fn main() {
         ApplicationProtocol::HTTP_2,
         ApplicationProtocol::HTTP_11,
     ]);
-    if let Ok(keylog_file) = std::env::var("SSLKEYLOGFILE") {
-        tls_server_config.key_logger = KeyLogIntent::File(keylog_file.into());
-    }
 
     let acceptor_data = TlsAcceptorData::try_from(tls_server_config).expect("create acceptor data");
 

diff --git a/examples/tls_termination.rs b/examples/tls_termination.rs
@@ -61,10 +61,7 @@ use rama::{
     },
     Context, Layer,
 };
-use rama_net::tls::{
-    server::{SelfSignedData, ServerAuth, ServerConfig},
-    KeyLogIntent,
-};
+use rama_net::tls::server::{SelfSignedData, ServerAuth, ServerConfig};
 
 // everything else is provided by the standard library, community crates or tokio
 use std::{convert::Infallible, time::Duration};
@@ -83,11 +80,7 @@ async fn main() {
         )
         .init();
 
-    let mut tls_server_config =
-        ServerConfig::new(ServerAuth::SelfSigned(SelfSignedData::default()));
-    if let Ok(keylog_file) = std::env::var("SSLKEYLOGFILE") {
-        tls_server_config.key_logger = KeyLogIntent::File(keylog_file.into());
-    }
+    let tls_server_config = ServerConfig::new(ServerAuth::SelfSigned(SelfSignedData::default()));
 
     let acceptor_data = TlsAcceptorData::try_from(tls_server_config).expect("create acceptor data");