rumqttc: Enable native tls TlsConnector support.

rumqttc/src/lib.rs

@@ -100,7 +100,7 @@ extern crate log;
 
 use std::fmt::{self, Debug, Formatter};
 
-#[cfg(any(feature = "use-rustls", feature = "websocket"))]
+#[cfg(any(feature = "use-rustls",feature = "use-native-tls", feature = "websocket"))]
 use std::sync::Arc;
 
 use std::time::Duration;
@@ -149,6 +149,10 @@ pub use tls::Error as TlsError;
 pub use tokio_rustls;
 #[cfg(feature = "use-rustls")]
 use tokio_rustls::rustls::{ClientConfig, RootCertStore};
+#[cfg(feature = "use-native-tls")]
+pub use tokio_native_tls;
+#[cfg(feature = "use-native-tls")]
+use tokio_native_tls::native_tls::TlsConnectorBuilder;
 
 #[cfg(feature = "proxy")]
 pub use proxy::{Proxy, ProxyAuth, ProxyType};
@@ -315,7 +319,7 @@ impl Transport {
 }
 
 /// TLS configuration method
-#[derive(Clone, Debug)]
+#[derive(Clone)]
 #[cfg(any(feature = "use-rustls", feature = "use-native-tls"))]
 pub enum TlsConfiguration {
     #[cfg(feature = "use-rustls")]
@@ -339,7 +343,8 @@ pub enum TlsConfiguration {
     /// Injected rustls ClientConfig for TLS, to allow more customisation.
     Rustls(Arc<ClientConfig>),
     #[cfg(feature = "use-native-tls")]
-    Native,
+    /// Injected rustls TlsConnectorBuilder for TLS, to allow more customisation.
+    Native(Arc<TlsConnectorBuilder>),
 }
 
 #[cfg(feature = "use-rustls")]
@@ -364,6 +369,13 @@ impl From<ClientConfig> for TlsConfiguration {
     }
 }
 
+#[cfg(feature = "use-native-tls")]
+impl From<TlsConnectorBuilder> for TlsConfiguration {
+    fn from(builder: TlsConnectorBuilder) -> Self {
+        TlsConfiguration::Native(Arc::new(builder))
+    }
+}
+
 /// Provides a way to configure low level network connection configurations
 #[derive(Clone, Default)]
 pub struct NetworkOptions {

rumqttc/src/tls.rs

@@ -154,7 +154,7 @@ pub async fn native_tls_connector(
 
             connector_builder.build()?
         }
-        TlsConfiguration::Native => native_tls::TlsConnector::new()?,
+        TlsConfiguration::Native(builder) => builder.build()?,
         #[allow(unreachable_patterns)]
         _ => unreachable!("This cannot be called for other TLS backends than Native TLS"),
     };
@@ -176,7 +176,7 @@ pub async fn tls_connect(
             Box::new(connector.connect(domain, tcp).await?)
         }
         #[cfg(feature = "use-native-tls")]
-        TlsConfiguration::Native | TlsConfiguration::SimpleNative { .. } => {
+        TlsConfiguration::Native(_) | TlsConfiguration::SimpleNative { .. } => {
             let connector = native_tls_connector(tls_config).await?;
             Box::new(connector.connect(addr, tcp).await?)
         }