From 45b567364e76e9189a07c5a41bc52915362e0560 Mon Sep 17 00:00:00 2001 From: Kyle Barron Date: Fri, 22 Mar 2024 14:33:08 -0400 Subject: [PATCH] use rustls-ssl --- python/core/Cargo.lock | 11 +---------- python/core/Cargo.toml | 6 ++++-- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/python/core/Cargo.lock b/python/core/Cargo.lock index e3c2a5ff..ca21e5d6 100644 --- a/python/core/Cargo.lock +++ b/python/core/Cargo.lock @@ -1868,15 +1868,6 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" -[[package]] -name = "openssl-src" -version = "300.2.3+3.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cff92b6f71555b61bb9315f7c64da3ca43d87531622120fea0195fc761b4843" -dependencies = [ - "cc", -] - [[package]] name = "openssl-sys" version = "0.9.101" @@ -1885,7 +1876,6 @@ checksum = "dda2b0f344e78efc2facf7d195d098df0dd72151b26ab98da807afc26c198dff" dependencies = [ "cc", "libc", - "openssl-src", "pkg-config", "vcpkg", ] @@ -2345,6 +2335,7 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", + "webpki-roots", "winreg", ] diff --git a/python/core/Cargo.toml b/python/core/Cargo.toml index 1286b146..9b381f46 100644 --- a/python/core/Cargo.toml +++ b/python/core/Cargo.toml @@ -55,5 +55,7 @@ tokio = { version = "1.9", features = ["rt"] } url = "2.5" # reqwest is pulled in by object store, but not used by python binding itself -# for binary wheel best practice, statically link openssl -reqwest = { version = "*", features = ["native-tls-vendored"] } +# We statically link the rust-native rustls. For a binary wheel we want a +# static-compiled openssl anyways, and having it be native rust seems to make +# things simpler. +reqwest = { version = "*", features = ["rustls-tls"] }