Skip to content

Commit

Permalink
Update reqwest and rustls platform verifier
Browse files Browse the repository at this point in the history
  • Loading branch information
dani-garcia committed Jun 18, 2024
1 parent 331c321 commit ab933e6
Show file tree
Hide file tree
Showing 7 changed files with 107 additions and 40 deletions.
129 changes: 98 additions & 31 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion crates/bitwarden-api-api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ serde_json = ">=1.0.96, <2"
serde_repr = ">=0.1.12, <0.2"
url = ">=2.5, <3"
uuid = { version = ">=1.3.3, <2", features = ["serde", "v4"] }
reqwest = { version = ">=0.12, <0.13", features = ["json", "multipart", "http2"], default-features = false }
reqwest = { version = ">=0.12.5, <0.13", features = ["json", "multipart", "http2"], default-features = false }
2 changes: 1 addition & 1 deletion crates/bitwarden-api-identity/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ serde_json = ">=1.0.96, <2"
serde_repr = ">=0.1.12, <0.2"
url = ">=2.5, <3"
uuid = { version = ">=1.3.3, <2", features = ["serde", "v4"] }
reqwest = { version = ">=0.12, <0.13", features = ["json", "multipart", "http2"], default-features = false }
reqwest = { version = ">=0.12.5, <0.13", features = ["json", "multipart", "http2"], default-features = false }
2 changes: 1 addition & 1 deletion crates/bitwarden-fido/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ coset = { version = "0.3.7" }
log = ">=0.4.18, <0.5"
p256 = { version = ">=0.13.2, <0.14" }
passkey = { git = "https://github.com/bitwarden/passkey-rs", rev = "c48c2ddfd6b884b2d754432576c66cb2b1985a3a" }
reqwest = { version = ">=0.12, <0.13", default-features = false }
reqwest = { version = ">=0.12.5, <0.13", default-features = false }
serde = { version = ">=1.0, <2.0", features = ["derive"] }
serde_json = ">=1.0.96, <2.0"
thiserror = ">=1.0.40, <2.0"
Expand Down
2 changes: 1 addition & 1 deletion crates/bitwarden-generators/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ uniffi = ["dep:uniffi"] # Uniffi bindings
[dependencies]
bitwarden-crypto = { workspace = true }
rand = ">=0.8.5, <0.9"
reqwest = { version = ">=0.12, <0.13", features = [
reqwest = { version = ">=0.12.5, <0.13", features = [
"http2",
"json",
], default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion crates/bitwarden-vault/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ chrono = { version = ">=0.4.26, <0.5", features = [
], default-features = false }
rand = ">=0.8.5, <0.9"
hmac = ">=0.12.1, <0.13"
reqwest = { version = ">=0.12, <0.13", default-features = false }
reqwest = { version = ">=0.12.5, <0.13", default-features = false }
schemars = { version = ">=0.8.9, <0.9", features = ["uuid1", "chrono"] }
serde = { version = ">=1.0, <2.0", features = ["derive"] }
serde_json = ">=1.0.96, <2.0"
Expand Down
8 changes: 4 additions & 4 deletions crates/bitwarden/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ chrono = { version = ">=0.4.26, <0.5", features = [
getrandom = { version = ">=0.2.9, <0.3", features = ["js"] }
log = ">=0.4.18, <0.5"
rand = ">=0.8.5, <0.9"
reqwest = { version = ">=0.12, <0.13", features = [
reqwest = { version = ">=0.12.5, <0.13", features = [
"http2",
"json",
], default-features = false }
Expand All @@ -78,15 +78,15 @@ zxcvbn = ">= 2.2.2, <3.0"
# There are a few exceptions to this:
# - WASM doesn't require a TLS stack, as it just uses the browsers/node fetch
# - Android uses webpki-roots for the moment
reqwest = { version = ">=0.12, <0.13", features = [
reqwest = { version = ">=0.12.5, <0.13", features = [
"rustls-tls-manual-roots",
], default-features = false }
rustls-platform-verifier = "0.2.0"
rustls-platform-verifier = "0.3.1"

[target.'cfg(target_os = "android")'.dependencies]
# On android, the use of rustls-platform-verifier is more complicated and going through some changes at the moment, so we fall back to using webpki-roots
# This means that for the moment android won't support self-signed certificates, even if they are included in the OS trust store
reqwest = { version = ">=0.12, <0.13", features = [
reqwest = { version = ">=0.12.5, <0.13", features = [
"rustls-tls-webpki-roots",
], default-features = false }

Expand Down

0 comments on commit ab933e6

Please sign in to comment.