diff --git a/Cargo.toml b/Cargo.toml index 3609cd1..b3c55aa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ edition = "2021" features = ["ntex/tokio"] [dependencies] -ntex = "1.0.0-b.0" +ntex = "1.0.0-b.1" bitflags = "2.4" log = "0.4" pin-project-lite = "0.2" @@ -25,9 +25,9 @@ thiserror = "1.0" [dev-dependencies] env_logger = "0.10" -ntex-tls = "1.0.0-b.0" +ntex-tls = "1.0.0-b.1" rustls = "0.21" rustls-pemfile = "1.0" openssl = "0.10" test-case = "3.2" -ntex = { version = "1.0.0-b.0", features = ["tokio", "rustls", "openssl"] } +ntex = { version = "1.0.0-b.1", features = ["tokio", "rustls", "openssl"] } diff --git a/examples/mqtt-ws-server.rs b/examples/mqtt-ws-server.rs index bc15aa7..2546aeb 100644 --- a/examples/mqtt-ws-server.rs +++ b/examples/mqtt-ws-server.rs @@ -7,8 +7,8 @@ use ntex::service::{chain_factory, ServiceFactory}; use ntex::util::{variant, Ready}; use ntex::ws; use ntex_mqtt::{v3, v5, HandshakeError, MqttError, MqttServer, ProtocolError}; -use ntex_tls::openssl::Acceptor; -use openssl::ssl::{SslAcceptor, SslFiletype, SslMethod}; +use ntex_tls::openssl::SslAcceptor; +use openssl::ssl::{self, SslFiletype, SslMethod}; #[derive(Clone)] struct Session; @@ -69,7 +69,7 @@ async fn main() -> std::io::Result<()> { // create self-signed certificates using: // openssl req -x509 -nodes -subj '/CN=localhost' -newkey rsa:4096 -keyout examples/key8.pem -out examples/cert.pem -days 365 -keyform PEM // openssl rsa -in examples/key8.pem -out examples/key.pem - let mut builder = SslAcceptor::mozilla_intermediate(SslMethod::tls()).unwrap(); + let mut builder = ssl::SslAcceptor::mozilla_intermediate(SslMethod::tls()).unwrap(); builder.set_private_key_file("./tests/key.pem", SslFiletype::PEM).unwrap(); builder.set_certificate_chain_file("./tests/cert.pem").unwrap(); let acceptor = builder.build(); @@ -77,7 +77,7 @@ async fn main() -> std::io::Result<()> { ntex::server::Server::build() .bind("mqtt", "127.0.0.1:8883", move |_| { // first switch to ssl stream - chain_factory(Acceptor::new(acceptor.clone())) + chain_factory(SslAcceptor::new(acceptor.clone())) .map_err(|_err| MqttError::Service(ServerError {})) // we need to read first 4 bytes and detect protocol GET or MQTT .and_then(|io: Io<_>| async move { diff --git a/examples/openssl.rs b/examples/openssl.rs index c6d544c..a252eb0 100644 --- a/examples/openssl.rs +++ b/examples/openssl.rs @@ -1,7 +1,7 @@ use ntex::service::chain_factory; use ntex_mqtt::{v3, v5, MqttError, MqttServer}; -use ntex_tls::openssl::Acceptor; -use openssl::ssl::{SslAcceptor, SslFiletype, SslMethod}; +use ntex_tls::openssl::SslAcceptor; +use openssl::ssl::{self, SslFiletype, SslMethod}; #[derive(Clone)] struct Session; @@ -55,14 +55,14 @@ async fn main() -> std::io::Result<()> { // create self-signed certificates using: // openssl req -x509 -nodes -subj '/CN=localhost' -newkey rsa:4096 -keyout examples/key8.pem -out examples/cert.pem -days 365 -keyform PEM // openssl rsa -in examples/key8.pem -out examples/key.pem - let mut builder = SslAcceptor::mozilla_intermediate(SslMethod::tls()).unwrap(); + let mut builder = ssl::SslAcceptor::mozilla_intermediate(SslMethod::tls()).unwrap(); builder.set_private_key_file("./tests/key.pem", SslFiletype::PEM).unwrap(); builder.set_certificate_chain_file("./tests/cert.pem").unwrap(); let acceptor = builder.build(); ntex::server::Server::build() .bind("mqtt", "127.0.0.1:8883", move |_| { - chain_factory(Acceptor::new(acceptor.clone())) + chain_factory(SslAcceptor::new(acceptor.clone())) .map_err(|_err| MqttError::Service(ServerError {})) .and_then( MqttServer::new() diff --git a/examples/rustls.rs b/examples/rustls.rs index 920be98..d2d266d 100644 --- a/examples/rustls.rs +++ b/examples/rustls.rs @@ -2,7 +2,7 @@ use std::{fs::File, io::BufReader, sync::Arc}; use ntex::service::chain_factory; use ntex_mqtt::{v3, v5, MqttError, MqttServer}; -use ntex_tls::rustls::Acceptor; +use ntex_tls::rustls::TlsAcceptor; use rustls::{Certificate, PrivateKey, ServerConfig}; use rustls_pemfile::{certs, rsa_private_keys}; @@ -74,7 +74,7 @@ async fn main() -> std::io::Result<()> { ntex::server::Server::build() .bind("mqtt", "127.0.0.1:8883", move |_| { - chain_factory(Acceptor::new(tls_acceptor.clone())) + chain_factory(TlsAcceptor::new(tls_acceptor.clone())) .map_err(|_err| MqttError::Service(ServerError {})) .and_then( MqttServer::new() diff --git a/src/io.rs b/src/io.rs index 3af5ac4..aaca3ff 100644 --- a/src/io.rs +++ b/src/io.rs @@ -586,7 +586,7 @@ mod tests { codec: U, service: F, ) -> (Self, nio::IoRef) { - let keepalive_timeout = Seconds(30).into(); + let keepalive_timeout = Seconds(30); let rio = io.get_ref(); let config = DispatcherConfig::default(); diff --git a/tests/test_server.rs b/tests/test_server.rs index 2038ceb..7b8b599 100644 --- a/tests/test_server.rs +++ b/tests/test_server.rs @@ -546,13 +546,14 @@ async fn test_large_publish_openssl() -> std::io::Result<()> { use openssl::ssl::{SslConnector, SslMethod, SslVerifyMode}; let srv = server::test_server(move || { - chain_factory(server::openssl::Acceptor::new(ssl_acceptor()).map_err(|_| ())).and_then( - MqttServer::new(handshake) - .publish(|_| Ready::Ok(())) - .finish() - .map_err(|_| ()) - .map_init_err(|_| ()), - ) + chain_factory(server::openssl::SslAcceptor::new(ssl_acceptor()).map_err(|_| ())) + .and_then( + MqttServer::new(handshake) + .publish(|_| Ready::Ok(())) + .finish() + .map_err(|_| ()) + .map_init_err(|_| ()), + ) }); let mut builder = SslConnector::builder(SslMethod::tls()).unwrap();