Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: switch from native-tls to rustls #879

Merged
merged 4 commits into from
Jun 9, 2023
+26 −57
Merged

feat: switch from native-tls to rustls #879

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e506fc9
feat: switch from native-tls to rustls
iamwacko May 7, 2023
4fe9b0e
Merge branch 'main' into switch_to_rustls
iamwacko Jun 6, 2023
9e2e1f2
fix: version numbers
iamwacko Jun 6, 2023
1a503e9
fix: default features false
iamwacko Jun 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 15 additions & 42 deletions Cargo.lock
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,12 @@ portpicker = "0.1.1"
prost = "0.11.8"
prost-types = "0.11.0"
rand = "0.8.5"
reqwest = "0.11.13"
reqwest = { version = "0.11.13", default-features = false, features = ["rustls-tls"] }
ring = "0.16.20"
rmp-serde = "1.1.1"
serde = { version = "1.0.148", default-features = false }
serde_json = "1.0.89"
sqlx = "0.6.2"
sqlx = "0.6.3"
strum = { version = "0.24.1", features = ["derive"] }
tempfile = "3.4.0"
thiserror = "1.0.37"
Expand Down
2 changes: 1 addition & 1 deletion auth/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ serde = { workspace = true, features = ["derive"] }
sqlx = { workspace = true, features = [
"sqlite",
"json",
"runtime-tokio-native-tls",
"runtime-tokio-rustls",
"migrate",
] }
strum = { workspace = true }
Expand Down
8 changes: 2 additions & 6 deletions cargo-shuttle/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,17 @@ headers = { workspace = true }
indicatif = "0.17.3"
ignore = "0.4.20"
indoc = "2.0.1"
openssl = { version = "0.10", optional = true }
portpicker = { workspace = true }
reqwest = { workspace = true, features = ["json"] }
reqwest-middleware = "0.2.0"
reqwest-retry = "0.2.0"
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
sqlx = { workspace = true, features = ["runtime-tokio-native-tls", "postgres"] }
sqlx = { workspace = true, features = ["runtime-tokio-rustls", "postgres"] }
strum = { workspace = true }
tar = { workspace = true }
tokio = { workspace = true, features = ["macros", "signal"] }
tokio-tungstenite = { version = "0.18.0", features = ["native-tls"] }
tokio-tungstenite = { version = "0.18.0", features = ["rustls-tls-webpki-roots"] }
toml = { workspace = true }
toml_edit = { workspace = true }
tonic = { workspace = true }
Expand All @@ -68,9 +67,6 @@ workspace = true
workspace = true
features = ["builder"]

[features]
vendored-openssl = ["openssl/vendored"]

[dev-dependencies]
assert_cmd = "2.0.6"
rexpect = "0.5.0"
Expand Down
2 changes: 1 addition & 1 deletion common/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ rustrict = { version = "0.7.4", optional = true }
serde = { workspace = true, features = ["derive", "std"] }
serde_json = { workspace = true }
strum = { workspace = true, features = ["derive"] }
sqlx = { workspace = true, optional = true, features = ["runtime-tokio-native-tls"] }
sqlx = { workspace = true, optional = true, features = ["runtime-tokio-rustls"] }
thiserror = { workspace = true, optional = true }
tonic = { workspace = true, optional = true }
tower = { workspace = true, optional = true }
Expand Down
2 changes: 1 addition & 1 deletion deployer/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ portpicker = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
sqlx = { workspace = true, features = [
"runtime-tokio-native-tls",
"runtime-tokio-rustls",
"sqlite",
"chrono",
"json",
Expand Down
2 changes: 1 addition & 1 deletion e2e/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ crossterm = "0.26.1"
lazy_static = "1.4.0"
portpicker = "0.1.1"
rand = "0.8.5"
reqwest = { version = "0.11.10", features = ["blocking", "json"] }
reqwest = { version = "0.11.10", features = ["blocking", "json", "rustls-tls"] }
iamwacko marked this conversation as resolved.
Show resolved Hide resolved
which = "4.2.5"
tempfile = "3.3.0"
2 changes: 1 addition & 1 deletion gateway/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ serde_json = { workspace = true }
sqlx = { workspace = true, features = [
"sqlite",
"json",
"runtime-tokio-native-tls",
"runtime-tokio-rustls",
"migrate",
] }
strum = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion provisioner/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ fqdn = { workspace = true }
mongodb = "2.4.0"
prost = { workspace = true }
rand = { workspace = true }
sqlx = { workspace = true, features = ["postgres", "runtime-tokio-native-tls"] }
sqlx = { workspace = true, features = ["postgres", "runtime-tokio-rustls"] }
thiserror = { workspace = true }
tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
tonic = { workspace = true }
Expand Down
1 change: 0 additions & 1 deletion shell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ in
stdenv.mkDerivation {
name = "moz_overlay_shell";
nativeBuildInputs = with nixpkgs; [
openssl
pkg-config
];
buildInputs = with nixpkgs; [
Expand Down