diff --git a/Cargo.lock b/Cargo.lock index 3bdac722380..0de1b215f0c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -367,6 +367,33 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +[[package]] +name = "aws-lc-rs" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8487b59d62764df8231cb371c459314df895b41756df457a1fb1243d65c89195" +dependencies = [ + "aws-lc-sys", + "mirai-annotations", + "paste", + "zeroize", +] + +[[package]] +name = "aws-lc-sys" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c15eb61145320320eb919d9bab524617a7aa4216c78d342fae3a758bc33073e4" +dependencies = [ + "bindgen", + "cc", + "cmake", + "dunce", + "fs_extra", + "libc", + "paste", +] + [[package]] name = "backoff" version = "0.4.0" @@ -886,6 +913,7 @@ version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ + "jobserver", "libc", ] @@ -1058,6 +1086,15 @@ dependencies = [ "error-code", ] +[[package]] +name = "cmake" +version = "0.1.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" +dependencies = [ + "cc", +] + [[package]] name = "cobs" version = "0.2.3" @@ -2113,6 +2150,12 @@ dependencies = [ "thiserror", ] +[[package]] +name = "dunce" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" + [[package]] name = "dyn-clone" version = "1.0.17" @@ -2551,6 +2594,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "fs_extra" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" + [[package]] name = "funty" version = "2.0.0" @@ -3852,6 +3901,15 @@ version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +[[package]] +name = "jobserver" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" +dependencies = [ + "libc", +] + [[package]] name = "js-sys" version = "0.3.64" @@ -4346,6 +4404,12 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "mirai-annotations" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9be0862c1b3f26a88803c4a49de6889c10e608b3ee9344e6ef5b45fb37ad3d1" + [[package]] name = "mockall" version = "0.12.1" @@ -4614,7 +4678,7 @@ dependencies = [ "rcgen", "ref-cast", "regex", - "rustls 0.22.4", + "rustls 0.23.5", "samael", "schemars", "semver 1.0.23", @@ -5443,7 +5507,7 @@ dependencies = [ "regex", "reqwest", "ring 0.17.8", - "rustls 0.22.4", + "rustls 0.23.5", "rustls-pemfile 2.1.2", "samael", "schemars", @@ -5745,7 +5809,7 @@ dependencies = [ "regex", "reqwest", "ring 0.17.8", - "rustls 0.22.4", + "rustls 0.23.5", "slog", "subprocess", "tar", @@ -5783,6 +5847,7 @@ dependencies = [ "bstr 1.9.0", "byteorder", "bytes", + "cc", "chrono", "cipher", "clap", @@ -5847,6 +5912,8 @@ dependencies = [ "reqwest", "ring 0.17.8", "rustix", + "rustls-pki-types", + "rustls-webpki 0.102.3", "schemars", "scopeguard", "semver 1.0.23", @@ -7992,7 +8059,22 @@ dependencies = [ "log", "ring 0.17.8", "rustls-pki-types", - "rustls-webpki 0.102.1", + "rustls-webpki 0.102.3", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls" +version = "0.23.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afabcee0551bd1aa3e18e5adbf2c0544722014b899adb31bd186ec638d3da97e" +dependencies = [ + "aws-lc-rs", + "log", + "once_cell", + "rustls-pki-types", + "rustls-webpki 0.102.3", "subtle", "zeroize", ] @@ -8047,10 +8129,11 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.102.1" +version = "0.102.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef4ca26037c909dedb327b48c3327d0ba91d3dd3c4e05dad328f210ffb68e95b" +checksum = "f3bce581c0dd41bce533ce695a1437fa16a7ab5ac3ccfa99fe1a620a7885eabf" dependencies = [ + "aws-lc-rs", "ring 0.17.8", "rustls-pki-types", "untrusted 0.9.0", diff --git a/Cargo.toml b/Cargo.toml index ceac9801bb2..ce88eac7c67 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -401,7 +401,7 @@ ring = "0.17.8" rpassword = "7.3.1" rstest = "0.19.0" rustfmt-wrapper = "0.2" -rustls = "0.22.2" +rustls = "0.23.5" rustls-pemfile = "2.1.2" rustyline = "14.0.0" samael = { version = "0.0.15", features = ["xmlsec"] } diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml index 9bbbc28e3f1..996c1361873 100644 --- a/workspace-hack/Cargo.toml +++ b/workspace-hack/Cargo.toml @@ -89,6 +89,8 @@ regex-automata = { version = "0.4.5", default-features = false, features = ["dfa regex-syntax = { version = "0.8.2" } reqwest = { version = "0.11.27", features = ["blocking", "cookies", "json", "rustls-tls", "stream"] } ring = { version = "0.17.8", features = ["std"] } +rustls-pki-types = { version = "1.3.0", features = ["std"] } +rustls-webpki = { version = "0.102.3", default-features = false, features = ["aws_lc_rs", "ring", "std"] } schemars = { version = "0.8.17", features = ["bytes", "chrono", "uuid1"] } scopeguard = { version = "1.2.0" } semver = { version = "1.0.23", features = ["serde"] } @@ -133,6 +135,7 @@ bstr-6f8ce4dd05d13bba = { package = "bstr", version = "0.2.17" } bstr-dff4ba8e3ae991db = { package = "bstr", version = "1.9.0" } byteorder = { version = "1.5.0" } bytes = { version = "1.6.0", features = ["serde"] } +cc = { version = "1.0.83", default-features = false, features = ["parallel"] } chrono = { version = "0.4.38", features = ["serde"] } cipher = { version = "0.4.4", default-features = false, features = ["block-padding", "zeroize"] } clap = { version = "4.5.4", features = ["cargo", "derive", "env", "wrap_help"] } @@ -193,6 +196,8 @@ regex-automata = { version = "0.4.5", default-features = false, features = ["dfa regex-syntax = { version = "0.8.2" } reqwest = { version = "0.11.27", features = ["blocking", "cookies", "json", "rustls-tls", "stream"] } ring = { version = "0.17.8", features = ["std"] } +rustls-pki-types = { version = "1.3.0", features = ["std"] } +rustls-webpki = { version = "0.102.3", default-features = false, features = ["aws_lc_rs", "ring", "std"] } schemars = { version = "0.8.17", features = ["bytes", "chrono", "uuid1"] } scopeguard = { version = "1.2.0" } semver = { version = "1.0.23", features = ["serde"] }