From 5a88e118870c7e3f3af767c92a19f4557f376286 Mon Sep 17 00:00:00 2001 From: Dirkjan Ochtman Date: Tue, 7 Dec 2021 10:18:19 +0100 Subject: [PATCH] chore: fix warnings around unused TLS code (#858) --- tonic/src/transport/mod.rs | 5 ++++- tonic/src/transport/service/tls.rs | 7 ------- tonic/src/transport/tls.rs | 3 +++ 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/tonic/src/transport/mod.rs b/tonic/src/transport/mod.rs index 6cc4c28..789e531 100644 --- a/tonic/src/transport/mod.rs +++ b/tonic/src/transport/mod.rs @@ -100,7 +100,7 @@ pub use self::error::Error; pub use self::server::{NamedService, Server}; #[doc(inline)] pub use self::service::TimeoutExpired; -pub use self::tls::{Certificate, Identity}; +pub use self::tls::Certificate; pub use hyper::{Body, Uri}; #[cfg(feature = "tls")] @@ -109,6 +109,9 @@ pub use self::channel::ClientTlsConfig; #[cfg(feature = "tls")] #[cfg_attr(docsrs, doc(cfg(feature = "tls")))] pub use self::server::ServerTlsConfig; +#[cfg(feature = "tls")] +#[cfg_attr(docsrs, doc(cfg(feature = "tls")))] +pub use self::tls::Identity; type BoxFuture = std::pin::Pin> + Send + 'static>>; diff --git a/tonic/src/transport/service/tls.rs b/tonic/src/transport/service/tls.rs index e9ba339..5bd960c 100644 --- a/tonic/src/transport/service/tls.rs +++ b/tonic/src/transport/service/tls.rs @@ -18,13 +18,6 @@ use tokio_rustls::{ #[cfg(feature = "tls")] const ALPN_H2: &str = "h2"; -#[derive(Debug, Clone)] -pub(crate) struct Cert { - pub(crate) ca: Vec, - pub(crate) key: Option>, - pub(crate) domain: String, -} - #[derive(Debug)] enum TlsError { #[allow(dead_code)] diff --git a/tonic/src/transport/tls.rs b/tonic/src/transport/tls.rs index 2ebc274..97b5a6c 100644 --- a/tonic/src/transport/tls.rs +++ b/tonic/src/transport/tls.rs @@ -5,6 +5,8 @@ pub struct Certificate { } /// Represents a private key and X509 certificate. +#[cfg(feature = "tls")] +#[cfg_attr(docsrs, doc(cfg(feature = "tls")))] #[derive(Debug, Clone)] pub struct Identity { pub(crate) cert: Certificate, @@ -42,6 +44,7 @@ impl AsRef<[u8]> for Certificate { } } +#[cfg(feature = "tls")] impl Identity { /// Parse a PEM encoded certificate and private key. ///