Skip to content

Commit 40e951b

Browse files
committed
Re-add rustls support and enable it by default
rustls is seen as mature enough for curl to depend on it optionally, and it recently has had an audit. This commit adds back rustls support removed by 86bb185 and enables it by default.
1 parent 243b453 commit 40e951b

File tree

3 files changed

+106
-4
lines changed

3 files changed

+106
-4
lines changed

Cargo.lock

Lines changed: 95 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,14 @@ version = "1.22.1"
1313

1414
[features]
1515
curl-backend = ["download/curl-backend"]
16-
default = ["curl-backend", "reqwest-backend"]
16+
default = ["curl-backend", "reqwest-backend", "reqwest-rustls-tls"]
17+
1718
reqwest-backend = ["download/reqwest-backend"]
1819
vendored-openssl = ['openssl/vendored']
20+
21+
reqwest-default-tls = ["download/reqwest-default-tls"]
22+
reqwest-rustls-tls = ["download/reqwest-rustls-tls"]
23+
1924
# Include in the default set to disable self-update and uninstall.
2025
no-self-update = []
2126

@@ -25,7 +30,7 @@ anyhow = "1.0.31"
2530
cfg-if = "0.1"
2631
chrono = "0.4"
2732
clap = "2"
28-
download = {path = "download"}
33+
download = { path = "download", default-features = false }
2934
error-chain = "0.12"
3035
flate2 = "1"
3136
git-testament = "0.1.4"

download/Cargo.toml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,20 @@ license = "MIT/Apache-2.0"
99

1010
[features]
1111

12-
default = ["reqwest-backend"]
12+
default = ["reqwest-backend", "reqwest-rustls-tls"]
1313

1414
curl-backend = ["curl"]
1515
reqwest-backend = ["reqwest", "env_proxy", "lazy_static"]
16+
reqwest-default-tls = ["reqwest/default-tls"]
17+
reqwest-rustls-tls = ["reqwest/rustls-tls"]
1618

1719
[dependencies]
1820
error-chain = "0.12"
1921
url = "2.1"
2022
curl = { version = "0.4.11", optional = true }
2123
env_proxy = { version = "0.4.1", optional = true }
2224
lazy_static = { version = "1.0", optional = true }
23-
reqwest = { version = "0.10", features = ["blocking", "gzip", "socks"], optional = true }
25+
reqwest = { version = "0.10", default-features = false, features = ["blocking", "gzip", "socks"], optional = true }
2426

2527
[dev-dependencies]
2628
hyper = { version = "0.13", default-features = false, features = ["tcp"] }

0 commit comments

Comments
 (0)