Merge pull request #1 from serprex/rustls-update

Clean up rustls-pki-types dependency

Author: ol-teuto

Cargo.toml

@@ -11,8 +11,7 @@ readme = "README.md"
 [dependencies]
 futures = { version = "0.3", default-features = false }
 ring = { version = "0.16", default-features = false }
-rustls = { version = "0.22", default-features = false }
-rustls-pki-types = { version = "1", default-features = false }
+rustls = { version = "0.22.1", default-features = false }
 tokio = { version = "1", default-features = false }
 tokio-postgres = { version = "0.7", default-features = false }
 tokio-rustls = { version = "0.25", default-features = false }

src/lib.rs

@@ -10,7 +10,7 @@ use std::{
 use futures::future::{FutureExt, TryFutureExt};
 use ring::digest;
 use rustls::ClientConfig;
-use rustls_pki_types::ServerName;
+use rustls::pki_types::ServerName;
 use tokio::io::{AsyncRead, AsyncWrite, ReadBuf};
 use tokio_postgres::tls::{ChannelBinding, MakeTlsConnect, TlsConnect};
 use tokio_rustls::{client::TlsStream, TlsConnector};
@@ -136,7 +136,7 @@ mod tests {
         client::danger::{HandshakeSignatureValid, ServerCertVerified},
         Error, SignatureScheme,
     };
-    use rustls_pki_types::{CertificateDer, UnixTime};
+    use rustls::pki_types::{CertificateDer, UnixTime};
 
     #[derive(Debug)]
     struct AcceptAllVerifier {}