diff --git a/Cargo.lock b/Cargo.lock index 119a85386c5..635616b0f54 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -127,6 +127,12 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" +[[package]] +name = "base64" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" + [[package]] name = "bitfield" version = "0.13.2" @@ -1210,8 +1216,8 @@ dependencies = [ "openssl-probe", "openssl-sys", "schannel", - "security-framework", - "security-framework-sys", + "security-framework 0.4.4", + "security-framework-sys 0.4.3", "tempfile", ] @@ -1399,7 +1405,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59698ea79df9bf77104aefd39cc3ec990cb9693fb59c3b0a70ddf2646fdffb4b" dependencies = [ - "base64", + "base64 0.12.3", "once_cell", "regex", ] @@ -1417,7 +1423,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2383404bdc502aec7e861f7406437964acba728383ac907881e8023e4d9d9706" dependencies = [ "aes", - "base64", + "base64 0.12.3", "bitfield", "block-modes", "block-padding 0.2.1", @@ -1658,11 +1664,10 @@ dependencies = [ [[package]] name = "reqwest" version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9eaa17ac5d7b838b7503d118fa16ad88f440498bf9ffe5424e621f93190d61e" +source = "git+https://github.com/est31/reqwest/?branch=rustls-roots#8b6b4a2ffd9a176a10e7edfa2fce5a11bfcd41ed" dependencies = [ "async-compression", - "base64", + "base64 0.13.0", "bytes 0.5.6", "encoding_rs", "futures-core", @@ -1682,6 +1687,7 @@ dependencies = [ "percent-encoding", "pin-project-lite", "rustls", + "rustls-native-certs", "serde", "serde_urlencoded", "tokio", @@ -1692,7 +1698,6 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots", "winreg", ] @@ -1776,13 +1781,25 @@ version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d1126dcf58e93cee7d098dbda643b5f92ed724f1f6a63007c1116eed6700c81" dependencies = [ - "base64", + "base64 0.12.3", "log", "ring", "sct", "webpki", ] +[[package]] +name = "rustls-native-certs" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "629d439a7672da82dd955498445e496ee2096fe2117b9f796558a43fdb9e59b8" +dependencies = [ + "openssl-probe", + "rustls", + "schannel", + "security-framework 1.0.0", +] + [[package]] name = "rustup" version = "1.22.1" @@ -1886,7 +1903,20 @@ dependencies = [ "core-foundation", "core-foundation-sys", "libc", - "security-framework-sys", + "security-framework-sys 0.4.3", +] + +[[package]] +name = "security-framework" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad502866817f0575705bd7be36e2b2535cc33262d493aa733a2ec862baa2bc2b" +dependencies = [ + "bitflags", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys 1.0.0", ] [[package]] @@ -1899,6 +1929,16 @@ dependencies = [ "libc", ] +[[package]] +name = "security-framework-sys" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51ceb04988b17b6d1dcd555390fa822ca5637b4a14e1f5099f13d351bed4d6c7" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "semver" version = "0.10.0" @@ -2240,9 +2280,9 @@ dependencies = [ [[package]] name = "tokio-socks" -version = "0.2.2" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1997788a0e25e09300e44680ba1ef9d44d6f634a883641f80109e8b59c928daf" +checksum = "d611fd5d241872372d52a0a3d309c52d0b95a6a67671a6c8f7ab2c4a37fb2539" dependencies = [ "bytes 0.4.12", "either", @@ -2552,15 +2592,6 @@ dependencies = [ "untrusted", ] -[[package]] -name = "webpki-roots" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8eff4b7516a57307f9349c64bf34caa34b940b66fed4b2fb3136cb7386e5739" -dependencies = [ - "webpki", -] - [[package]] name = "winapi" version = "0.2.8" diff --git a/download/Cargo.toml b/download/Cargo.toml index bd53b4fe13c..6a663ffc38e 100644 --- a/download/Cargo.toml +++ b/download/Cargo.toml @@ -14,7 +14,7 @@ default = ["reqwest-backend", "reqwest-rustls-tls", "reqwest-default-tls"] curl-backend = ["curl"] reqwest-backend = ["reqwest", "env_proxy", "lazy_static"] reqwest-default-tls = ["reqwest/default-tls"] -reqwest-rustls-tls = ["reqwest/rustls-tls"] +reqwest-rustls-tls = ["reqwest/rustls-tls-native-roots"] [dependencies] error-chain = "0.12" @@ -22,7 +22,7 @@ url = "2.1" curl = { version = "0.4.11", optional = true } env_proxy = { version = "0.4.1", optional = true } lazy_static = { version = "1.0", optional = true } -reqwest = { version = "0.10", default-features = false, features = ["blocking", "gzip", "socks"], optional = true } +reqwest = { git = "https://github.com/est31/reqwest/", branch = "rustls-roots", default-features = false, features = ["blocking", "gzip", "socks"], optional = true } [dev-dependencies] hyper = { version = "0.13", default-features = false, features = ["tcp"] }