Track the latest changes from upstream rustls

Cargo.toml

@@ -18,7 +18,6 @@ rustls = { version = "=0.22.0-alpha.2", default-features = false }
 
 [features]
 default = ["logging", "tls12"]
-dangerous_configuration = ["rustls/dangerous_configuration"]
 early-data = []
 logging = ["rustls/logging"]
 secret_extraction = ["rustls/secret_extraction"]
@@ -28,7 +27,10 @@ tls12 = ["rustls/tls12"]
 argh = "0.1"
 tokio = { version = "1.0", features = ["full"] }
 futures-util = "0.3.1"
-lazy_static = "1"
+lazy_static = "1.1"
 webpki-roots = "=0.26.0-alpha.1"
 rustls-pemfile = "=2.0.0-alpha.1"
-webpki = { package = "rustls-webpki", version = "=0.102.0-alpha.2", features = ["alloc", "std"] }
+webpki = { package = "rustls-webpki", version = "=0.102.0-alpha.3", features = ["alloc", "std"] }
+
+[patch.crates-io]
+rustls = { git = 'https://github.com/rustls/rustls' }

src/lib.rs

@@ -47,7 +47,6 @@ use std::sync::Arc;
 use std::task::{Context, Poll};
 
 pub use rustls;
-use rustls::crypto::ring::Ring;
 use rustls::{ClientConfig, ClientConnection, CommonState, ServerConfig, ServerConnection};
 use tokio::io::{AsyncRead, AsyncWrite, ReadBuf};
 
@@ -68,19 +67,19 @@ pub mod server;
 /// A wrapper around a `rustls::ClientConfig`, providing an async `connect` method.
 #[derive(Clone)]
 pub struct TlsConnector {
-    inner: Arc<ClientConfig<Ring>>,
+    inner: Arc<ClientConfig>,
     #[cfg(feature = "early-data")]
     early_data: bool,
 }
 
 /// A wrapper around a `rustls::ServerConfig`, providing an async `accept` method.
 #[derive(Clone)]
 pub struct TlsAcceptor {
-    inner: Arc<ServerConfig<Ring>>,
+    inner: Arc<ServerConfig>,
 }
 
-impl From<Arc<ClientConfig<Ring>>> for TlsConnector {
-    fn from(inner: Arc<ClientConfig<Ring>>) -> TlsConnector {
+impl From<Arc<ClientConfig>> for TlsConnector {
+    fn from(inner: Arc<ClientConfig>) -> TlsConnector {
         TlsConnector {
             inner,
             #[cfg(feature = "early-data")]
@@ -89,8 +88,8 @@ impl From<Arc<ClientConfig<Ring>>> for TlsConnector {
     }
 }
 
-impl From<Arc<ServerConfig<Ring>>> for TlsAcceptor {
-    fn from(inner: Arc<ServerConfig<Ring>>) -> TlsAcceptor {
+impl From<Arc<ServerConfig>> for TlsAcceptor {
+    fn from(inner: Arc<ServerConfig>) -> TlsAcceptor {
         TlsAcceptor { inner }
     }
 }
@@ -214,7 +213,7 @@ where
     /// # use rustls::crypto::ring::Ring;
     /// # fn choose_server_config(
     /// #     _: rustls::server::ClientHello,
-    /// # ) -> std::sync::Arc<rustls::ServerConfig<Ring>> {
+    /// # ) -> std::sync::Arc<rustls::ServerConfig> {
     /// #     unimplemented!();
     /// # }
     /// # #[allow(unused_variables)]
@@ -306,11 +305,11 @@ where
         self.accepted.client_hello()
     }
 
-    pub fn into_stream(self, config: Arc<ServerConfig<Ring>>) -> Accept<IO> {
+    pub fn into_stream(self, config: Arc<ServerConfig>) -> Accept<IO> {
         self.into_stream_with(config, |_| ())
     }
 
-    pub fn into_stream_with<F>(self, config: Arc<ServerConfig<Ring>>, f: F) -> Accept<IO>
+    pub fn into_stream_with<F>(self, config: Arc<ServerConfig>, f: F) -> Accept<IO>
     where
         F: FnOnce(&mut ServerConnection),
     {