From 88a60ffa66bc132b166a636f9d82e11a1b1b56e2 Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Thu, 5 Dec 2019 23:09:34 +0600
Subject: [PATCH] reexport ssl types

---
 actix-connect/src/ssl/mod.rs     | 10 ++--------
 actix-connect/src/ssl/openssl.rs |  5 +++--
 actix-connect/src/ssl/rustls.rs  |  5 ++++-
 actix-tls/src/openssl.rs         |  2 +-
 actix-tls/src/rustls.rs          |  3 ++-
 5 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/actix-connect/src/ssl/mod.rs b/actix-connect/src/ssl/mod.rs
index 8b3bd2e8..8ace5ef1 100644
--- a/actix-connect/src/ssl/mod.rs
+++ b/actix-connect/src/ssl/mod.rs
@@ -1,13 +1,7 @@
 //! SSL Services
 
 #[cfg(feature = "openssl")]
-mod openssl;
-#[cfg(feature = "openssl")]
-pub use self::openssl::{
-    OpensslConnectService, OpensslConnectServiceFactory, OpensslConnector,
-};
+pub mod openssl;
 
 #[cfg(feature = "rustls")]
-mod rustls;
-#[cfg(feature = "rustls")]
-pub use self::rustls::RustlsConnector;
+pub mod rustls;
diff --git a/actix-connect/src/ssl/openssl.rs b/actix-connect/src/ssl/openssl.rs
index b7a8464d..f2fa1943 100644
--- a/actix-connect/src/ssl/openssl.rs
+++ b/actix-connect/src/ssl/openssl.rs
@@ -4,12 +4,13 @@ use std::pin::Pin;
 use std::task::{Context, Poll};
 use std::{fmt, io};
 
+pub use open_ssl::ssl::{Error as SslError, SslConnector, SslMethod};
+pub use tokio_openssl::{HandshakeError, SslStream};
+
 use actix_codec::{AsyncRead, AsyncWrite};
 use actix_rt::net::TcpStream;
 use actix_service::{Service, ServiceFactory};
 use futures::future::{err, ok, Either, FutureExt, LocalBoxFuture, Ready};
-use open_ssl::ssl::SslConnector;
-use tokio_openssl::{HandshakeError, SslStream};
 use trust_dns_resolver::AsyncResolver;
 
 use crate::{
diff --git a/actix-connect/src/ssl/rustls.rs b/actix-connect/src/ssl/rustls.rs
index 3616c44d..01cb2fab 100644
--- a/actix-connect/src/ssl/rustls.rs
+++ b/actix-connect/src/ssl/rustls.rs
@@ -5,10 +5,13 @@ use std::pin::Pin;
 use std::sync::Arc;
 use std::task::{Context, Poll};
 
+pub use rust_tls::Session;
+pub use tokio_rustls::{client::TlsStream, rustls::ClientConfig};
+
 use actix_codec::{AsyncRead, AsyncWrite};
 use actix_service::{Service, ServiceFactory};
 use futures::future::{ok, Ready};
-use tokio_rustls::{client::TlsStream, rustls::ClientConfig, Connect, TlsConnector};
+use tokio_rustls::{Connect, TlsConnector};
 use webpki::DNSNameRef;
 
 use crate::{Address, Connection};
diff --git a/actix-tls/src/openssl.rs b/actix-tls/src/openssl.rs
index 90160417..802fe0b1 100644
--- a/actix-tls/src/openssl.rs
+++ b/actix-tls/src/openssl.rs
@@ -3,13 +3,13 @@ use std::marker::PhantomData;
 use std::pin::Pin;
 use std::task::{Context, Poll};
 
+pub use open_ssl::ssl::{SslAcceptor, SslAcceptorBuilder};
 pub use tokio_openssl::{HandshakeError, SslStream};
 
 use actix_codec::{AsyncRead, AsyncWrite};
 use actix_service::{Service, ServiceFactory};
 use actix_utils::counter::{Counter, CounterGuard};
 use futures::future::{ok, FutureExt, LocalBoxFuture, Ready};
-use open_ssl::ssl::SslAcceptor;
 
 use crate::MAX_CONN_COUNTER;
 
diff --git a/actix-tls/src/rustls.rs b/actix-tls/src/rustls.rs
index 50c5cfff..b71e22a1 100644
--- a/actix-tls/src/rustls.rs
+++ b/actix-tls/src/rustls.rs
@@ -11,8 +11,9 @@ use actix_utils::counter::{Counter, CounterGuard};
 use futures::future::{ok, Ready};
 use tokio_rustls::{Accept, TlsAcceptor};
 
-pub use rust_tls::ServerConfig;
+pub use rust_tls::{ServerConfig, Session};
 pub use tokio_rustls::server::TlsStream;
+pub use webpki_roots::TLS_SERVER_ROOTS;
 
 use crate::MAX_CONN_COUNTER;