diff --git a/.github/actions/diffs/action.yml b/.github/actions/diffs/action.yml index 2561e1c464b9a..e8e601d9a1c37 100644 --- a/.github/actions/diffs/action.yml +++ b/.github/actions/diffs/action.yml @@ -38,6 +38,11 @@ runs: - '.github/workflows/codecov.yml' - '.github/workflows/rust.yml' - '.github/workflows/external.yml' + - 'Cargo.lock' + - 'Cargo.toml' + - 'deny.toml' + - 'rust-toolchain.toml' + - 'rustfmt.toml' isDoc: - 'docs/content/**' - '*.mdx' diff --git a/Cargo.lock b/Cargo.lock index 3a0f50c48c342..cd0b4b486a57d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -178,8 +178,8 @@ dependencies = [ "rand 0.8.5", "rcgen", "ring 0.16.20", - "rustls 0.21.6", - "rustls-webpki 0.101.4", + "rustls 0.21.11", + "rustls-webpki 0.101.7", "serde", "serde_json", "socket2 0.5.6", @@ -1376,7 +1376,7 @@ dependencies = [ "hyper-rustls 0.24.0", "lazy_static", "pin-project-lite", - "rustls 0.21.6", + "rustls 0.21.11", "tokio", "tower", "tracing", @@ -1625,7 +1625,7 @@ dependencies = [ "http-body", "hyper", "pin-project-lite", - "rustls 0.21.6", + "rustls 0.21.11", "rustls-pemfile 1.0.2", "tokio", "tokio-rustls 0.24.0", @@ -1832,7 +1832,7 @@ dependencies = [ "lazy_static", "lazycell", "peeking_take_while", - "prettyplease 0.2.6", + "prettyplease 0.2.17", "proc-macro2 1.0.78", "quote 1.0.35", "regex", @@ -2276,11 +2276,12 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.78" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" +checksum = "17f6e324229dc011159fcc089755d1e2e216a90d43a7dea6853ca740b84f35e7" dependencies = [ "jobserver", + "libc", ] [[package]] @@ -5424,7 +5425,7 @@ dependencies = [ "http", "hyper", "log", - "rustls 0.21.6", + "rustls 0.21.11", "rustls-native-certs", "tokio", "tokio-rustls 0.24.0", @@ -9288,9 +9289,9 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.6" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b69d39aab54d069e7f2fe8cb970493e7834601ca2d8c65fd7bbd183578080d1" +checksum = "8d3928fb5db768cb86f891ff014f0144589297e3c6a1aba6ed7cecfdace270c7" dependencies = [ "proc-macro2 1.0.78", "syn 2.0.48", @@ -9516,7 +9517,7 @@ dependencies = [ "multimap", "once_cell", "petgraph 0.6.2", - "prettyplease 0.2.6", + "prettyplease 0.2.17", "prost 0.12.3", "prost-types", "regex", @@ -9658,7 +9659,7 @@ dependencies = [ "quinn-proto", "quinn-udp", "rustc-hash", - "rustls 0.21.6", + "rustls 0.21.11", "thiserror", "tokio", "tracing", @@ -9674,7 +9675,7 @@ dependencies = [ "rand 0.8.5", "ring 0.16.20", "rustc-hash", - "rustls 0.21.6", + "rustls 0.21.11", "slab", "thiserror", "tinyvec", @@ -10027,7 +10028,7 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.21.6", + "rustls 0.21.11", "rustls-native-certs", "rustls-pemfile 1.0.2", "serde", @@ -10547,13 +10548,13 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.6" +version = "0.21.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb" +checksum = "7fecbfb7b1444f477b345853b1fce097a2c6fb637b2bfb87e6bc5db0f043fae4" dependencies = [ "log", - "ring 0.16.20", - "rustls-webpki 0.101.4", + "ring 0.17.3", + "rustls-webpki 0.101.7", "sct", ] @@ -10620,12 +10621,12 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.101.4" +version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", + "ring 0.17.3", + "untrusted 0.9.0", ] [[package]] @@ -13410,7 +13411,7 @@ dependencies = [ "protobuf", "rand 0.8.5", "reqwest", - "rustls 0.21.6", + "rustls 0.21.11", "rustls-pemfile 1.0.2", "serde", "serde_json", @@ -13966,8 +13967,8 @@ dependencies = [ "rand 0.8.5", "rcgen", "reqwest", - "rustls 0.21.6", - "rustls-webpki 0.101.4", + "rustls 0.21.11", + "rustls-webpki 0.101.7", "tokio", "tokio-rustls 0.24.0", "tower-layer", @@ -14916,7 +14917,7 @@ version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e0d409377ff5b1e3ca6437aa86c1eb7d40c134bfec254e44c830defa92669db5" dependencies = [ - "rustls 0.21.6", + "rustls 0.21.11", "tokio", ] @@ -15155,7 +15156,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be4ef6dd70a610078cb4e338a0f79d06bc759ff1b22d2120c2ff02ae264ba9c2" dependencies = [ - "prettyplease 0.2.6", + "prettyplease 0.2.17", "proc-macro2 1.0.78", "prost-build", "quote 1.0.35", @@ -15470,7 +15471,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if", - "rand 0.7.3", + "rand 0.8.5", "static_assertions", ] @@ -15682,8 +15683,8 @@ dependencies = [ "flate2", "log", "once_cell", - "rustls 0.21.6", - "rustls-webpki 0.101.4", + "rustls 0.21.11", + "rustls-webpki 0.101.7", "url", "webpki-roots 0.25.2", ] @@ -16419,7 +16420,7 @@ dependencies = [ "itertools 0.10.5", "log", "percent-encoding", - "rustls 0.21.6", + "rustls 0.21.11", "rustls-pemfile 1.0.2", "seahash", "serde", @@ -16432,9 +16433,9 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" dependencies = [ "zeroize_derive", ] diff --git a/Cargo.toml b/Cargo.toml index 6df35beff86c9..6256c8f97f886 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -435,7 +435,7 @@ rusoto_kms = { version = "0.48.0", default_features = false, features = [ russh = "0.38.0" russh-keys = "0.38.0" rust-version = "1.56.1" -rustls = { version = "0.21.6", features = ["dangerous_configuration"] } +rustls = { version = "0.21.11", features = ["dangerous_configuration"] } rustls-pemfile = "1.0.2" rustversion = "1.0.9" rustyline = "9.1.2" diff --git a/deny.toml b/deny.toml index f611b706507ad..ad56c381bf314 100644 --- a/deny.toml +++ b/deny.toml @@ -63,7 +63,7 @@ ignore = [ "RUSTSEC-2023-0052", # we don't do RSA signing on Sui (only verifying for zklogin) "RUSTSEC-2023-0071", - # Unblock until rustls is upgraded. + # A few dependencies use unpatched rustls. "RUSTSEC-2024-0336", ] # Threshold for security vulnerabilities, any vulnerability with a CVSS score