Page MenuHomePhabricator
Files F3185993

D11920.id39918.diff
No OneTemporary
Actions

D11920.id39918.diff
View Options

diff --git a/native/native_rust_library/Cargo.lock b/native/native_rust_library/Cargo.lock
--- a/native/native_rust_library/Cargo.lock
+++ b/native/native_rust_library/Cargo.lock
@@ -1525,7 +1525,7 @@
"wasm-bindgen-futures",
"wasm-streams",
"web-sys",
- "webpki-roots 0.25.3",
+ "webpki-roots 0.25.4",
"winreg",
]
@@ -1571,18 +1571,6 @@
"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.3"
@@ -2031,11 +2019,11 @@
"log",
"native-tls",
"rustls",
- "rustls-native-certs",
"tokio",
"tokio-native-tls",
"tokio-rustls",
"tungstenite",
+ "webpki-roots 0.25.4",
]
[[package]]
@@ -2470,9 +2458,9 @@
[[package]]
name = "webpki-roots"
-version = "0.25.3"
+version = "0.25.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10"
+checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
[[package]]
name = "which"
diff --git a/native/native_rust_library/Cargo.toml b/native/native_rust_library/Cargo.toml
--- a/native/native_rust_library/Cargo.toml
+++ b/native/native_rust_library/Cargo.toml
@@ -21,7 +21,7 @@
[target.'cfg(target_os = "android")'.dependencies]
backup_client = { path = "../../shared/backup_client", default-features = false, features = [
- "rustls-tls",
+ "rustls-tls-webpki-roots",
] }
[target.'cfg(not(target_os = "android"))'.dependencies]
diff --git a/shared/backup_client/Cargo.toml b/shared/backup_client/Cargo.toml
--- a/shared/backup_client/Cargo.toml
+++ b/shared/backup_client/Cargo.toml
@@ -34,4 +34,4 @@
[features]
default = ["native-tls"]
native-tls = ["reqwest/native-tls", "tokio-tungstenite/native-tls"]
-rustls-tls = ["reqwest/rustls-tls", "tokio-tungstenite/rustls-tls-native-roots"]
+rustls-tls-webpki-roots = ["reqwest/rustls-tls-webpki-roots", "tokio-tungstenite/rustls-tls-webpki-roots"]

File Metadata

Mime Type
text/plain
Expires
Sat, Nov 9, 1:57 PM (19 h, 6 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2452669
Default Alt Text
D11920.id39918.diff (2 KB)

Event Timeline