diff --git a/CHANGELOG.md b/CHANGELOG.md index 205a2fdfe..d23516248 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,12 @@ - [Rust](https://github.com/moonrepo/rust-plugin/blob/master/CHANGELOG.md) - [Schema](https://github.com/moonrepo/schema-plugin/blob/master/CHANGELOG.md) +## Unreleased + +#### 🐞 Fixes + +- Update our rustls dependency to use OS native certificates. + ## 0.18.0 #### 🚀 Updates diff --git a/Cargo.lock b/Cargo.lock index 8845d862a..512688c89 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -594,6 +594,16 @@ dependencies = [ "unicode-segmentation", ] +[[package]] +name = "core-foundation" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "core-foundation-sys" version = "0.8.4" @@ -2159,6 +2169,12 @@ dependencies = [ "stable_deref_trait", ] +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + [[package]] name = "option-ext" version = "0.2.0" @@ -2602,6 +2618,7 @@ dependencies = [ "percent-encoding", "pin-project-lite", "rustls 0.21.7", + "rustls-native-certs", "rustls-pemfile", "serde", "serde_json", @@ -2615,7 +2632,6 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots 0.25.2", "winreg 0.50.0", ] @@ -2735,6 +2751,18 @@ dependencies = [ "sct", ] +[[package]] +name = "rustls-native-certs" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +dependencies = [ + "openssl-probe", + "rustls-pemfile", + "schannel", + "security-framework", +] + [[package]] name = "rustls-pemfile" version = "1.0.2" @@ -2769,6 +2797,15 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "schannel" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +dependencies = [ + "windows-sys 0.48.0", +] + [[package]] name = "scopeguard" version = "1.1.0" @@ -2791,6 +2828,29 @@ dependencies = [ "untrusted", ] +[[package]] +name = "security-framework" +version = "2.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "semver" version = "1.0.18" @@ -3621,7 +3681,7 @@ dependencies = [ "rustls 0.20.8", "url", "webpki", - "webpki-roots 0.22.6", + "webpki-roots", ] [[package]] @@ -4280,12 +4340,6 @@ dependencies = [ "webpki", ] -[[package]] -name = "webpki-roots" -version = "0.25.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" - [[package]] name = "wiggle" version = "11.0.1" diff --git a/Cargo.toml b/Cargo.toml index e6107d0c3..cc39d7bd2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ once_cell = "1.18.0" once_map = "0.4.8" regex = "1.9.5" reqwest = { version = "0.11.20", default-features = false, features = [ - "rustls-tls", + "rustls-tls-native-roots", ] } semver = "1.0.18" serde = { version = "1.0.188", features = ["derive"] }