remove protocol crate dependencies on boringssl

Cargo.toml

@@ -62,7 +62,7 @@ nom = "7.1.3"
 openssl = "0.10.64"
 openssl-sys = "0.9.102"
 parking_lot = "0.12.1"
-pelikan-net = { path = "./src/net", version = "0.2.0" }
+pelikan-net = { path = "./src/net", version = "0.2.0", default-features = false }
 phf = "0.11.2"
 proc-macro2 = "1.0.69"
 quote = "1.0.33"

src/common/Cargo.toml

@@ -10,9 +10,13 @@ repository = { workspace = true }
 license = { workspace = true }
 
 [dependencies]
-boring = { workspace = true }
+boring = { workspace = true, optional = true }
 clocksource = { workspace = true }
 metriken = { workspace = true }
-pelikan-net = { workspace = true, features = ["boringssl"] }
+pelikan-net = { workspace = true, default-features = false }
 ringlog = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
+
+[features]
+default = ["boringssl"]
+boringssl = ["dep:boring", "pelikan-net/boringssl"]

src/common/src/lib.rs

@@ -6,5 +6,6 @@ pub mod bytes;
 pub mod expiry;
 pub mod metrics;
 pub mod signal;
+#[cfg(feature = "boringssl")]
 pub mod ssl;
 pub mod traits;

src/config/Cargo.toml

@@ -10,8 +10,12 @@ repository = { workspace = true }
 license = { workspace = true }
 
 [dependencies]
-common = { path = "../common" }
+common = { path = "../common", default-features = false }
 log = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
 toml = { workspace = true }
+
+[features]
+default = ["boringssl"]
+boringssl = ["common/boringssl"]

src/config/src/lib.rs

@@ -23,6 +23,7 @@ mod sockio;
 mod stats_log;
 mod tcp;
 pub mod time;
+#[cfg(feature = "boringssl")]
 mod tls;
 mod units;
 mod worker;
@@ -44,5 +45,6 @@ pub use sockio::{Sockio, SockioConfig};
 pub use stats_log::StatsLogConfig;
 pub use tcp::{Tcp, TcpConfig};
 pub use time::{Time, TimeConfig, TimeType};
+#[cfg(feature = "boringssl")]
 pub use tls::{Tls, TlsConfig};
 pub use worker::{Worker, WorkerConfig};

src/config/src/pingproxy.rs

@@ -50,6 +50,7 @@ pub struct PingproxyConfig {
 
     #[serde(default)]
     time: Time,
+    #[cfg(feature = "boringssl")]
     #[serde(default)]
     tls: Tls,
 
@@ -126,6 +127,7 @@ impl TimeConfig for PingproxyConfig {
     }
 }
 
+#[cfg(feature = "boringssl")]
 impl TlsConfig for PingproxyConfig {
     fn tls(&self) -> &Tls {
         &self.tls
@@ -183,6 +185,7 @@ impl Default for PingproxyConfig {
             klog: Default::default(),
             sockio: Default::default(),
             tcp: Default::default(),
+            #[cfg(feature = "boringssl")]
             tls: Default::default(),
         }
     }

src/config/src/pingserver.rs

@@ -46,6 +46,7 @@ pub struct PingserverConfig {
     worker: Worker,
     #[serde(default)]
     time: Time,
+    #[cfg(feature = "boringssl")]
     #[serde(default)]
     tls: Tls,
 
@@ -110,6 +111,7 @@ impl TimeConfig for PingserverConfig {
     }
 }
 
+#[cfg(feature = "boringssl")]
 impl TlsConfig for PingserverConfig {
     fn tls(&self) -> &Tls {
         &self.tls
@@ -175,6 +177,7 @@ impl Default for PingserverConfig {
             klog: Default::default(),
             sockio: Default::default(),
             tcp: Default::default(),
+            #[cfg(feature = "boringssl")]
             tls: Default::default(),
         }
     }

src/config/src/rds.rs

@@ -46,6 +46,7 @@ pub struct RdsConfig {
     worker: Worker,
     #[serde(default)]
     time: Time,
+    #[cfg(feature = "boringssl")]
     #[serde(default)]
     tls: Tls,
     #[serde(default)]
@@ -160,6 +161,7 @@ impl TimeConfig for RdsConfig {
     }
 }
 
+#[cfg(feature = "boringssl")]
 impl TlsConfig for RdsConfig {
     fn tls(&self) -> &Tls {
         &self.tls
@@ -195,6 +197,7 @@ impl Default for RdsConfig {
             klog: Default::default(),
             sockio: Default::default(),
             tcp: Default::default(),
+            #[cfg(feature = "boringssl")]
             tls: Default::default(),
         }
     }

src/config/src/segcache.rs

@@ -46,6 +46,7 @@ pub struct SegcacheConfig {
     worker: Worker,
     #[serde(default)]
     time: Time,
+    #[cfg(feature = "boringssl")]
     #[serde(default)]
     tls: Tls,
     #[serde(default)]
@@ -160,6 +161,7 @@ impl TimeConfig for SegcacheConfig {
     }
 }
 
+#[cfg(feature = "boringssl")]
 impl TlsConfig for SegcacheConfig {
     fn tls(&self) -> &Tls {
         &self.tls
@@ -195,6 +197,7 @@ impl Default for SegcacheConfig {
             klog: Default::default(),
             sockio: Default::default(),
             tcp: Default::default(),
+            #[cfg(feature = "boringssl")]
             tls: Default::default(),
         }
     }

src/logger/Cargo.toml

@@ -8,6 +8,6 @@ repository = { workspace = true }
 license = { workspace = true }
 
 [dependencies]
-common = { path = "../common" }
-config = { path = "../config" }
+common = { path = "../common", default-features = false }
+config = { path = "../config", default-features = false }
 ringlog = { workspace = true }

src/protocol/common/Cargo.toml

@@ -11,8 +11,8 @@ license = { workspace = true }
 
 [dependencies]
 bytes = { workspace = true }
-common = { path = "../../common" }
-config = { path = "../../config" }
+common = { path = "../../common", default-features = false }
+config = { path = "../../config", default-features = false }
 logger = { path = "../../logger" }
 storage-types = { path = "../../storage/types" }
 

src/protocol/memcache/Cargo.toml

@@ -13,7 +13,7 @@ path = "benches/request_parsing.rs"
 harness = false
 
 [dependencies]
-common = { path = "../../common" }
+common = { path = "../../common", default-features = false }
 clocksource = { workspace = true }
 logger = { path = "../../logger" }
 metriken = { workspace = true }

src/protocol/ping/Cargo.toml

@@ -14,9 +14,9 @@ path = "benches/ping.rs"
 harness = false
 
 [dependencies]
-common = { path = "../../common" }
-config = { path = "../../config" }
-logger = { path = "../../logger" }
+common = { path = "../../common", default-features = false }
+config = { path = "../../config", default-features = false }
+logger = { path = "../../logger", default-features = false }
 metriken = { workspace = true }
 protocol-common = { path = "../../protocol/common" }
 storage-types = { path = "../../storage/types" }