upgrade trust-dns-openssl to Tokio 0.3

Cargo.lock

@@ -1625,6 +1625,17 @@ dependencies = [
  "tokio 0.2.22",
 ]
 
+[[package]]
+name = "tokio-openssl"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d01e5cc2d3a154fa310982d0affaec8140d6476805422265b2f648eb813f937f"
+dependencies = [
+ "openssl",
+ "openssl-sys",
+ "tokio 0.3.3",
+]
+
 [[package]]
 name = "tokio-rustls"
 version = "0.14.1"
@@ -1845,7 +1856,7 @@ dependencies = [
  "futures-util",
  "openssl",
  "tokio 0.3.3",
- "tokio-openssl",
+ "tokio-openssl 0.5.0",
  "trust-dns-proto",
 ]
 
@@ -1900,7 +1911,7 @@ dependencies = [
  "thiserror",
  "tokio 0.3.3",
  "tokio-native-tls",
- "tokio-openssl",
+ "tokio-openssl 0.4.0",
  "tokio-rustls 0.14.1",
  "trust-dns-https",
  "trust-dns-native-tls",
@@ -1946,7 +1957,7 @@ dependencies = [
  "serde",
  "thiserror",
  "tokio 0.3.3",
- "tokio-openssl",
+ "tokio-openssl 0.4.0",
  "tokio-rustls 0.14.1",
  "toml",
  "trust-dns-client",

crates/openssl/Cargo.toml

@@ -50,7 +50,7 @@ path = "src/lib.rs"
 futures-channel = { version = "0.3.5", default-features = false, features = ["std"] }
 futures-util = { version = "0.3.5", default-features = false, features = ["std"] }
 openssl = { version = "0.10", features = ["v102", "v110"] }
-tokio-openssl = "0.4.0"
+tokio-openssl = "0.5.0"
 tokio = "0.3.0"
 trust-dns-proto = { version = "0.20.0-alpha.3", path = "../proto", features = ["openssl"] }
 

crates/openssl/src/tls_client_stream.rs

@@ -18,14 +18,14 @@ use tokio::net::TcpStream as TokioTcpStream;
 use tokio_openssl::SslStream as TokioTlsStream;
 
 use trust_dns_proto::error::ProtoError;
-use trust_dns_proto::iocompat::AsyncIo02As03;
+use trust_dns_proto::iocompat::AsyncIoTokioAsStd;
 use trust_dns_proto::tcp::TcpClientStream;
 use trust_dns_proto::xfer::BufDnsStreamHandle;
 
 use super::TlsStreamBuilder;
 
 /// A Type definition for the TLS stream
-pub type TlsClientStream = TcpClientStream<AsyncIo02As03<TokioTlsStream<TokioTcpStream>>>;
+pub type TlsClientStream = TcpClientStream<AsyncIoTokioAsStd<TokioTlsStream<TokioTcpStream>>>;
 
 /// A Builder for the TlsClientStream
 pub struct TlsClientStreamBuilder(TlsStreamBuilder);

crates/openssl/src/tls_stream.rs

@@ -20,7 +20,7 @@ use openssl::x509::{X509Ref, X509};
 use tokio::net::TcpStream as TokioTcpStream;
 use tokio_openssl::{self, SslStream as TokioTlsStream};
 
-use trust_dns_proto::iocompat::AsyncIo02As03;
+use trust_dns_proto::iocompat::AsyncIoTokioAsStd;
 use trust_dns_proto::tcp::{self, TcpStream};
 use trust_dns_proto::xfer::BufStreamHandle;
 
@@ -57,7 +57,7 @@ impl TlsIdentityExt for SslContextBuilder {
 }
 
 /// A TlsStream counterpart to the TcpStream which embeds a secure TlsStream
-pub type TlsStream = TcpStream<AsyncIo02As03<TokioTlsStream<TokioTcpStream>>>;
+pub type TlsStream = TcpStream<AsyncIoTokioAsStd<TokioTlsStream<TokioTcpStream>>>;
 
 fn new(certs: Vec<X509>, pkcs12: Option<ParsedPkcs12>) -> io::Result<SslConnector> {
     let mut tls = SslConnector::builder(SslMethod::tls()).map_err(|e| {
@@ -116,7 +116,7 @@ fn new(certs: Vec<X509>, pkcs12: Option<ParsedPkcs12>) -> io::Result<SslConnecto
 ///
 /// This is intended for use with a TlsListener and Incoming connections
 pub fn tls_stream_from_existing_tls_stream(
-    stream: AsyncIo02As03<TokioTlsStream<TokioTcpStream>>,
+    stream: AsyncIoTokioAsStd<TokioTlsStream<TokioTcpStream>>,
     peer_addr: SocketAddr,
 ) -> (TlsStream, BufStreamHandle) {
     let (message_sender, outbound_messages) = BufStreamHandle::create();
@@ -244,7 +244,7 @@ impl TlsStreamBuilder {
         let stream = Box::pin(
             connect_tls(tls_config, dns_name, name_server).map_ok(move |s| {
                 TcpStream::from_stream_with_receiver(
-                    AsyncIo02As03(s),
+                    AsyncIoTokioAsStd(s),
                     name_server,
                     outbound_messages,
                 )

crates/openssl/tests/openssl_tests.rs

@@ -74,7 +74,8 @@ fn tls_client_stream_test(server_addr: IpAddr, mtls: bool) {
                 }
             }
 
-            panic!("timeout");
+            println!("Thread Killer has been awoken, killing process");
+            std::process::exit(-1);
         })
         .unwrap();