Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Re-enable rustls #701

Closed
wants to merge 11 commits into from
Closed

Re-enable rustls #701

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3ae6744
Reenable rustls
MaikKlein Nov 5, 2019
af466de
Merge branch 'master' into master
repi Nov 14, 2019
7a5925f
Merge branch 'master' into master
repi Nov 27, 2019
f488bf4
Merge remote-tracking branch 'upstream/master' into rustls
Dec 15, 2019
c56e5b4
Update rustls
MaikKlein Dec 18, 2019
2990019
Merge remote-tracking branch 'upstream/master'
MaikKlein Dec 18, 2019
a1953f6
Use released version of hyper-rustls
Dec 18, 2019
8600951
Don't pin tokio/hyper dependencies
MaikKlein Dec 18, 2019
f3983ab
Merge remote-tracking branch 'rustls/master' into rustls
Dec 18, 2019
6ee1d59
Merge pull request #1 from glebpom/rustls
MaikKlein Dec 18, 2019
cf1dc43
Re-enable rustls testing on the CI
MaikKlein Dec 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 6 additions & 6 deletions Cargo.toml
View file
Open in desktop
Expand Up @@ -23,7 +23,7 @@ tls = []
default-tls = ["hyper-tls", "native-tls", "tls", "tokio-tls"]
default-tls-vendored = ["default-tls", "native-tls/vendored"]

#rustls-tls = ["hyper-rustls", "tokio-rustls", "webpki-roots", "rustls", "tls"]
rustls-tls = ["hyper-rustls", "tokio-rustls", "webpki-roots", "rustls", "tls"]

blocking = ["futures-channel", "futures-util/io", "tokio/rt-threaded", "tokio/rt-core"]

Expand Down Expand Up @@ -77,11 +77,11 @@ hyper-tls = { version = "0.4", optional = true }
native-tls = { version = "0.2", optional = true }
tokio-tls = { version = "0.3.0", optional = true }

## rustls-tls
#hyper-rustls = { version = "=0.18.0-alpha.1", optional = true }
#rustls = { version = "0.16", features = ["dangerous_configuration"], optional = true }
#tokio-rustls = { version = "=0.12.0-alpha.2", optional = true }
#webpki-roots = { version = "0.17", optional = true }
# rustls-tls
hyper-rustls = { version = "=0.18.0", optional = true }
MaikKlein marked this conversation as resolved.
Show resolved Hide resolved
rustls = { version = "0.16", features = ["dangerous_configuration"], optional = true }
tokio-rustls = { version = "=0.12.0", optional = true }
MaikKlein marked this conversation as resolved.
Show resolved Hide resolved
webpki-roots = { version = "0.17", optional = true }

## blocking
futures-channel = { version = "0.3.0", optional = true }
Expand Down
8 changes: 4 additions & 4 deletions src/connect.rs
View file
Open in desktop
Expand Up @@ -244,12 +244,12 @@ impl Connector {
// Disable Nagle's algorithm for TLS handshake
//
// https://www.openssl.org/docs/man1.1.1/man3/SSL_connect.html#NOTES
http.set_nodelay(no_delay || (dst.scheme() == Some(&Scheme::HTTPS)));
http.set_nodelay(self.no_delay || (dst.scheme() == Some(&Scheme::HTTPS)));

let http = hyper_rustls::HttpsConnector::from((http, tls.clone()));
let io = http.connect(dst).await?;
if let hyper_rustls::MaybeHttpsStream::Https(stream) = &io {
if !no_delay {
if !self.nodelay {
let (io, _) = stream.get_ref();
io.set_nodelay(false)?;
}
Expand Down Expand Up @@ -327,15 +327,15 @@ impl Connector {
let host = dst.host().to_owned();
let port = dst.port().unwrap_or(443);
let mut http = http.clone();
http.set_nodelay(no_delay);
http.set_nodelay(self.nodelay);
let http = hyper_rustls::HttpsConnector::from((http, tls_proxy.clone()));
let tls = tls.clone();
let (conn, connected) = http.connect(proxy_dst).await?;
log::trace!("tunneling HTTPS over proxy");
let maybe_dnsname = DNSNameRef::try_from_ascii_str(&host)
.map(|dnsname| dnsname.to_owned())
.map_err(|_| io::Error::new(io::ErrorKind::Other, "Invalid DNS Name"));
let tunneled = tunnel(conn, host, port, auth).await?;
let tunneled = tunnel(conn, host, port, self.user_agent.clone(), auth).await?;
let dnsname = maybe_dnsname?;
let io = RustlsConnector::from(tls)
.connect(dnsname.as_ref(), tunneled)
Expand Down