From 843c28038045ba46f5db462913a8243817a59b98 Mon Sep 17 00:00:00 2001 From: iliana etaoin Date: Tue, 16 Jun 2026 15:06:51 -0700 Subject: [PATCH 1/2] update tokio-rustls to 0.26, rustls-pemfile to 2.2 --- Cargo.lock | 99 +++++++++------------------------------ Cargo.toml | 4 +- common/src/x509.rs | 55 ++++++++++++---------- upstairs/src/client.rs | 10 ++-- workspace-hack/Cargo.toml | 23 +++++---- 5 files changed, 70 insertions(+), 121 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b11d20e6d..bf687d37a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -356,12 +356,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - [[package]] name = "base64" version = "0.22.1" @@ -615,7 +609,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86b041d2328ab2041b4e9d8f21e3b0b5b8bb61e9a23bb9171387771c314ea340" dependencies = [ - "base64 0.22.1", + "base64", "hex", "schemars 0.8.22", "serde_core", @@ -1319,7 +1313,7 @@ dependencies = [ "anyhow", "async-recursion", "async-trait", - "base64 0.22.1", + "base64", "bincode", "bytes", "cfg-if", @@ -1363,7 +1357,7 @@ dependencies = [ "tempfile", "test-strategy", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls 0.26.0", "tokio-test", "tokio-util", "toml 1.0.6+spec-1.1.0", @@ -1455,7 +1449,7 @@ dependencies = [ name = "crucible-client-types" version = "0.1.0" dependencies = [ - "base64 0.22.1", + "base64", "crucible-workspace-hack", "schemars 0.8.22", "serde", @@ -1468,7 +1462,7 @@ name = "crucible-client-types" version = "0.1.0" source = "git+https://github.com/oxidecomputer/crucible?rev=bd9a0e2abe6b6b89aec8c85f4ee57474144ed150#bd9a0e2abe6b6b89aec8c85f4ee57474144ed150" dependencies = [ - "base64 0.22.1", + "base64", "crucible-workspace-hack", "schemars 0.8.22", "serde", @@ -1486,7 +1480,7 @@ dependencies = [ "dropshot", "nix", "proptest", - "rustls-pemfile 1.0.4", + "rustls-pemfile", "schemars 0.8.22", "serde", "serde_json", @@ -1499,7 +1493,7 @@ dependencies = [ "test-strategy", "thiserror 2.0.18", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls 0.26.0", "toml 1.0.6+spec-1.1.0", "twox-hash", "uuid", @@ -1574,7 +1568,7 @@ dependencies = [ "tempfile", "thiserror 2.0.18", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls 0.26.0", "tokio-util", "toml 1.0.6+spec-1.1.0", "tracing", @@ -1657,7 +1651,7 @@ name = "crucible-integration-tests" version = "0.1.0" dependencies = [ "anyhow", - "base64 0.22.1", + "base64", "bytes", "crucible", "crucible-client-types 0.1.0", @@ -1723,7 +1717,7 @@ name = "crucible-pantry" version = "0.0.1" dependencies = [ "anyhow", - "base64 0.22.1", + "base64", "bytes", "chrono", "clap", @@ -2454,7 +2448,7 @@ dependencies = [ "async-compression", "async-stream", "async-trait", - "base64 0.22.1", + "base64", "bytes", "camino", "chrono", @@ -2473,7 +2467,7 @@ dependencies = [ "paste", "percent-encoding", "rustls 0.22.4", - "rustls-pemfile 2.2.0", + "rustls-pemfile", "schemars 0.8.22", "scopeguard", "semver 1.0.28", @@ -3075,7 +3069,7 @@ name = "gateway-client" version = "0.1.0" source = "git+https://github.com/oxidecomputer/omicron?rev=5fd53a9c9ff2b0e47bfef3fe842b7516877b0162#5fd53a9c9ff2b0e47bfef3fe842b7516877b0162" dependencies = [ - "base64 0.22.1", + "base64", "chrono", "daft", "ereport-types", @@ -3766,7 +3760,7 @@ version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96547c2556ec9d12fb1578c4eaf448b04993e7fb79cbaad930a656880a6bdfa0" dependencies = [ - "base64 0.22.1", + "base64", "bytes", "futures-channel", "futures-util", @@ -4836,7 +4830,7 @@ dependencies = [ "anyhow", "api_identity", "async-trait", - "base64 0.22.1", + "base64", "bootstrap-agent-lockstep-types", "chrono", "clap", @@ -4909,7 +4903,7 @@ source = "git+https://github.com/oxidecomputer/omicron?rev=5fd53a9c9ff2b0e47bfef dependencies = [ "anyhow", "api_identity", - "base64 0.22.1", + "base64", "chrono", "daft", "dropshot", @@ -5905,7 +5899,7 @@ version = "3.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38af38e8470ac9dee3ce1bae1af9c1671fffc44ddfd8bd1d0a3445bf349a8ef3" dependencies = [ - "base64 0.22.1", + "base64", "serde", ] @@ -6940,7 +6934,7 @@ version = "0.12.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147" dependencies = [ - "base64 0.22.1", + "base64", "bytes", "futures-core", "futures-util", @@ -6981,7 +6975,7 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab3f43e3283ab1488b624b44b0e988d0acea0b3214e694730a055cb6b2efa801" dependencies = [ - "base64 0.22.1", + "base64", "bytes", "encoding_rs", "futures-channel", @@ -7165,18 +7159,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "rustls" -version = "0.21.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "629648aced5775d558af50b2b4c7b02983a04b312126d45eeead26e7caa498b9" -dependencies = [ - "log", - "ring", - "rustls-webpki 0.101.7", - "sct", -] - [[package]] name = "rustls" version = "0.22.4" @@ -7219,15 +7201,6 @@ dependencies = [ "security-framework", ] -[[package]] -name = "rustls-pemfile" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" -dependencies = [ - "base64 0.21.7", -] - [[package]] name = "rustls-pemfile" version = "2.2.0" @@ -7274,16 +7247,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" -[[package]] -name = "rustls-webpki" -version = "0.101.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" -dependencies = [ - "ring", - "untrusted 0.9.0", -] - [[package]] name = "rustls-webpki" version = "0.102.8" @@ -7472,16 +7435,6 @@ dependencies = [ "syn 2.0.117", ] -[[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring", - "untrusted 0.9.0", -] - [[package]] name = "seahash" version = "4.1.0" @@ -7591,7 +7544,7 @@ name = "serde_human_bytes" version = "0.1.0" source = "git+http://github.com/oxidecomputer/serde_human_bytes?branch=main#8f60acdfe7c6d9e2a01f59be920c1c2b19129322" dependencies = [ - "base64 0.22.1", + "base64", "hex", "serde_core", ] @@ -7688,7 +7641,7 @@ version = "3.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c522100790450cf78eeac1507263d0a350d4d5b30df0c8e1fe051a10c22b376e" dependencies = [ - "base64 0.22.1", + "base64", "chrono", "hex", "indexmap 1.9.3", @@ -8732,16 +8685,6 @@ dependencies = [ "syn 2.0.117", ] -[[package]] -name = "tokio-rustls" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" -dependencies = [ - "rustls 0.21.9", - "tokio", -] - [[package]] name = "tokio-rustls" version = "0.25.0" diff --git a/Cargo.toml b/Cargo.toml index 4107f54bb..8884ceeab 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -101,7 +101,7 @@ rangemap = "1.7.1" reqwest = { version = "0.13", features = ["default", "blocking", "json", "stream"] } ringbuffer = "0.16.0" rusqlite = { version = "0.37" } -rustls-pemfile = { version = "1.0.4" } +rustls-pemfile = { version = "2.2.0" } schemars = { version = "0.8", features = [ "chrono", "uuid1" ] } semver = "1" serde = { version = "1", features = [ "derive" ] } @@ -123,7 +123,7 @@ tempfile = "3" test-strategy = "0.4.5" thiserror = "2" tokio = { version = "1.40", features = ["full"] } -tokio-rustls = { version = "0.24.1" } +tokio-rustls = { version = "0.26.0" } tokio-test = "*" tokio-util = { version = "0.7", features = ["codec"]} toml = "1.0" diff --git a/common/src/x509.rs b/common/src/x509.rs index a3d5b9bb3..d9f0c6e8b 100644 --- a/common/src/x509.rs +++ b/common/src/x509.rs @@ -5,23 +5,18 @@ use std::sync::Arc; // Reference tokio-rustls repo examples/server/src/main.rs use rustls_pemfile::{certs, rsa_private_keys}; -use tokio_rustls::rustls::server::AllowAnyAuthenticatedClient; -use tokio_rustls::rustls::{ - Certificate, ClientConfig, PrivateKey, RootCertStore, ServerConfig, -}; +use tokio_rustls::rustls::pki_types::{CertificateDer, PrivatePkcs1KeyDer}; +use tokio_rustls::rustls::server::WebPkiClientVerifier; +use tokio_rustls::rustls::{ClientConfig, RootCertStore, ServerConfig}; -pub fn load_certs(path: &str) -> io::Result> { - certs(&mut BufReader::new(File::open(path)?)) - .map_err(|_| { - io::Error::new(io::ErrorKind::InvalidInput, "invalid cert") - }) - .map(|mut certs| certs.drain(..).map(Certificate).collect()) +pub fn load_certs(path: &str) -> io::Result>> { + certs(&mut BufReader::new(File::open(path)?)).collect() } -pub fn load_rsa_keys(path: &str) -> io::Result> { - rsa_private_keys(&mut BufReader::new(File::open(path)?)) - .map_err(|_| io::Error::new(io::ErrorKind::InvalidInput, "invalid key")) - .map(|mut keys| keys.drain(..).map(PrivateKey).collect()) +pub fn load_rsa_keys( + path: &str, +) -> io::Result>> { + rsa_private_keys(&mut BufReader::new(File::open(path)?)).collect() } #[derive(thiserror::Error, Debug)] @@ -31,13 +26,18 @@ pub enum TLSContextError { #[error("rustls error")] RusTLSError(#[from] tokio_rustls::rustls::Error), + + #[error("client cert verifier builder error")] + ClientVerifierBuilderError( + #[from] tokio_rustls::rustls::client::VerifierBuilderError, + ), } #[derive(Debug)] pub struct TLSContext { - certs: Vec, - keys: Vec, - root_cert_store: RootCertStore, + certs: Vec>, + keys: Vec>, + root_cert_store: Arc, } impl TLSContext { @@ -48,30 +48,35 @@ impl TLSContext { ) -> Result { let mut root_cert_store = RootCertStore::empty(); for root_cert in load_certs(root_cert_pem_path)? { - root_cert_store.add(&root_cert)?; + root_cert_store.add(root_cert)?; } Ok(Self { certs: load_certs(cert_pem_path)?, keys: load_rsa_keys(key_pem_path)?, - root_cert_store, + root_cert_store: Arc::new(root_cert_store), }) } pub fn get_client_config(&self) -> Result { Ok(ClientConfig::builder() - .with_safe_defaults() .with_root_certificates(self.root_cert_store.clone()) - .with_client_auth_cert(self.certs.clone(), self.keys[0].clone())?) + .with_client_auth_cert( + self.certs.clone(), + self.keys[0].clone_key().into(), + )?) } pub fn get_server_config(&self) -> Result { let client_cert_verifier = - AllowAnyAuthenticatedClient::new(self.root_cert_store.clone()); + WebPkiClientVerifier::builder(self.root_cert_store.clone()) + .build()?; Ok(ServerConfig::builder() - .with_safe_defaults() - .with_client_cert_verifier(Arc::new(client_cert_verifier)) - .with_single_cert(self.certs.clone(), self.keys[0].clone())?) + .with_client_cert_verifier(client_cert_verifier) + .with_single_cert( + self.certs.clone(), + self.keys[0].clone_key().into(), + )?) } } diff --git a/upstairs/src/client.rs b/upstairs/src/client.rs index 68712e1ee..c152ac975 100644 --- a/upstairs/src/client.rs +++ b/upstairs/src/client.rs @@ -2422,10 +2422,12 @@ impl ClientIoTask { let connector = tokio_rustls::TlsConnector::from(Arc::new(config)); - let server_name = tokio_rustls::rustls::ServerName::try_from( - format!("downstairs{}", self.client_id).as_str(), - ) - .unwrap(); + let server_name = + tokio_rustls::rustls::pki_types::ServerName::try_from(format!( + "downstairs{}", + self.client_id + )) + .unwrap(); let sock = connector.connect(server_name, tcp).await.unwrap(); let (read, write) = tokio::io::split(sock); diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml index 9ec612f30..5acaabb05 100644 --- a/workspace-hack/Cargo.toml +++ b/workspace-hack/Cargo.toml @@ -17,6 +17,7 @@ publish = false [dependencies] aho-corasick = { version = "1" } arrayvec = { version = "0.7", default-features = false, features = ["std"] } +aws-lc-rs = { version = "1", features = ["prebuilt-nasm"] } bitflags = { version = "2", default-features = false, features = ["serde", "std"] } bstr = { version = "1" } bytes = { version = "1", features = ["serde"] } @@ -58,6 +59,7 @@ regex-automata = { version = "0.4", default-features = false, features = ["dfa-o regex-syntax = { version = "0.8" } reqwest-594e8ee84c453af0 = { package = "reqwest", version = "0.13", features = ["blocking", "json", "query", "stream"] } reqwest-5ef9efb8ec2df382 = { package = "reqwest", version = "0.12", default-features = false, features = ["json", "rustls-tls", "stream"] } +rustls = { version = "0.23" } schemars = { version = "0.8", features = ["bytes", "chrono", "semver", "url", "uuid1"] } scopeguard = { version = "1" } semver = { version = "1", features = ["serde"] } @@ -157,7 +159,6 @@ zerocopy = { version = "0.8", default-features = false, features = ["derive", "s zeroize = { version = "1", features = ["std", "zeroize_derive"] } [target.x86_64-unknown-linux-gnu.dependencies] -aws-lc-rs = { version = "1", features = ["prebuilt-nasm"] } dof-468e82937335b1c9 = { package = "dof", version = "0.3", default-features = false, features = ["des"] } dof-9fbad63c4bcf4a8f = { package = "dof", version = "0.4", default-features = false, features = ["des"] } getrandom-468e82937335b1c9 = { package = "getrandom", version = "0.3", default-features = false, features = ["std"] } @@ -169,10 +170,10 @@ mio = { version = "1", features = ["net", "os-ext"] } nix = { version = "0.31", default-features = false, features = ["signal", "term"] } rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", features = ["fs", "stdio", "system", "termios"] } rustix-dff4ba8e3ae991db = { package = "rustix", version = "1", features = ["fs", "stdio", "termios"] } -rustls = { version = "0.23", features = ["ring"] } +rustls = { version = "0.23", default-features = false, features = ["ring"] } rustls-webpki = { version = "0.103", default-features = false, features = ["aws-lc-rs", "ring", "std"] } spin = { version = "0.9", default-features = false, features = ["once", "spin_mutex"] } -tokio-rustls = { version = "0.26", default-features = false, features = ["aws-lc-rs", "ring", "tls12"] } +tokio-rustls = { version = "0.26", features = ["aws-lc-rs", "ring"] } [target.x86_64-unknown-linux-gnu.build-dependencies] aws-lc-rs = { version = "1", features = ["prebuilt-nasm"] } @@ -189,10 +190,9 @@ rustix-dff4ba8e3ae991db = { package = "rustix", version = "1", features = ["fs", rustls = { version = "0.23", features = ["ring"] } rustls-webpki = { version = "0.103", default-features = false, features = ["aws-lc-rs", "ring", "std"] } spin = { version = "0.9", default-features = false, features = ["once", "spin_mutex"] } -tokio-rustls = { version = "0.26", default-features = false, features = ["aws-lc-rs", "ring", "tls12"] } +tokio-rustls = { version = "0.26", features = ["aws-lc-rs", "ring"] } [target.aarch64-apple-darwin.dependencies] -aws-lc-rs = { version = "1", features = ["prebuilt-nasm"] } getrandom-468e82937335b1c9 = { package = "getrandom", version = "0.3", default-features = false, features = ["std"] } hyper = { version = "1", features = ["full"] } hyper-rustls = { version = "0.27", default-features = false, features = ["aws-lc-rs", "http1", "http2", "ring", "tls12", "webpki-tokio"] } @@ -201,9 +201,9 @@ mio = { version = "1", features = ["net", "os-ext"] } nix = { version = "0.31", default-features = false, features = ["signal", "term"] } rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", features = ["fs", "stdio", "system", "termios"] } rustix-dff4ba8e3ae991db = { package = "rustix", version = "1", features = ["fs", "stdio", "termios"] } -rustls = { version = "0.23", features = ["ring"] } +rustls = { version = "0.23", default-features = false, features = ["ring"] } rustls-webpki = { version = "0.103", default-features = false, features = ["aws-lc-rs", "ring", "std"] } -tokio-rustls = { version = "0.26", default-features = false, features = ["aws-lc-rs", "ring", "tls12"] } +tokio-rustls = { version = "0.26", features = ["aws-lc-rs", "ring"] } [target.aarch64-apple-darwin.build-dependencies] aws-lc-rs = { version = "1", features = ["prebuilt-nasm"] } @@ -216,10 +216,9 @@ rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", features = ["fs rustix-dff4ba8e3ae991db = { package = "rustix", version = "1", features = ["fs", "stdio", "termios"] } rustls = { version = "0.23", features = ["ring"] } rustls-webpki = { version = "0.103", default-features = false, features = ["aws-lc-rs", "ring", "std"] } -tokio-rustls = { version = "0.26", default-features = false, features = ["aws-lc-rs", "ring", "tls12"] } +tokio-rustls = { version = "0.26", features = ["aws-lc-rs", "ring"] } [target.x86_64-unknown-illumos.dependencies] -aws-lc-rs = { version = "1", features = ["prebuilt-nasm"] } dof-468e82937335b1c9 = { package = "dof", version = "0.3", default-features = false, features = ["des"] } dof-9fbad63c4bcf4a8f = { package = "dof", version = "0.4", default-features = false, features = ["des"] } getrandom-468e82937335b1c9 = { package = "getrandom", version = "0.3", default-features = false, features = ["std"] } @@ -234,10 +233,10 @@ nom = { version = "7" } regex = { version = "1" } rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", features = ["fs", "stdio", "system", "termios"] } rustix-dff4ba8e3ae991db = { package = "rustix", version = "1", features = ["fs", "stdio", "termios"] } -rustls = { version = "0.23", features = ["ring"] } +rustls = { version = "0.23", default-features = false, features = ["ring"] } rustls-webpki = { version = "0.103", default-features = false, features = ["aws-lc-rs", "ring", "std"] } spin = { version = "0.9", default-features = false, features = ["once", "spin_mutex"] } -tokio-rustls = { version = "0.26", default-features = false, features = ["aws-lc-rs", "ring", "tls12"] } +tokio-rustls = { version = "0.26", features = ["aws-lc-rs", "ring"] } toml_edit = { version = "0.19", features = ["serde"] } [target.x86_64-unknown-illumos.build-dependencies] @@ -258,7 +257,7 @@ rustix-dff4ba8e3ae991db = { package = "rustix", version = "1", features = ["fs", rustls = { version = "0.23", features = ["ring"] } rustls-webpki = { version = "0.103", default-features = false, features = ["aws-lc-rs", "ring", "std"] } spin = { version = "0.9", default-features = false, features = ["once", "spin_mutex"] } -tokio-rustls = { version = "0.26", default-features = false, features = ["aws-lc-rs", "ring", "tls12"] } +tokio-rustls = { version = "0.26", features = ["aws-lc-rs", "ring"] } toml_edit = { version = "0.19", features = ["serde"] } ### END HAKARI SECTION From a1f21c06f1a8568bef35f399f9603d7ed714f763 Mon Sep 17 00:00:00 2001 From: iliana etaoin Date: Tue, 16 Jun 2026 15:21:06 -0700 Subject: [PATCH 2/2] update dropshot to 0.17.1 --- Cargo.lock | 394 +++++++++++++++----------------------- Cargo.toml | 2 +- workspace-hack/Cargo.toml | 54 +++--- 3 files changed, 176 insertions(+), 274 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bf687d37a..fb178f2b7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -14,7 +14,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" dependencies = [ - "crypto-common", + "crypto-common 0.1.6", "generic-array", ] @@ -305,9 +305,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "aws-lc-rs" -version = "1.13.3" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c953fe1ba023e6b7730c0d4b031d06f267f23a46167dcbd40316644b10a17ba" +checksum = "5ec2f1fc3ec205783a5da9a7e6c1509cc69dedf09a1949e412c1e18469326d00" dependencies = [ "aws-lc-sys", "untrusted 0.7.1", @@ -316,11 +316,10 @@ dependencies = [ [[package]] name = "aws-lc-sys" -version = "0.30.0" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbfd150b5dbdb988bcc8fb1fe787eb6b7ee6180ca24da683b61ea5405f3d43ff" +checksum = "1a2f9779ce85b93ab6170dd940ad0169b5766ff848247aff13bb788b832fe3f4" dependencies = [ - "bindgen", "cc", "cmake", "dunce", @@ -406,29 +405,6 @@ dependencies = [ "serde", ] -[[package]] -name = "bindgen" -version = "0.69.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088" -dependencies = [ - "bitflags 2.11.0", - "cexpr", - "clang-sys", - "itertools 0.12.1", - "lazy_static", - "lazycell", - "log", - "prettyplease", - "proc-macro2", - "quote", - "regex", - "rustc-hash 1.1.0", - "shlex", - "syn 2.0.117", - "which 4.4.2", -] - [[package]] name = "bit-set" version = "0.8.0" @@ -477,7 +453,7 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" dependencies = [ - "digest", + "digest 0.10.7", ] [[package]] @@ -504,6 +480,15 @@ dependencies = [ "generic-array", ] +[[package]] +name = "block-buffer" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2f6c7dbe95a6ed67ad9f18e57daf93a2f034c524b99fd2b76d18fdfeb6660aa" +dependencies = [ + "hybrid-array", +] + [[package]] name = "bootstore" version = "0.1.0" @@ -733,15 +718,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom", -] - [[package]] name = "cfg-if" version = "1.0.4" @@ -853,22 +829,11 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ - "crypto-common", + "crypto-common 0.1.6", "inout", "zeroize", ] -[[package]] -name = "clang-sys" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" -dependencies = [ - "glob", - "libc", - "libloading", -] - [[package]] name = "clap" version = "4.5.60" @@ -919,8 +884,8 @@ dependencies = [ "nix", "terminfo", "thiserror 2.0.18", - "which 8.0.0", - "windows-sys 0.59.0", + "which", + "windows-sys 0.61.1", ] [[package]] @@ -1047,7 +1012,7 @@ version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "faf9468729b8cbcea668e36183cb69d317348c2e08e994829fb56ebfdfbaac34" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.61.1", ] [[package]] @@ -1112,6 +1077,12 @@ dependencies = [ "windows-sys 0.61.1", ] +[[package]] +name = "const-oid" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6ef517f0926dd24a1582492c791b6a4818a4d94e789a334894aa15b0d12f55c" + [[package]] name = "const_format" version = "0.2.34" @@ -1357,10 +1328,10 @@ dependencies = [ "tempfile", "test-strategy", "tokio", - "tokio-rustls 0.26.0", + "tokio-rustls", "tokio-test", "tokio-util", - "toml 1.0.6+spec-1.1.0", + "toml 1.1.2+spec-1.1.0", "tracing", "usdt 0.6.0", "uuid", @@ -1493,8 +1464,8 @@ dependencies = [ "test-strategy", "thiserror 2.0.18", "tokio", - "tokio-rustls 0.26.0", - "toml 1.0.6+spec-1.1.0", + "tokio-rustls", + "toml 1.1.2+spec-1.1.0", "twox-hash", "uuid", "vergen", @@ -1568,9 +1539,9 @@ dependencies = [ "tempfile", "thiserror 2.0.18", "tokio", - "tokio-rustls 0.26.0", + "tokio-rustls", "tokio-util", - "toml 1.0.6+spec-1.1.0", + "toml 1.1.2+spec-1.1.0", "tracing", "tracing-opentelemetry", "tracing-subscriber", @@ -1698,7 +1669,7 @@ dependencies = [ "serde_json", "tokio", "tokio-util", - "toml 1.0.6+spec-1.1.0", + "toml 1.1.2+spec-1.1.0", ] [[package]] @@ -1873,8 +1844,8 @@ dependencies = [ "clap_builder", "crossbeam-epoch", "crossbeam-utils", - "crypto-common", - "digest", + "crypto-common 0.1.6", + "digest 0.10.7", "dof 0.3.0", "dof 0.4.0", "either", @@ -1887,21 +1858,18 @@ dependencies = [ "futures-util", "generic-array", "getrandom 0.2.11", - "getrandom 0.3.1", "getrandom 0.4.1", "hex", "hyper", "hyper-rustls", "hyper-util", "indexmap 2.14.0", - "itertools 0.12.1", "libc", "linux-raw-sys 0.4.14", "log", "memchr", "mio", "nix", - "nom", "num-integer", "num-iter", "num-traits", @@ -1913,15 +1881,14 @@ dependencies = [ "rand 0.8.6", "rand 0.9.2", "rand_chacha 0.9.0", - "regex", "regex-automata", "regex-syntax", "reqwest 0.12.28", "reqwest 0.13.2", "rustix 0.38.37", "rustix 1.1.4", - "rustls 0.23.31", - "rustls-webpki 0.103.4", + "rustls", + "rustls-webpki", "schemars 0.8.22", "scopeguard", "semver 1.0.28", @@ -1940,18 +1907,19 @@ dependencies = [ "time", "time-macros", "tokio", - "tokio-rustls 0.26.0", + "tokio-rustls", "tokio-util", "toml_datetime 0.6.11", "toml_edit 0.19.15", "tracing", "tracing-core", + "typenum", "url", "usdt 0.6.0", "usdt-impl 0.5.0", "usdt-impl 0.6.0", "uuid", - "winnow 0.7.13", + "winnow 1.0.2", "zerocopy 0.8.27", "zeroize", ] @@ -1977,7 +1945,7 @@ dependencies = [ "signal-hook-tokio", "tokio", "tokio-util", - "toml 1.0.6+spec-1.1.0", + "toml 1.1.2+spec-1.1.0", ] [[package]] @@ -2022,7 +1990,7 @@ dependencies = [ "statistical", "tokio", "tokio-util", - "toml 1.0.6+spec-1.1.0", + "toml 1.1.2+spec-1.1.0", "uuid", ] @@ -2049,6 +2017,15 @@ dependencies = [ "typenum", ] +[[package]] +name = "crypto-common" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce6e4c961d6cd6c9a86db418387425e8bdeaf05b3c8bc1411e6dca4c252f1453" +dependencies = [ + "hybrid-array", +] + [[package]] name = "cstr-argument" version = "0.1.2" @@ -2098,7 +2075,7 @@ dependencies = [ "cfg-if", "cpufeatures 0.2.12", "curve25519-dalek-derive", - "digest", + "digest 0.10.7", "fiat-crypto", "rand_core 0.6.4", "rustc_version 0.4.1", @@ -2360,11 +2337,22 @@ version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "block-buffer", - "crypto-common", + "block-buffer 0.10.4", + "crypto-common 0.1.6", "subtle", ] +[[package]] +name = "digest" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1dd6dbb5841937940781866fa1281a1ff7bd3bf827091440879f9994983d5c2" +dependencies = [ + "block-buffer 0.12.1", + "const-oid", + "crypto-common 0.2.2", +] + [[package]] name = "displaydoc" version = "0.2.5" @@ -2441,9 +2429,9 @@ dependencies = [ [[package]] name = "dropshot" -version = "0.17.0" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "409eb76c7ea1623d270393248ff55ec436841fcd724c2e1c9de294291edd35f5" +checksum = "803c4a57fd2a611df2ddd7069a62a565253368ee96ad4e5ac2e74e625dcf8430" dependencies = [ "async-compression", "async-stream", @@ -2466,7 +2454,7 @@ dependencies = [ "openapiv3", "paste", "percent-encoding", - "rustls 0.22.4", + "rustls", "rustls-pemfile", "schemars 0.8.22", "scopeguard", @@ -2483,9 +2471,9 @@ dependencies = [ "slog-term", "thiserror 2.0.18", "tokio", - "tokio-rustls 0.25.0", + "tokio-rustls", "tokio-util", - "toml 1.0.6+spec-1.1.0", + "toml 1.1.2+spec-1.1.0", "usdt 0.6.0", "uuid", "version_check", @@ -2540,9 +2528,9 @@ dependencies = [ [[package]] name = "dropshot_endpoint" -version = "0.17.0" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "906c3adfd4472030607130ed763e9af1b85f7e18832dd22998379d42ff81c28d" +checksum = "5f176851eb52822c728ad7a1c5aea0e3c95e68d9876cfa06ae32d5018730acb4" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -2644,7 +2632,7 @@ checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" dependencies = [ "base16ct", "crypto-bigint", - "digest", + "digest 0.10.7", "ff", "generic-array", "group", @@ -3214,7 +3202,7 @@ name = "gfss" version = "0.1.0" source = "git+https://github.com/oxidecomputer/omicron?rev=5fd53a9c9ff2b0e47bfef3fe842b7516877b0162#5fd53a9c9ff2b0e47bfef3fe842b7516877b0162" dependencies = [ - "digest", + "digest 0.10.7", "omicron-workspace-hack", "rand 0.9.2", "schemars 0.8.22", @@ -3316,9 +3304,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.6" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" +checksum = "6cb093c84e8bd9b188d4c4a8cb6579fc016968d14c99882163cd3ff402a4f155" dependencies = [ "atomic-waker", "bytes", @@ -3552,16 +3540,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest", -] - -[[package]] -name = "home" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf" -dependencies = [ - "windows-sys 0.59.0", + "digest 0.10.7", ] [[package]] @@ -3588,9 +3567,9 @@ dependencies = [ [[package]] name = "http" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a" +checksum = "6970f50e31d6fc17d3fa27329444bfa74e196cf62e95052a3f6fee181dba6425" dependencies = [ "bytes", "itoa", @@ -3694,11 +3673,20 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "135b12329e5e3ce057a9f972339ea52bc954fe1e9358ef27f95e89716fbc5424" +[[package]] +name = "hybrid-array" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9155a582abd142abc056962c29e3ce5ff2ad5469f4246b537ed42c5deba857da" +dependencies = [ + "typenum", +] + [[package]] name = "hyper" -version = "1.8.1" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab2d4f250c3d7b1c9fcdff1cece94ea4e2dfbec68614f7b87cb205f24ca9d11" +checksum = "55281c53a1894c864990125767da440a4e630446785086f52523b20033b74498" dependencies = [ "atomic-waker", "bytes", @@ -3711,7 +3699,6 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "pin-utils", "smallvec", "tokio", "want", @@ -3727,12 +3714,12 @@ dependencies = [ "http", "hyper", "hyper-util", - "rustls 0.23.31", + "rustls", "rustls-pki-types", "tokio", - "tokio-rustls 0.26.0", + "tokio-rustls", "tower-service", - "webpki-roots 0.26.6", + "webpki-roots 0.26.11", ] [[package]] @@ -3771,7 +3758,7 @@ dependencies = [ "libc", "percent-encoding", "pin-project-lite", - "socket2 0.5.10", + "socket2 0.6.3", "system-configuration", "tokio", "tower-layer", @@ -4373,12 +4360,6 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - [[package]] name = "leb128fmt" version = "0.1.0" @@ -4408,16 +4389,6 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "libloading" -version = "0.8.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55" -dependencies = [ - "cfg-if", - "windows-link 0.2.0", -] - [[package]] name = "libm" version = "0.2.8" @@ -6058,12 +6029,6 @@ version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - [[package]] name = "pkg-config" version = "0.3.27" @@ -6493,9 +6458,9 @@ dependencies = [ "pin-project-lite", "quinn-proto", "quinn-udp", - "rustc-hash 2.1.1", - "rustls 0.23.31", - "socket2 0.5.10", + "rustc-hash", + "rustls", + "socket2 0.6.3", "thiserror 2.0.18", "tokio", "tracing", @@ -6514,8 +6479,8 @@ dependencies = [ "lru-slab", "rand 0.9.2", "ring", - "rustc-hash 2.1.1", - "rustls 0.23.31", + "rustc-hash", + "rustls", "rustls-pki-types", "slab", "thiserror 2.0.18", @@ -6949,14 +6914,14 @@ dependencies = [ "percent-encoding", "pin-project-lite", "quinn", - "rustls 0.23.31", + "rustls", "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", "sync_wrapper", "tokio", - "tokio-rustls 0.26.0", + "tokio-rustls", "tokio-util", "tower", "tower-http", @@ -6966,7 +6931,7 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams 0.4.0", "web-sys", - "webpki-roots 1.0.2", + "webpki-roots 1.0.7", ] [[package]] @@ -6994,7 +6959,7 @@ dependencies = [ "percent-encoding", "pin-project-lite", "quinn", - "rustls 0.23.31", + "rustls", "rustls-pki-types", "rustls-platform-verifier", "serde", @@ -7002,7 +6967,7 @@ dependencies = [ "serde_urlencoded", "sync_wrapper", "tokio", - "tokio-rustls 0.26.0", + "tokio-rustls", "tokio-util", "tower", "tower-http", @@ -7103,12 +7068,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - [[package]] name = "rustc-hash" version = "2.1.1" @@ -7156,35 +7115,21 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.12.1", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustls" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" -dependencies = [ - "log", - "ring", - "rustls-pki-types", - "rustls-webpki 0.102.8", - "subtle", - "zeroize", + "windows-sys 0.61.1", ] [[package]] name = "rustls" -version = "0.23.31" +version = "0.23.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0ebcbd2f03de0fc1122ad9bb24b127a5a6cd51d72604a3f3c50ac459762b6cc" +checksum = "ef86cd5876211988985292b91c96a8f2d298df24e75989a43a3c73f2d4d8168b" dependencies = [ "aws-lc-rs", "log", "once_cell", "ring", "rustls-pki-types", - "rustls-webpki 0.103.4", + "rustls-webpki", "subtle", "zeroize", ] @@ -7231,14 +7176,14 @@ dependencies = [ "jni", "log", "once_cell", - "rustls 0.23.31", + "rustls", "rustls-native-certs", "rustls-platform-verifier-android", - "rustls-webpki 0.103.4", + "rustls-webpki", "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.52.0", + "windows-sys 0.61.1", ] [[package]] @@ -7249,20 +7194,9 @@ checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" [[package]] name = "rustls-webpki" -version = "0.102.8" +version = "0.103.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" -dependencies = [ - "ring", - "rustls-pki-types", - "untrusted 0.9.0", -] - -[[package]] -name = "rustls-webpki" -version = "0.103.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a17884ae0c1b773f1ccd2bd4a8c72f16da897310a98b0e84bf349ad5ead92fc" +checksum = "61c429a8649f110dddef65e2a5ad240f747e85f7758a6bccc7e5777bd33f756e" dependencies = [ "aws-lc-rs", "ring", @@ -7551,9 +7485,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.149" +version = "1.0.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" +checksum = "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9" dependencies = [ "itoa", "memchr", @@ -7604,9 +7538,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "1.0.4" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8bbf91e5a4d6315eee45e704372590b30e260ee83af6639d64557f51b067776" +checksum = "6662b5879511e06e8999a8a235d848113e942c9124f211511b16466ee2995f26" dependencies = [ "serde_core", ] @@ -7683,13 +7617,13 @@ dependencies = [ [[package]] name = "sha1" -version = "0.10.6" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +checksum = "aacc4cc499359472b4abe1bf11d0b12e688af9a805fa5e3016f9a386dc2d0214" dependencies = [ "cfg-if", - "cpufeatures 0.2.12", - "digest", + "cpufeatures 0.3.0", + "digest 0.11.3", ] [[package]] @@ -7700,7 +7634,7 @@ checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" dependencies = [ "cfg-if", "cpufeatures 0.2.12", - "digest", + "digest 0.10.7", ] [[package]] @@ -7709,7 +7643,7 @@ version = "0.10.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77fd7028345d415a4034cf8777cd4f8ab1851274233b45f84e3d955502d93874" dependencies = [ - "digest", + "digest 0.10.7", "keccak", ] @@ -8054,7 +7988,7 @@ version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1c97747dbf44bb1ca44a561ece23508e99cb592e862f22222dcf42f51d1e451" dependencies = [ - "heck 0.4.1", + "heck 0.5.0", "proc-macro2", "quote", "syn 2.0.117", @@ -8398,10 +8332,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "82a72c767771b47409d2345987fda8628641887d5466101319899796367354a0" dependencies = [ "fastrand", - "getrandom 0.3.1", + "getrandom 0.4.1", "once_cell", "rustix 1.1.4", - "windows-sys 0.52.0", + "windows-sys 0.61.1", ] [[package]] @@ -8410,7 +8344,7 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2111ef44dae28680ae9752bb89409e7310ca33a8c621ebe7b106cf5c928b3ac0" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.1", ] [[package]] @@ -8687,23 +8621,11 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" -dependencies = [ - "rustls 0.22.4", - "rustls-pki-types", - "tokio", -] - -[[package]] -name = "tokio-rustls" -version = "0.26.0" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61" dependencies = [ - "rustls 0.23.31", - "rustls-pki-types", + "rustls", "tokio", ] @@ -8772,17 +8694,17 @@ dependencies = [ [[package]] name = "toml" -version = "1.0.6+spec-1.1.0" +version = "1.1.2+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "399b1124a3c9e16766831c6bba21e50192572cdd98706ea114f9502509686ffc" +checksum = "81f3d15e84cbcd896376e6730314d59fb5a87f31e4b038454184435cd57defee" dependencies = [ "indexmap 2.14.0", "serde_core", - "serde_spanned 1.0.4", - "toml_datetime 1.0.0+spec-1.1.0", + "serde_spanned 1.1.1", + "toml_datetime 1.1.1+spec-1.1.0", "toml_parser", "toml_writer", - "winnow 0.7.13", + "winnow 1.0.2", ] [[package]] @@ -8796,9 +8718,9 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "1.0.0+spec-1.1.0" +version = "1.1.1+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32c2555c699578a4f59f0cc68e5116c8d7cabbd45e1409b989d4be085b53f13e" +checksum = "3165f65f62e28e0115a00b2ebdd37eb6f3b641855f9d636d3cd4103767159ad7" dependencies = [ "serde_core", ] @@ -8843,11 +8765,11 @@ dependencies = [ [[package]] name = "toml_parser" -version = "1.0.9+spec-1.1.0" +version = "1.1.2+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702d4415e08923e7e1ef96cd5727c0dfed80b4d2fa25db9647fe5eb6f7c5a4c4" +checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526" dependencies = [ - "winnow 0.7.13", + "winnow 1.0.2", ] [[package]] @@ -8858,9 +8780,9 @@ checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801" [[package]] name = "toml_writer" -version = "1.0.6+spec-1.1.0" +version = "1.1.1+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab16f14aed21ee8bfd8ec22513f7287cd4a91aa92e44edfe2c17ddd004e92607" +checksum = "756daf9b1013ebe47a8776667b466417e2d4c5679d441c26230efd9ef78692db" [[package]] name = "topological-sort" @@ -8888,7 +8810,7 @@ dependencies = [ "olpc-cjson", "pem", "percent-encoding", - "rustls 0.23.31", + "rustls", "serde", "serde_json", "serde_plain", @@ -9132,9 +9054,9 @@ checksum = "82205ffd44a9697e34fc145491aa47310f9871540bb7909eaa9365e0a9a46607" [[package]] name = "typenum" -version = "1.17.0" +version = "1.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" +checksum = "b6f5e870be6c3b371b77fe0ee0bafb859fa4964b4404c27de1d380043c4dda20" [[package]] name = "typify" @@ -9264,7 +9186,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" dependencies = [ - "crypto-common", + "crypto-common 0.1.6", "subtle", ] @@ -9480,9 +9402,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.22.0" +version = "1.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a68d3c8f01c0cfa54a75291d83601161799e4a89a39e0929f4b0354d88757a37" +checksum = "144d6b123cef80b301b8f72a9e2ca4370ddec21950d0a103dd22c437006d2db7" dependencies = [ "getrandom 0.4.1", "js-sys", @@ -9823,34 +9745,22 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.6" +version = "0.26.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958" +checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9" dependencies = [ - "rustls-pki-types", + "webpki-roots 1.0.7", ] [[package]] name = "webpki-roots" -version = "1.0.2" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8983c3ab33d6fb807cfcdad2491c4ea8cbc8ed839181c7dfd9c67c83e261b2" +checksum = "52f5ee44c96cf55f1b349600768e3ece3a8f26010c05265ab73f945bb1a2eb9d" dependencies = [ "rustls-pki-types", ] -[[package]] -name = "which" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" -dependencies = [ - "either", - "home", - "once_cell", - "rustix 0.38.37", -] - [[package]] name = "which" version = "8.0.0" diff --git a/Cargo.toml b/Cargo.toml index 8884ceeab..2cad31ea4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -62,7 +62,7 @@ clearscreen = "4.0.5" crossterm = { version = "0.28.1" } crucible-workspace-hack = "0.1.0" # see [patch.crates-io.crucible-workspace-hack] for more csv = "1.4.0" -dropshot = { version = "0.17.0", features = [ "usdt-probes" ] } +dropshot = { version = "0.17.1", features = [ "usdt-probes" ] } dropshot-api-manager = "0.7.0" dropshot-api-manager-types = "0.7.0" expectorate = "1.2.0" diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml index 5acaabb05..532cbd7db 100644 --- a/workspace-hack/Cargo.toml +++ b/workspace-hack/Cargo.toml @@ -37,7 +37,6 @@ futures-executor = { version = "0.3" } futures-sink = { version = "0.3" } futures-util = { version = "0.3", features = ["channel", "io", "sink"] } generic-array = { version = "0.14", default-features = false, features = ["more_lengths", "zeroize"] } -getrandom-6f8ce4dd05d13bba = { package = "getrandom", version = "0.2", default-features = false, features = ["std"] } hex = { version = "0.4" } indexmap = { version = "2", features = ["serde"] } libc = { version = "0.2", features = ["extra_traits"] } @@ -75,21 +74,23 @@ subtle = { version = "2" } syn = { version = "2", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] } time = { version = "0.3", features = ["formatting", "local-offset", "macros", "parsing"] } tokio = { version = "1", features = ["full", "test-util"] } +tokio-rustls = { version = "0.26" } tokio-util = { version = "0.7", features = ["codec", "io-util", "time"] } toml_datetime = { version = "0.6", default-features = false, features = ["serde"] } tracing = { version = "0.1" } tracing-core = { version = "0.1" } +typenum = { version = "1", default-features = false, features = ["const-generics"] } url = { version = "2", features = ["serde"] } usdt = { version = "0.6" } usdt-impl-3b31131e45eafb45 = { package = "usdt-impl", version = "0.6", default-features = false, features = ["des"] } usdt-impl-d8f496e17d97b5cb = { package = "usdt-impl", version = "0.5", default-features = false, features = ["asm", "des"] } uuid = { version = "1", features = ["serde", "v4"] } -winnow = { version = "0.7" } zerocopy = { version = "0.8", default-features = false, features = ["derive", "simd"] } zeroize = { version = "1", features = ["std", "zeroize_derive"] } [build-dependencies] aho-corasick = { version = "1" } +aws-lc-rs = { version = "1", features = ["prebuilt-nasm"] } bitflags = { version = "2", default-features = false, features = ["serde", "std"] } bytes = { version = "1", features = ["serde"] } cc = { version = "1", default-features = false, features = ["parallel"] } @@ -97,8 +98,6 @@ chrono = { version = "0.4", features = ["serde"] } clap = { version = "4", features = ["cargo", "derive", "env", "wrap_help"] } clap_builder = { version = "4", default-features = false, features = ["cargo", "color", "env", "std", "suggestions", "usage", "wrap_help"] } crossbeam-utils = { version = "0.8" } -crypto-common = { version = "0.1", default-features = false, features = ["getrandom", "std"] } -digest = { version = "0.10", features = ["mac", "std"] } either = { version = "1", features = ["use_std"] } foldhash = { version = "0.2" } form_urlencoded = { version = "1" } @@ -107,8 +106,6 @@ futures-core = { version = "0.3" } futures-executor = { version = "0.3" } futures-sink = { version = "0.3" } futures-util = { version = "0.3", features = ["channel", "io", "sink"] } -generic-array = { version = "0.14", default-features = false, features = ["more_lengths", "zeroize"] } -getrandom-6f8ce4dd05d13bba = { package = "getrandom", version = "0.2", default-features = false, features = ["std"] } hex = { version = "0.4" } indexmap = { version = "2", features = ["serde"] } libc = { version = "0.2", features = ["extra_traits"] } @@ -129,6 +126,7 @@ regex-automata = { version = "0.4", default-features = false, features = ["dfa-o regex-syntax = { version = "0.8" } reqwest-594e8ee84c453af0 = { package = "reqwest", version = "0.13", features = ["blocking", "json", "query", "stream"] } reqwest-5ef9efb8ec2df382 = { package = "reqwest", version = "0.12", default-features = false, features = ["json", "rustls-tls", "stream"] } +rustls = { version = "0.23" } schemars = { version = "0.8", features = ["bytes", "chrono", "semver", "url", "uuid1"] } scopeguard = { version = "1" } semver = { version = "1", features = ["serde"] } @@ -145,23 +143,24 @@ syn = { version = "2", features = ["extra-traits", "fold", "full", "visit", "vis time = { version = "0.3", features = ["formatting", "local-offset", "macros", "parsing"] } time-macros = { version = "0.2", default-features = false, features = ["formatting", "parsing"] } tokio = { version = "1", features = ["full", "test-util"] } +tokio-rustls = { version = "0.26" } tokio-util = { version = "0.7", features = ["codec", "io-util", "time"] } toml_datetime = { version = "0.6", default-features = false, features = ["serde"] } tracing = { version = "0.1" } tracing-core = { version = "0.1" } +typenum = { version = "1", default-features = false, features = ["const-generics"] } url = { version = "2", features = ["serde"] } usdt = { version = "0.6" } usdt-impl-3b31131e45eafb45 = { package = "usdt-impl", version = "0.6", default-features = false, features = ["des"] } usdt-impl-d8f496e17d97b5cb = { package = "usdt-impl", version = "0.5", default-features = false, features = ["asm", "des"] } uuid = { version = "1", features = ["serde", "v4"] } -winnow = { version = "0.7" } zerocopy = { version = "0.8", default-features = false, features = ["derive", "simd"] } zeroize = { version = "1", features = ["std", "zeroize_derive"] } [target.x86_64-unknown-linux-gnu.dependencies] dof-468e82937335b1c9 = { package = "dof", version = "0.3", default-features = false, features = ["des"] } dof-9fbad63c4bcf4a8f = { package = "dof", version = "0.4", default-features = false, features = ["des"] } -getrandom-468e82937335b1c9 = { package = "getrandom", version = "0.3", default-features = false, features = ["std"] } +getrandom-6f8ce4dd05d13bba = { package = "getrandom", version = "0.2", default-features = false, features = ["std"] } hyper = { version = "1", features = ["full"] } hyper-rustls = { version = "0.27", default-features = false, features = ["aws-lc-rs", "http1", "http2", "ring", "tls12", "webpki-tokio"] } hyper-util = { version = "0.1", features = ["full"] } @@ -173,13 +172,12 @@ rustix-dff4ba8e3ae991db = { package = "rustix", version = "1", features = ["fs", rustls = { version = "0.23", default-features = false, features = ["ring"] } rustls-webpki = { version = "0.103", default-features = false, features = ["aws-lc-rs", "ring", "std"] } spin = { version = "0.9", default-features = false, features = ["once", "spin_mutex"] } -tokio-rustls = { version = "0.26", features = ["aws-lc-rs", "ring"] } +tokio-rustls = { version = "0.26", default-features = false, features = ["aws-lc-rs", "ring"] } [target.x86_64-unknown-linux-gnu.build-dependencies] -aws-lc-rs = { version = "1", features = ["prebuilt-nasm"] } dof-468e82937335b1c9 = { package = "dof", version = "0.3", default-features = false, features = ["des"] } dof-9fbad63c4bcf4a8f = { package = "dof", version = "0.4", default-features = false, features = ["des"] } -getrandom-468e82937335b1c9 = { package = "getrandom", version = "0.3", default-features = false, features = ["std"] } +getrandom-6f8ce4dd05d13bba = { package = "getrandom", version = "0.2", default-features = false, features = ["std"] } hyper = { version = "1", features = ["full"] } hyper-rustls = { version = "0.27", default-features = false, features = ["aws-lc-rs", "http1", "http2", "ring", "tls12", "webpki-tokio"] } hyper-util = { version = "0.1", features = ["full"] } @@ -187,13 +185,13 @@ linux-raw-sys = { version = "0.4", default-features = false, features = ["elf", mio = { version = "1", features = ["net", "os-ext"] } rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", features = ["fs", "stdio", "system", "termios"] } rustix-dff4ba8e3ae991db = { package = "rustix", version = "1", features = ["fs", "stdio", "termios"] } -rustls = { version = "0.23", features = ["ring"] } +rustls = { version = "0.23", default-features = false, features = ["ring"] } rustls-webpki = { version = "0.103", default-features = false, features = ["aws-lc-rs", "ring", "std"] } spin = { version = "0.9", default-features = false, features = ["once", "spin_mutex"] } -tokio-rustls = { version = "0.26", features = ["aws-lc-rs", "ring"] } +tokio-rustls = { version = "0.26", default-features = false, features = ["aws-lc-rs", "ring"] } [target.aarch64-apple-darwin.dependencies] -getrandom-468e82937335b1c9 = { package = "getrandom", version = "0.3", default-features = false, features = ["std"] } +getrandom-6f8ce4dd05d13bba = { package = "getrandom", version = "0.2", default-features = false, features = ["std"] } hyper = { version = "1", features = ["full"] } hyper-rustls = { version = "0.27", default-features = false, features = ["aws-lc-rs", "http1", "http2", "ring", "tls12", "webpki-tokio"] } hyper-util = { version = "0.1", features = ["full"] } @@ -203,61 +201,55 @@ rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", features = ["fs rustix-dff4ba8e3ae991db = { package = "rustix", version = "1", features = ["fs", "stdio", "termios"] } rustls = { version = "0.23", default-features = false, features = ["ring"] } rustls-webpki = { version = "0.103", default-features = false, features = ["aws-lc-rs", "ring", "std"] } -tokio-rustls = { version = "0.26", features = ["aws-lc-rs", "ring"] } +tokio-rustls = { version = "0.26", default-features = false, features = ["aws-lc-rs", "ring"] } [target.aarch64-apple-darwin.build-dependencies] -aws-lc-rs = { version = "1", features = ["prebuilt-nasm"] } -getrandom-468e82937335b1c9 = { package = "getrandom", version = "0.3", default-features = false, features = ["std"] } +getrandom-6f8ce4dd05d13bba = { package = "getrandom", version = "0.2", default-features = false, features = ["std"] } hyper = { version = "1", features = ["full"] } hyper-rustls = { version = "0.27", default-features = false, features = ["aws-lc-rs", "http1", "http2", "ring", "tls12", "webpki-tokio"] } hyper-util = { version = "0.1", features = ["full"] } mio = { version = "1", features = ["net", "os-ext"] } rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", features = ["fs", "stdio", "system", "termios"] } rustix-dff4ba8e3ae991db = { package = "rustix", version = "1", features = ["fs", "stdio", "termios"] } -rustls = { version = "0.23", features = ["ring"] } +rustls = { version = "0.23", default-features = false, features = ["ring"] } rustls-webpki = { version = "0.103", default-features = false, features = ["aws-lc-rs", "ring", "std"] } -tokio-rustls = { version = "0.26", features = ["aws-lc-rs", "ring"] } +tokio-rustls = { version = "0.26", default-features = false, features = ["aws-lc-rs", "ring"] } [target.x86_64-unknown-illumos.dependencies] dof-468e82937335b1c9 = { package = "dof", version = "0.3", default-features = false, features = ["des"] } dof-9fbad63c4bcf4a8f = { package = "dof", version = "0.4", default-features = false, features = ["des"] } -getrandom-468e82937335b1c9 = { package = "getrandom", version = "0.3", default-features = false, features = ["std"] } +getrandom-6f8ce4dd05d13bba = { package = "getrandom", version = "0.2", default-features = false, features = ["std"] } getrandom-9fbad63c4bcf4a8f = { package = "getrandom", version = "0.4", default-features = false, features = ["std", "sys_rng"] } hyper = { version = "1", features = ["full"] } hyper-rustls = { version = "0.27", default-features = false, features = ["aws-lc-rs", "http1", "http2", "ring", "tls12", "webpki-tokio"] } hyper-util = { version = "0.1", features = ["full"] } -itertools = { version = "0.12" } mio = { version = "1", features = ["net", "os-ext"] } nix = { version = "0.31", default-features = false, features = ["signal", "term"] } -nom = { version = "7" } -regex = { version = "1" } rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", features = ["fs", "stdio", "system", "termios"] } rustix-dff4ba8e3ae991db = { package = "rustix", version = "1", features = ["fs", "stdio", "termios"] } rustls = { version = "0.23", default-features = false, features = ["ring"] } rustls-webpki = { version = "0.103", default-features = false, features = ["aws-lc-rs", "ring", "std"] } spin = { version = "0.9", default-features = false, features = ["once", "spin_mutex"] } -tokio-rustls = { version = "0.26", features = ["aws-lc-rs", "ring"] } +tokio-rustls = { version = "0.26", default-features = false, features = ["aws-lc-rs", "ring"] } toml_edit = { version = "0.19", features = ["serde"] } +winnow = { version = "1" } [target.x86_64-unknown-illumos.build-dependencies] -aws-lc-rs = { version = "1", features = ["prebuilt-nasm"] } dof-468e82937335b1c9 = { package = "dof", version = "0.3", default-features = false, features = ["des"] } dof-9fbad63c4bcf4a8f = { package = "dof", version = "0.4", default-features = false, features = ["des"] } -getrandom-468e82937335b1c9 = { package = "getrandom", version = "0.3", default-features = false, features = ["std"] } +getrandom-6f8ce4dd05d13bba = { package = "getrandom", version = "0.2", default-features = false, features = ["std"] } getrandom-9fbad63c4bcf4a8f = { package = "getrandom", version = "0.4", default-features = false, features = ["std", "sys_rng"] } hyper = { version = "1", features = ["full"] } hyper-rustls = { version = "0.27", default-features = false, features = ["aws-lc-rs", "http1", "http2", "ring", "tls12", "webpki-tokio"] } hyper-util = { version = "0.1", features = ["full"] } -itertools = { version = "0.12" } mio = { version = "1", features = ["net", "os-ext"] } -nom = { version = "7" } -regex = { version = "1" } rustix-d585fab2519d2d1 = { package = "rustix", version = "0.38", features = ["fs", "stdio", "system", "termios"] } rustix-dff4ba8e3ae991db = { package = "rustix", version = "1", features = ["fs", "stdio", "termios"] } -rustls = { version = "0.23", features = ["ring"] } +rustls = { version = "0.23", default-features = false, features = ["ring"] } rustls-webpki = { version = "0.103", default-features = false, features = ["aws-lc-rs", "ring", "std"] } spin = { version = "0.9", default-features = false, features = ["once", "spin_mutex"] } -tokio-rustls = { version = "0.26", features = ["aws-lc-rs", "ring"] } +tokio-rustls = { version = "0.26", default-features = false, features = ["aws-lc-rs", "ring"] } toml_edit = { version = "0.19", features = ["serde"] } +winnow = { version = "1" } ### END HAKARI SECTION