Skip to content

Commit

Permalink
Test fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Thomas-Avery committed Aug 13, 2024
1 parent d5462df commit 6a7e7ca
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 87 deletions.
32 changes: 0 additions & 32 deletions .github/workflows/build-test-rustls-platform-verifier.yml

This file was deleted.

13 changes: 1 addition & 12 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 Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[workspace]
resolver = "2"
members = ["crates/*", "test-rustls-platform-verifier"]
members = ["crates/*"]

# Global settings for all crates should be defined here
[workspace.package]
Expand Down
3 changes: 2 additions & 1 deletion crates/bitwarden-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,9 @@ zxcvbn = ">=3.0.1, <4.0"
# - 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.5, <0.13", features = [
"rustls-tls-native-roots",
"rustls-tls-manual-roots",
], default-features = false }
rustls-platform-verifier = "0.3.3"

[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
Expand Down
7 changes: 7 additions & 0 deletions crates/bitwarden-core/src/client/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,13 @@ impl Client {
fn new_client_builder() -> reqwest::ClientBuilder {
#[allow(unused_mut)]
let mut client_builder = reqwest::Client::builder();

#[cfg(all(not(target_os = "android"), not(target_arch = "wasm32")))]
{
client_builder =
client_builder.use_preconfigured_tls(rustls_platform_verifier::tls_config());
}

client_builder
}

Expand Down
2 changes: 1 addition & 1 deletion crates/bws/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ serde_json = "1.0.113"
serde_yaml = "0.9"
supports-color = "3.0.0"
thiserror = "1.0.57"
tokio = { version = "1.36.0", features = ["rt-multi-thread", "macros"] }
tokio = { version = "1.39.2", features = ["rt-multi-thread", "macros"] }
toml = "0.8.10"
uuid = { version = "1.7.0", features = ["serde"] }

Expand Down
21 changes: 0 additions & 21 deletions test-rustls-platform-verifier/Cargo.toml

This file was deleted.

19 changes: 0 additions & 19 deletions test-rustls-platform-verifier/src/main.rs

This file was deleted.

0 comments on commit 6a7e7ca

Please sign in to comment.