From c20c126a2c8ba35a900e71c63d237388d50d10d8 Mon Sep 17 00:00:00 2001 From: "oxide-renovate[bot]" <146848827+oxide-renovate[bot]@users.noreply.github.com> Date: Sat, 20 Apr 2024 03:12:09 +0000 Subject: [PATCH] chore(deps): update rust crate hyper-rustls to 0.27.1 --- Cargo.lock | 112 +++++++++++++++++++++++++++++++++++--- Cargo.toml | 2 +- workspace-hack/Cargo.toml | 5 ++ 3 files changed, 109 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 36b65b62ff8..0ebe863e477 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -376,6 +376,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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5509d663b2c00ee421bda8d6a24d6c42e15970957de1701b8df9f6fbe5707df1" +dependencies = [ + "aws-lc-sys", + "mirai-annotations", + "paste", + "zeroize", +] + +[[package]] +name = "aws-lc-sys" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d5d317212c2a78d86ba6622e969413c38847b62f48111f8b763af3dac2f9840" +dependencies = [ + "bindgen", + "cc", + "cmake", + "dunce", + "fs_extra", + "libc", + "paste", +] + [[package]] name = "backoff" version = "0.4.0" @@ -903,6 +930,7 @@ version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ + "jobserver", "libc", ] @@ -1090,6 +1118,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" @@ -2145,6 +2182,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" @@ -2571,6 +2614,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" @@ -3349,20 +3398,20 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.26.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" +checksum = "908bb38696d7a037a01ebcc68a00634112ac2bbf8ca74e30a2c3d2f4f021302b" dependencies = [ "futures-util", "http 1.0.0", "hyper 1.1.0", "hyper-util", "log", - "rustls 0.22.4", + "rustls 0.23.5", "rustls-native-certs", "rustls-pki-types", "tokio", - "tokio-rustls 0.25.0", + "tokio-rustls 0.26.0", "tower-service", ] @@ -3861,6 +3910,15 @@ version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +[[package]] +name = "jobserver" +version = "0.1.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "685a7d121ee3f65ae4fddd72b25a04bb36b6af81bc0828f7d5434c0fe60fa3a2" +dependencies = [ + "libc", +] + [[package]] name = "js-sys" version = "0.3.64" @@ -4355,6 +4413,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" @@ -4589,7 +4653,7 @@ dependencies = [ "headers", "http 0.2.12", "hyper 0.14.28", - "hyper-rustls 0.26.0", + "hyper-rustls 0.27.1", "illumos-utils", "internal-dns", "ipnetwork", @@ -5389,7 +5453,7 @@ dependencies = [ "httptest", "hubtools", "hyper 0.14.28", - "hyper-rustls 0.26.0", + "hyper-rustls 0.27.1", "illumos-utils", "internal-dns", "ipnetwork", @@ -5752,6 +5816,7 @@ dependencies = [ "bstr 1.9.0", "byteorder", "bytes", + "cc", "chrono", "cipher", "clap 4.5.4", @@ -5818,6 +5883,8 @@ dependencies = [ "reqwest", "ring 0.17.8", "rustix", + "rustls-pki-types", + "rustls-webpki 0.102.2", "schemars", "semver 1.0.22", "serde", @@ -7959,7 +8026,22 @@ dependencies = [ "log", "ring 0.17.8", "rustls-pki-types", - "rustls-webpki 0.102.1", + "rustls-webpki 0.102.2", + "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.2", "subtle", "zeroize", ] @@ -8014,10 +8096,11 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.102.1" +version = "0.102.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef4ca26037c909dedb327b48c3327d0ba91d3dd3c4e05dad328f210ffb68e95b" +checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" dependencies = [ + "aws-lc-rs", "ring 0.17.8", "rustls-pki-types", "untrusted 0.9.0", @@ -9806,6 +9889,17 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +dependencies = [ + "rustls 0.23.5", + "rustls-pki-types", + "tokio", +] + [[package]] name = "tokio-stream" version = "0.1.15" diff --git a/Cargo.toml b/Cargo.toml index fa1f548b566..8abb8cc33f7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -243,7 +243,7 @@ httptest = "0.15.5" hubtools = { git = "https://github.com/oxidecomputer/hubtools.git", branch = "main" } humantime = "2.1.0" hyper = "0.14" -hyper-rustls = "0.26.0" +hyper-rustls = "0.27.1" hyper-staticfile = "0.9.5" illumos-utils = { path = "illumos-utils" } indexmap = "2.2.6" diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml index c6e17df884a..286d45dbe6d 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.24", 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.2", default-features = false, features = ["aws_lc_rs", "ring", "std"] } schemars = { version = "0.8.16", features = ["bytes", "chrono", "uuid", "uuid1"] } semver = { version = "1.0.22", features = ["serde"] } serde = { version = "1.0.198", features = ["alloc", "derive", "rc"] } @@ -134,6 +136,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"] } @@ -196,6 +199,8 @@ regex-automata = { version = "0.4.5", default-features = false, features = ["dfa regex-syntax = { version = "0.8.2" } reqwest = { version = "0.11.24", 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.2", default-features = false, features = ["aws_lc_rs", "ring", "std"] } schemars = { version = "0.8.16", features = ["bytes", "chrono", "uuid", "uuid1"] } semver = { version = "1.0.22", features = ["serde"] } serde = { version = "1.0.198", features = ["alloc", "derive", "rc"] }