actix/actix-net
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-net synced 2024-11-24 05:52:59 +01:00
Code Issues Releases Wiki Activity

reexport ssl types

Browse Source
This commit is contained in:
Nikolay Kim 2019-12-05 23:09:34 +06:00
parent cb2845cb26
commit 88a60ffa66
5 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
actix-connect/src/ssl/mod.rs
View File

@ -1,13 +1,7 @@
//! SSL Services //! SSL Services
#[cfg(feature = "openssl")] #[cfg(feature = "openssl")]
mod openssl; pub mod openssl;
#[cfg(feature = "openssl")]
pub use self::openssl::{
OpensslConnectService, OpensslConnectServiceFactory, OpensslConnector,
};
#[cfg(feature = "rustls")] #[cfg(feature = "rustls")]
mod rustls; pub mod rustls;
#[cfg(feature = "rustls")]
pub use self::rustls::RustlsConnector;

5
actix-connect/src/ssl/openssl.rs
View File

@ -4,12 +4,13 @@ use std::pin::Pin;
use std::task::{Context, Poll}; use std::task::{Context, Poll};
use std::{fmt, io}; 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_codec::{AsyncRead, AsyncWrite};
use actix_rt::net::TcpStream; use actix_rt::net::TcpStream;
use actix_service::{Service, ServiceFactory}; use actix_service::{Service, ServiceFactory};
use futures::future::{err, ok, Either, FutureExt, LocalBoxFuture, Ready}; 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 trust_dns_resolver::AsyncResolver;
use crate::{ use crate::{

5
actix-connect/src/ssl/rustls.rs
View File

@ -5,10 +5,13 @@ use std::pin::Pin;
use std::sync::Arc; use std::sync::Arc;
use std::task::{Context, Poll}; 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_codec::{AsyncRead, AsyncWrite};
use actix_service::{Service, ServiceFactory}; use actix_service::{Service, ServiceFactory};
use futures::future::{ok, Ready}; use futures::future::{ok, Ready};
use tokio_rustls::{client::TlsStream, rustls::ClientConfig, Connect, TlsConnector}; use tokio_rustls::{Connect, TlsConnector};
use webpki::DNSNameRef; use webpki::DNSNameRef;
use crate::{Address, Connection}; use crate::{Address, Connection};

2
actix-tls/src/openssl.rs
View File

@ -3,13 +3,13 @@ use std::marker::PhantomData;
use std::pin::Pin; use std::pin::Pin;
use std::task::{Context, Poll}; use std::task::{Context, Poll};
pub use open_ssl::ssl::{SslAcceptor, SslAcceptorBuilder};
pub use tokio_openssl::{HandshakeError, SslStream}; pub use tokio_openssl::{HandshakeError, SslStream};
use actix_codec::{AsyncRead, AsyncWrite}; use actix_codec::{AsyncRead, AsyncWrite};
use actix_service::{Service, ServiceFactory}; use actix_service::{Service, ServiceFactory};
use actix_utils::counter::{Counter, CounterGuard}; use actix_utils::counter::{Counter, CounterGuard};
use futures::future::{ok, FutureExt, LocalBoxFuture, Ready}; use futures::future::{ok, FutureExt, LocalBoxFuture, Ready};
use open_ssl::ssl::SslAcceptor;
use crate::MAX_CONN_COUNTER; use crate::MAX_CONN_COUNTER;

3
actix-tls/src/rustls.rs
View File

@ -11,8 +11,9 @@ use actix_utils::counter::{Counter, CounterGuard};
use futures::future::{ok, Ready}; use futures::future::{ok, Ready};
use tokio_rustls::{Accept, TlsAcceptor}; use tokio_rustls::{Accept, TlsAcceptor};
pub use rust_tls::ServerConfig; pub use rust_tls::{ServerConfig, Session};
pub use tokio_rustls::server::TlsStream; pub use tokio_rustls::server::TlsStream;
pub use webpki_roots::TLS_SERVER_ROOTS;
use crate::MAX_CONN_COUNTER; use crate::MAX_CONN_COUNTER;