Factor out tokio-openssl support to new trust_dns_openssl crate. #217
Conversation
| @@ -217,7 +218,6 @@ fn tls_client_stream_test(server_addr: IpAddr, mtls: bool) { | |||
| } | |||
|
|
|||
| #[allow(unused_variables)] | |||
| #[cfg(feature = "tls")] | |||
| fn config_mtls( | |||
There was a problem hiding this comment.
btw, none of my mtls stuff is working at the moment. The OpenSSL library has an ugly habit of just grabbing STDIN and trying to read for passwds, etc. Never got to the bottom of it. It was before I had rustls that I started this though, so maybe when I fix this, I'll just support rustls. Issue #100
There was a problem hiding this comment.
OK. Does that affect this PR in any way? The main goal here is to eliminate OpenSSL-related crate dependencies outside of this new crate, and to accomplish that, this code needs to be moved, IIUC.
There was a problem hiding this comment.
No... I just wanted you to be aware in case any of the methods "appear" to be unused.
|
|
||
| # This points to a file in the repository (relative to this Cargo.toml). The | ||
| # contents of this file are stored and indexed in the registry. | ||
| readme = "README.md" |
There was a problem hiding this comment.
I added it in the new rebased commits.
| @@ -1,3 +1,5 @@ | |||
| #![cfg(feature = "tls")] | |||
There was a problem hiding this comment.
Does this just disable the entire test suite? that's nice.
Don't run TLS tests when the TLS feature is disabled. Don't depend on crates only needed for TLS when TLS is disabled. Besides just generally cleaning things up, this is also a step toward making `cargo test` work out of the box on Windows without OpenSSL installed.
Move the openssl and tokio-openssl dependencies to trust-dns-openssl. This is a step towards adapting the remaining server code to work with other TLS implementations.
|
This looks good, shall I merge? |
|
|
||
| /// A Type definition for the TLS stream | ||
| pub type TlsClientStream = TcpClientStream<TokioTlsStream<TokioTcpStream>>; | ||
|
|
||
| impl TlsClientStream { |
There was a problem hiding this comment.
This had to be changed because we can't impl TlsClientStream from this crate, since TlsClientStream is an alias to a type defined in another crate now.
| @@ -57,81 +57,71 @@ impl TlsIdentityExt for SslContextBuilder { | |||
| /// A TlsStream counterpart to the TcpStream which embeds a secure TlsStream | |||
| pub type TlsStream = TcpStream<TokioTlsStream<TokioTcpStream>>; | |||
|
|
|||
| impl TlsStream { | |||
There was a problem hiding this comment.
Ditto, we can't impl TlsStream here because TlsStream is an alias to a type defined in another crate.
|
|
||
| # This points to a file in the repository (relative to this Cargo.toml). The | ||
| # contents of this file are stored and indexed in the registry. | ||
| readme = "README.md" |
There was a problem hiding this comment.
I added it in the new rebased commits.
| @@ -217,7 +218,6 @@ fn tls_client_stream_test(server_addr: IpAddr, mtls: bool) { | |||
| } | |||
|
|
|||
| #[allow(unused_variables)] | |||
| #[cfg(feature = "tls")] | |||
| fn config_mtls( | |||
There was a problem hiding this comment.
OK. Does that affect this PR in any way? The main goal here is to eliminate OpenSSL-related crate dependencies outside of this new crate, and to accomplish that, this code needs to be moved, IIUC.
| @@ -1,3 +1,5 @@ | |||
| #![cfg(feature = "tls")] | |||
No description provided.