From e7d3b50e5ae43c99b924bc64a4219562336a4869 Mon Sep 17 00:00:00 2001 From: Rostislav Rumenov Date: Wed, 14 Feb 2024 15:30:46 +0000 Subject: [PATCH] build: use workspace versions for the rustls, tokio-rustls and hyper-rustls crates --- Cargo.Bazel.Fuzzing.json.lock | 423 ++++++++++----- Cargo.Bazel.Fuzzing.toml.lock | 81 +-- Cargo.Bazel.json.lock | 486 ++++++++++++------ Cargo.Bazel.toml.lock | 86 ++-- Cargo.lock | 64 ++- Cargo.toml | 9 +- bazel/external_crates.bzl | 6 +- .../certificate_syncer/Cargo.toml | 2 +- rs/boundary_node/ic_boundary/Cargo.toml | 6 +- rs/boundary_node/icx_proxy/Cargo.toml | 4 +- rs/canister_client/Cargo.toml | 4 +- rs/crypto/Cargo.toml | 2 +- rs/crypto/temp_crypto/Cargo.toml | 2 +- rs/crypto/test_utils/tls/Cargo.toml | 2 +- rs/crypto/tls_interfaces/Cargo.toml | 2 +- rs/crypto/utils/tls/Cargo.toml | 2 +- rs/https_outcalls/adapter/Cargo.toml | 2 +- rs/p2p/quic_transport/Cargo.toml | 2 +- rs/rosetta-api/Cargo.toml | 2 +- rs/test_utilities/Cargo.toml | 2 +- rs/tests/Cargo.toml | 4 +- rs/tests/httpbin-rs/Cargo.toml | 2 +- 22 files changed, 773 insertions(+), 422 deletions(-) diff --git a/Cargo.Bazel.Fuzzing.json.lock b/Cargo.Bazel.Fuzzing.json.lock index b2ab5f712c1..bcc14b32d1e 100644 --- a/Cargo.Bazel.Fuzzing.json.lock +++ b/Cargo.Bazel.Fuzzing.json.lock @@ -1,5 +1,5 @@ { - "checksum": "68c58e0cdb8ebf202df7933c6b22d7605b99935edd6786ad043bf9d2527e0e55", + "checksum": "12d5181870da6bfd85c67d7288b9c17d4260dac422daedd006c032f244d4178e", "crates": { "abnf 0.12.0": { "name": "abnf", @@ -5061,7 +5061,7 @@ "target": "pin_project_lite" }, { - "id": "rustls 0.21.7", + "id": "rustls 0.21.10", "target": "rustls" }, { @@ -5163,7 +5163,7 @@ "target": "pin_project_lite" }, { - "id": "rustls 0.21.7", + "id": "rustls 0.21.10", "target": "rustls" }, { @@ -15492,7 +15492,7 @@ "alias": "hyper_1_0_0" }, { - "id": "hyper-rustls 0.24.1", + "id": "hyper-rustls 0.24.2", "target": "hyper_rustls" }, { @@ -15976,7 +15976,7 @@ "target": "rustc_hash" }, { - "id": "rustls 0.21.7", + "id": "rustls 0.21.10", "target": "rustls" }, { @@ -23871,13 +23871,13 @@ }, "license": "MIT" }, - "hyper-rustls 0.24.1": { + "hyper-rustls 0.24.2": { "name": "hyper-rustls", - "version": "0.24.1", + "version": "0.24.2", "repository": { "Http": { - "url": "https://crates.io/api/v1/crates/hyper-rustls/0.24.1/download", - "sha256": "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" + "url": "https://crates.io/api/v1/crates/hyper-rustls/0.24.2/download", + "sha256": "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" } }, "targets": [ @@ -24018,7 +24018,7 @@ "target": "log" }, { - "id": "rustls 0.21.7", + "id": "rustls 0.21.10", "target": "rustls" }, { @@ -24034,14 +24034,14 @@ "target": "tokio_rustls" }, { - "id": "webpki-roots 0.23.1", + "id": "webpki-roots 0.25.2", "target": "webpki_roots" } ], "selects": {} }, "edition": "2021", - "version": "0.24.1" + "version": "0.24.2" }, "license": "Apache-2.0 OR ISC OR MIT" }, @@ -24098,11 +24098,11 @@ "target": "hyper" }, { - "id": "hyper-rustls 0.24.1", + "id": "hyper-rustls 0.24.2", "target": "hyper_rustls" }, { - "id": "rustls 0.21.7", + "id": "rustls 0.21.10", "target": "rustls", "alias": "rusttls" }, @@ -24633,11 +24633,11 @@ "selects": { "cfg(not(target_family = \"wasm\"))": [ { - "id": "hyper-rustls 0.24.1", + "id": "hyper-rustls 0.24.2", "target": "hyper_rustls" }, { - "id": "rustls-webpki 0.101.6", + "id": "rustls-webpki 0.101.7", "target": "webpki" }, { @@ -27274,7 +27274,7 @@ "target": "hyper" }, { - "id": "hyper-rustls 0.24.1", + "id": "hyper-rustls 0.24.2", "target": "hyper_rustls" }, { @@ -28961,7 +28961,7 @@ "target": "hyper" }, { - "id": "hyper-rustls 0.24.1", + "id": "hyper-rustls 0.24.2", "target": "hyper_rustls" }, { @@ -28993,7 +28993,7 @@ "target": "rand" }, { - "id": "rustls 0.21.7", + "id": "rustls 0.21.10", "target": "rustls" }, { @@ -32658,7 +32658,7 @@ "target": "hyper" }, { - "id": "hyper-rustls 0.24.1", + "id": "hyper-rustls 0.24.2", "target": "hyper_rustls" }, { @@ -32710,7 +32710,7 @@ "target": "reqwest" }, { - "id": "rustls 0.21.7", + "id": "rustls 0.21.10", "target": "rustls" }, { @@ -42708,7 +42708,7 @@ "target": "rustc_hash" }, { - "id": "rustls 0.21.7", + "id": "rustls 0.21.10", "target": "rustls" }, { @@ -42786,7 +42786,7 @@ "target": "rustc_hash" }, { - "id": "rustls 0.21.7", + "id": "rustls 0.21.10", "target": "rustls" }, { @@ -45268,7 +45268,7 @@ "target": "hyper" }, { - "id": "hyper-rustls 0.24.1", + "id": "hyper-rustls 0.24.2", "target": "hyper_rustls" }, { @@ -45296,7 +45296,7 @@ "target": "pin_project_lite" }, { - "id": "rustls 0.21.7", + "id": "rustls 0.21.10", "target": "rustls" }, { @@ -45649,6 +45649,110 @@ }, "license": null }, + "ring 0.17.7": { + "name": "ring", + "version": "0.17.7", + "repository": { + "Http": { + "url": "https://crates.io/api/v1/crates/ring/0.17.7/download", + "sha256": "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" + } + }, + "targets": [ + { + "Library": { + "crate_name": "ring", + "crate_root": "src/lib.rs", + "srcs": [ + "**/*.rs" + ] + } + }, + { + "BuildScript": { + "crate_name": "build_script_build", + "crate_root": "build.rs", + "srcs": [ + "**/*.rs" + ] + } + } + ], + "library_target_name": "ring", + "common_attrs": { + "compile_data_glob": [ + "**" + ], + "crate_features": { + "common": [ + "alloc", + "default", + "dev_urandom_fallback" + ], + "selects": {} + }, + "deps": { + "common": [ + { + "id": "getrandom 0.2.10", + "target": "getrandom" + }, + { + "id": "ring 0.17.7", + "target": "build_script_build" + }, + { + "id": "untrusted 0.9.0", + "target": "untrusted" + } + ], + "selects": { + "cfg(all(any(target_os = \"android\", target_os = \"linux\"), any(target_arch = \"aarch64\", target_arch = \"arm\")))": [ + { + "id": "libc 0.2.152", + "target": "libc" + } + ], + "cfg(all(target_arch = \"aarch64\", target_os = \"windows\"))": [ + { + "id": "windows-sys 0.48.0", + "target": "windows_sys" + } + ], + "cfg(any(target_arch = \"aarch64\", target_arch = \"arm\", target_arch = \"x86\", target_arch = \"x86_64\"))": [ + { + "id": "spin 0.9.8", + "target": "spin" + } + ] + } + }, + "edition": "2021", + "version": "0.17.7" + }, + "build_script_attrs": { + "data_glob": [ + "**" + ], + "deps": { + "common": [ + { + "id": "cc 1.0.83", + "target": "cc" + } + ], + "selects": {} + }, + "build_script_env": { + "common": { + "CFLAGS": "-fdebug-prefix-map=$${pwd}=/source" + }, + "selects": {} + }, + "links": "ring_core_0_17_7" + }, + "license": null + }, "ripemd 0.1.3": { "name": "ripemd", "version": "0.1.3", @@ -47229,13 +47333,13 @@ }, "license": "Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT" }, - "rustls 0.21.7": { + "rustls 0.21.10": { "name": "rustls", - "version": "0.21.7", + "version": "0.21.10", "repository": { "Http": { - "url": "https://crates.io/api/v1/crates/rustls/0.21.7/download", - "sha256": "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" + "url": "https://crates.io/api/v1/crates/rustls/0.21.10/download", + "sha256": "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" } }, "targets": [ @@ -47281,15 +47385,15 @@ "target": "log" }, { - "id": "ring 0.16.20", + "id": "ring 0.17.7", "target": "ring" }, { - "id": "rustls 0.21.7", + "id": "rustls 0.21.10", "target": "build_script_build" }, { - "id": "rustls-webpki 0.101.6", + "id": "rustls-webpki 0.101.7", "target": "webpki" }, { @@ -47300,7 +47404,7 @@ "selects": {} }, "edition": "2021", - "version": "0.21.7" + "version": "0.21.10" }, "build_script_attrs": { "data_glob": [ @@ -47309,7 +47413,7 @@ "link_deps": { "common": [ { - "id": "ring 0.16.20", + "id": "ring 0.17.7", "target": "ring" } ], @@ -47503,13 +47607,13 @@ }, "license": "MIT OR Apache-2.0" }, - "rustls-webpki 0.100.3": { + "rustls-webpki 0.101.7": { "name": "rustls-webpki", - "version": "0.100.3", + "version": "0.101.7", "repository": { "Http": { - "url": "https://crates.io/api/v1/crates/rustls-webpki/0.100.3/download", - "sha256": "5f6a5fc258f1c1276dfe3016516945546e2d5383911efc0fc4f1cdc5df3a4ae3" + "url": "https://crates.io/api/v1/crates/rustls-webpki/0.101.7/download", + "sha256": "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" } }, "targets": [ @@ -47539,69 +47643,18 @@ "deps": { "common": [ { - "id": "ring 0.16.20", + "id": "ring 0.17.7", "target": "ring" }, { - "id": "untrusted 0.7.1", - "target": "untrusted" - } - ], - "selects": {} - }, - "edition": "2018", - "version": "0.100.3" - }, - "license": null - }, - "rustls-webpki 0.101.6": { - "name": "rustls-webpki", - "version": "0.101.6", - "repository": { - "Http": { - "url": "https://crates.io/api/v1/crates/rustls-webpki/0.101.6/download", - "sha256": "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe" - } - }, - "targets": [ - { - "Library": { - "crate_name": "webpki", - "crate_root": "src/lib.rs", - "srcs": [ - "**/*.rs" - ] - } - } - ], - "library_target_name": "webpki", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "crate_features": { - "common": [ - "alloc", - "default", - "std" - ], - "selects": {} - }, - "deps": { - "common": [ - { - "id": "ring 0.16.20", - "target": "ring" - }, - { - "id": "untrusted 0.7.1", + "id": "untrusted 0.9.0", "target": "untrusted" } ], "selects": {} }, "edition": "2021", - "version": "0.101.6" + "version": "0.101.7" }, "license": "ISC" }, @@ -52031,7 +52084,83 @@ "mutex", "spin_mutex" ], - "selects": {} + "selects": { + "aarch64-apple-darwin": [ + "once" + ], + "aarch64-apple-ios": [ + "once" + ], + "aarch64-apple-ios-sim": [ + "once" + ], + "aarch64-fuchsia": [ + "once" + ], + "aarch64-linux-android": [ + "once" + ], + "aarch64-pc-windows-msvc": [ + "once" + ], + "aarch64-unknown-linux-gnu": [ + "once" + ], + "arm-unknown-linux-gnueabi": [ + "once" + ], + "armv7-linux-androideabi": [ + "once" + ], + "armv7-unknown-linux-gnueabi": [ + "once" + ], + "i686-apple-darwin": [ + "once" + ], + "i686-linux-android": [ + "once" + ], + "i686-pc-windows-msvc": [ + "once" + ], + "i686-unknown-freebsd": [ + "once" + ], + "i686-unknown-linux-gnu": [ + "once" + ], + "thumbv7em-none-eabi": [ + "once" + ], + "thumbv8m.main-none-eabi": [ + "once" + ], + "x86_64-apple-darwin": [ + "once" + ], + "x86_64-apple-ios": [ + "once" + ], + "x86_64-fuchsia": [ + "once" + ], + "x86_64-linux-android": [ + "once" + ], + "x86_64-pc-windows-msvc": [ + "once" + ], + "x86_64-unknown-freebsd": [ + "once" + ], + "x86_64-unknown-linux-gnu": [ + "once" + ], + "x86_64-unknown-none": [ + "once" + ] + } }, "edition": "2015", "version": "0.9.8" @@ -55397,7 +55526,7 @@ "deps": { "common": [ { - "id": "rustls 0.21.7", + "id": "rustls 0.21.10", "target": "rustls" }, { @@ -58503,6 +58632,36 @@ }, "license": "ISC" }, + "untrusted 0.9.0": { + "name": "untrusted", + "version": "0.9.0", + "repository": { + "Http": { + "url": "https://crates.io/api/v1/crates/untrusted/0.9.0/download", + "sha256": "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + } + }, + "targets": [ + { + "Library": { + "crate_name": "untrusted", + "crate_root": "src/lib.rs", + "srcs": [ + "**/*.rs" + ] + } + } + ], + "library_target_name": "untrusted", + "common_attrs": { + "compile_data_glob": [ + "**" + ], + "edition": "2018", + "version": "0.9.0" + }, + "license": "ISC" + }, "unwind 0.4.1": { "name": "unwind", "version": "0.4.1", @@ -61854,45 +62013,6 @@ }, "license": "MIT/Apache-2.0" }, - "webpki-roots 0.23.1": { - "name": "webpki-roots", - "version": "0.23.1", - "repository": { - "Http": { - "url": "https://crates.io/api/v1/crates/webpki-roots/0.23.1/download", - "sha256": "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" - } - }, - "targets": [ - { - "Library": { - "crate_name": "webpki_roots", - "crate_root": "src/lib.rs", - "srcs": [ - "**/*.rs" - ] - } - } - ], - "library_target_name": "webpki_roots", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "deps": { - "common": [ - { - "id": "rustls-webpki 0.100.3", - "target": "webpki" - } - ], - "selects": {} - }, - "edition": "2018", - "version": "0.23.1" - }, - "license": "MPL-2.0" - }, "webpki-roots 0.25.2": { "name": "webpki-roots", "version": "0.25.2", @@ -65188,6 +65308,13 @@ "s390x-unknown-linux-gnu", "x86_64-linux-android" ], + "cfg(all(any(target_os = \"android\", target_os = \"linux\"), any(target_arch = \"aarch64\", target_arch = \"arm\")))": [ + "aarch64-linux-android", + "aarch64-unknown-linux-gnu", + "arm-unknown-linux-gnueabi", + "armv7-linux-androideabi", + "armv7-unknown-linux-gnueabi" + ], "cfg(all(not(rustix_use_libc), not(miri), target_os = \"linux\", any(target_arch = \"x86\", all(target_arch = \"x86_64\", target_pointer_width = \"64\"), all(target_endian = \"little\", any(target_arch = \"arm\", all(target_arch = \"aarch64\", target_pointer_width = \"64\"), target_arch = \"powerpc64\", target_arch = \"riscv64\", target_arch = \"mips\", target_arch = \"mips64\")))))": [ "aarch64-unknown-linux-gnu", "arm-unknown-linux-gnueabi", @@ -65267,6 +65394,9 @@ "cfg(all(target_arch = \"aarch64\", target_os = \"linux\"))": [ "aarch64-unknown-linux-gnu" ], + "cfg(all(target_arch = \"aarch64\", target_os = \"windows\"))": [ + "aarch64-pc-windows-msvc" + ], "cfg(all(target_arch = \"aarch64\", target_vendor = \"apple\"))": [ "aarch64-apple-darwin", "aarch64-apple-ios", @@ -65370,6 +65500,33 @@ "x86_64-unknown-freebsd", "x86_64-unknown-none" ], + "cfg(any(target_arch = \"aarch64\", target_arch = \"arm\", target_arch = \"x86\", target_arch = \"x86_64\"))": [ + "aarch64-apple-darwin", + "aarch64-apple-ios", + "aarch64-apple-ios-sim", + "aarch64-fuchsia", + "aarch64-linux-android", + "aarch64-pc-windows-msvc", + "aarch64-unknown-linux-gnu", + "arm-unknown-linux-gnueabi", + "armv7-linux-androideabi", + "armv7-unknown-linux-gnueabi", + "i686-apple-darwin", + "i686-linux-android", + "i686-pc-windows-msvc", + "i686-unknown-freebsd", + "i686-unknown-linux-gnu", + "thumbv7em-none-eabi", + "thumbv8m.main-none-eabi", + "x86_64-apple-darwin", + "x86_64-apple-ios", + "x86_64-fuchsia", + "x86_64-linux-android", + "x86_64-pc-windows-msvc", + "x86_64-unknown-freebsd", + "x86_64-unknown-linux-gnu", + "x86_64-unknown-none" + ], "cfg(any(target_arch = \"aarch64\", target_arch = \"x86\", target_arch = \"x86_64\"))": [ "aarch64-apple-darwin", "aarch64-apple-ios", diff --git a/Cargo.Bazel.Fuzzing.toml.lock b/Cargo.Bazel.Fuzzing.toml.lock index bf278f81704..b8322869733 100644 --- a/Cargo.Bazel.Fuzzing.toml.lock +++ b/Cargo.Bazel.Fuzzing.toml.lock @@ -3184,7 +3184,7 @@ dependencies = [ "regex", "reqwest", "rgb", - "ring", + "ring 0.16.20", "ripemd", "rlp", "rocksdb", @@ -4782,9 +4782,9 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", "http 0.2.9", @@ -4794,7 +4794,7 @@ dependencies = [ "rustls-native-certs", "tokio", "tokio-rustls", - "webpki-roots 0.23.1", + "webpki-roots", ] [[package]] @@ -4909,8 +4909,8 @@ dependencies = [ "rand 0.8.5", "rangemap", "reqwest", - "ring", - "rustls-webpki 0.101.6", + "ring 0.16.20", + "rustls-webpki", "sec1", "serde", "serde_bytes", @@ -5482,7 +5482,7 @@ dependencies = [ "base64 0.21.4", "hyper 0.14.27", "hyper-rustls", - "ring", + "ring 0.16.20", "serde", "serde_json", "thiserror", @@ -8363,7 +8363,7 @@ checksum = "2c78e758510582acc40acb90458401172d41f1016f8c9dde89e49677afb7eec1" dependencies = [ "bytes", "rand 0.8.5", - "ring", + "ring 0.16.20", "rustc-hash", "rustls", "rustls-native-certs", @@ -8677,7 +8677,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52c4f3084aa3bc7dfbba4eff4fab2a54db4324965d8872ab933565e6fbd83bc6" dependencies = [ "pem 3.0.2", - "ring", + "ring 0.16.20", "time", "yasna", "zeroize", @@ -8852,7 +8852,7 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots 0.25.2", + "webpki-roots", "winreg", ] @@ -8901,11 +8901,25 @@ dependencies = [ "libc", "once_cell", "spin 0.5.2", - "untrusted", + "untrusted 0.7.1", "web-sys", "winapi 0.3.9", ] +[[package]] +name = "ring" +version = "0.17.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" +dependencies = [ + "cc", + "getrandom 0.2.10", + "libc", + "spin 0.9.8", + "untrusted 0.9.0", + "windows-sys 0.48.0", +] + [[package]] name = "ripemd" version = "0.1.3" @@ -9169,13 +9183,13 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.7" +version = "0.21.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" +checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ "log", - "ring", - "rustls-webpki 0.101.6", + "ring 0.17.7", + "rustls-webpki", "sct", ] @@ -9218,22 +9232,12 @@ checksum = "9e9d979b3ce68192e42760c7810125eb6cf2ea10efae545a156063e61f314e2a" [[package]] name = "rustls-webpki" -version = "0.100.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f6a5fc258f1c1276dfe3016516945546e2d5383911efc0fc4f1cdc5df3a4ae3" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "rustls-webpki" -version = "0.101.6" +version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring", - "untrusted", + "ring 0.17.7", + "untrusted 0.9.0", ] [[package]] @@ -9368,8 +9372,8 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] @@ -11370,6 +11374,12 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + [[package]] name = "unwind" version = "0.4.1" @@ -12051,15 +12061,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webpki-roots" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" -dependencies = [ - "rustls-webpki 0.100.3", -] - [[package]] name = "webpki-roots" version = "0.25.2" diff --git a/Cargo.Bazel.json.lock b/Cargo.Bazel.json.lock index 985b23df8d3..4f16aa82c9d 100644 --- a/Cargo.Bazel.json.lock +++ b/Cargo.Bazel.json.lock @@ -1,5 +1,5 @@ { - "checksum": "9743582a6bfe39f3b98b6cd9a7fe46c91e8a7cdece64bd7895dbb4a9474546a4", + "checksum": "febcbc9c609150e6f4292bc4014b51efbb745293445cc1b603314c03969d69e9", "crates": { "abnf 0.12.0": { "name": "abnf", @@ -5075,7 +5075,7 @@ "target": "pin_project_lite" }, { - "id": "rustls 0.21.7", + "id": "rustls 0.21.10", "target": "rustls" }, { @@ -5177,7 +5177,7 @@ "target": "pin_project_lite" }, { - "id": "rustls 0.21.7", + "id": "rustls 0.21.10", "target": "rustls" }, { @@ -5396,7 +5396,7 @@ "deps": { "common": [ { - "id": "cc 1.0.79", + "id": "cc 1.0.83", "target": "cc" } ], @@ -8462,7 +8462,7 @@ "deps": { "common": [ { - "id": "cc 1.0.79", + "id": "cc 1.0.83", "target": "cc" }, { @@ -9208,13 +9208,13 @@ }, "license": "MIT OR Apache-2.0" }, - "cc 1.0.79": { + "cc 1.0.83": { "name": "cc", - "version": "1.0.79", + "version": "1.0.83", "repository": { "Http": { - "url": "https://crates.io/api/v1/crates/cc/1.0.79/download", - "sha256": "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" + "url": "https://crates.io/api/v1/crates/cc/1.0.83/download", + "sha256": "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" } }, "targets": [ @@ -9247,10 +9247,17 @@ "target": "jobserver" } ], - "selects": {} + "selects": { + "cfg(unix)": [ + { + "id": "libc 0.2.150", + "target": "libc" + } + ] + } }, "edition": "2018", - "version": "1.0.79" + "version": "1.0.83" }, "license": "MIT OR Apache-2.0" }, @@ -15120,7 +15127,7 @@ "target": "cargo_metadata" }, { - "id": "cc 1.0.79", + "id": "cc 1.0.83", "target": "cc" }, { @@ -15361,7 +15368,7 @@ "alias": "hyper_1_0_0" }, { - "id": "hyper-rustls 0.24.1", + "id": "hyper-rustls 0.24.2", "target": "hyper_rustls" }, { @@ -15845,7 +15852,7 @@ "target": "rustc_hash" }, { - "id": "rustls 0.21.7", + "id": "rustls 0.21.10", "target": "rustls" }, { @@ -17973,7 +17980,7 @@ "deps": { "common": [ { - "id": "cc 1.0.79", + "id": "cc 1.0.83", "target": "cc" } ], @@ -19216,7 +19223,7 @@ "deps": { "common": [ { - "id": "cc 1.0.79", + "id": "cc 1.0.83", "target": "cc" } ], @@ -23877,13 +23884,13 @@ }, "license": "MIT" }, - "hyper-rustls 0.24.1": { + "hyper-rustls 0.24.2": { "name": "hyper-rustls", - "version": "0.24.1", + "version": "0.24.2", "repository": { "Http": { - "url": "https://crates.io/api/v1/crates/hyper-rustls/0.24.1/download", - "sha256": "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" + "url": "https://crates.io/api/v1/crates/hyper-rustls/0.24.2/download", + "sha256": "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" } }, "targets": [ @@ -24024,7 +24031,7 @@ "target": "log" }, { - "id": "rustls 0.21.7", + "id": "rustls 0.21.10", "target": "rustls" }, { @@ -24040,14 +24047,14 @@ "target": "tokio_rustls" }, { - "id": "webpki-roots 0.23.1", + "id": "webpki-roots 0.25.2", "target": "webpki_roots" } ], "selects": {} }, "edition": "2021", - "version": "0.24.1" + "version": "0.24.2" }, "license": "Apache-2.0 OR ISC OR MIT" }, @@ -24104,11 +24111,11 @@ "target": "hyper" }, { - "id": "hyper-rustls 0.24.1", + "id": "hyper-rustls 0.24.2", "target": "hyper_rustls" }, { - "id": "rustls 0.21.7", + "id": "rustls 0.21.10", "target": "rustls", "alias": "rusttls" }, @@ -24470,7 +24477,7 @@ "deps": { "common": [ { - "id": "cc 1.0.79", + "id": "cc 1.0.83", "target": "cc" } ], @@ -24639,11 +24646,11 @@ "selects": { "cfg(not(target_family = \"wasm\"))": [ { - "id": "hyper-rustls 0.24.1", + "id": "hyper-rustls 0.24.2", "target": "hyper_rustls" }, { - "id": "rustls-webpki 0.101.4", + "id": "rustls-webpki 0.101.7", "target": "webpki" }, { @@ -27280,7 +27287,7 @@ "target": "hyper" }, { - "id": "hyper-rustls 0.24.1", + "id": "hyper-rustls 0.24.2", "target": "hyper_rustls" }, { @@ -28035,7 +28042,7 @@ "deps": { "common": [ { - "id": "cc 1.0.79", + "id": "cc 1.0.83", "target": "cc" }, { @@ -28967,7 +28974,7 @@ "target": "hyper" }, { - "id": "hyper-rustls 0.24.1", + "id": "hyper-rustls 0.24.2", "target": "hyper_rustls" }, { @@ -28999,7 +29006,7 @@ "target": "rand" }, { - "id": "rustls 0.21.7", + "id": "rustls 0.21.10", "target": "rustls" }, { @@ -30176,7 +30183,7 @@ "deps": { "common": [ { - "id": "cc 1.0.79", + "id": "cc 1.0.83", "target": "cc" } ], @@ -30411,7 +30418,7 @@ "target": "bindgen" }, { - "id": "cc 1.0.79", + "id": "cc 1.0.83", "target": "cc" }, { @@ -30742,7 +30749,7 @@ "deps": { "common": [ { - "id": "cc 1.0.79", + "id": "cc 1.0.83", "target": "cc" }, { @@ -30828,7 +30835,7 @@ "deps": { "common": [ { - "id": "cc 1.0.79", + "id": "cc 1.0.83", "target": "cc" }, { @@ -30922,7 +30929,7 @@ "deps": { "common": [ { - "id": "cc 1.0.79", + "id": "cc 1.0.83", "target": "cc" }, { @@ -31006,7 +31013,7 @@ "deps": { "common": [ { - "id": "cc 1.0.79", + "id": "cc 1.0.83", "target": "cc" }, { @@ -31841,7 +31848,7 @@ "deps": { "common": [ { - "id": "cc 1.0.79", + "id": "cc 1.0.83", "target": "cc" }, { @@ -32678,7 +32685,7 @@ "target": "hyper" }, { - "id": "hyper-rustls 0.24.1", + "id": "hyper-rustls 0.24.2", "target": "hyper_rustls" }, { @@ -32730,7 +32737,7 @@ "target": "reqwest" }, { - "id": "rustls 0.21.7", + "id": "rustls 0.21.10", "target": "rustls" }, { @@ -36329,7 +36336,7 @@ "deps": { "common": [ { - "id": "cc 1.0.79", + "id": "cc 1.0.83", "target": "cc" }, { @@ -42167,7 +42174,7 @@ "deps": { "common": [ { - "id": "cc 1.0.79", + "id": "cc 1.0.83", "target": "cc" } ], @@ -42665,7 +42672,7 @@ "target": "rustc_hash" }, { - "id": "rustls 0.21.7", + "id": "rustls 0.21.10", "target": "rustls" }, { @@ -42743,7 +42750,7 @@ "target": "rustc_hash" }, { - "id": "rustls 0.21.7", + "id": "rustls 0.21.10", "target": "rustls" }, { @@ -45188,7 +45195,7 @@ "target": "hyper" }, { - "id": "hyper-rustls 0.24.1", + "id": "hyper-rustls 0.24.2", "target": "hyper_rustls" }, { @@ -45216,7 +45223,7 @@ "target": "pin_project_lite" }, { - "id": "rustls 0.21.7", + "id": "rustls 0.21.10", "target": "rustls" }, { @@ -45553,7 +45560,7 @@ "deps": { "common": [ { - "id": "cc 1.0.79", + "id": "cc 1.0.83", "target": "cc" } ], @@ -45569,6 +45576,110 @@ }, "license": null }, + "ring 0.17.7": { + "name": "ring", + "version": "0.17.7", + "repository": { + "Http": { + "url": "https://crates.io/api/v1/crates/ring/0.17.7/download", + "sha256": "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" + } + }, + "targets": [ + { + "Library": { + "crate_name": "ring", + "crate_root": "src/lib.rs", + "srcs": [ + "**/*.rs" + ] + } + }, + { + "BuildScript": { + "crate_name": "build_script_build", + "crate_root": "build.rs", + "srcs": [ + "**/*.rs" + ] + } + } + ], + "library_target_name": "ring", + "common_attrs": { + "compile_data_glob": [ + "**" + ], + "crate_features": { + "common": [ + "alloc", + "default", + "dev_urandom_fallback" + ], + "selects": {} + }, + "deps": { + "common": [ + { + "id": "getrandom 0.2.10", + "target": "getrandom" + }, + { + "id": "ring 0.17.7", + "target": "build_script_build" + }, + { + "id": "untrusted 0.9.0", + "target": "untrusted" + } + ], + "selects": { + "cfg(all(any(target_os = \"android\", target_os = \"linux\"), any(target_arch = \"aarch64\", target_arch = \"arm\")))": [ + { + "id": "libc 0.2.150", + "target": "libc" + } + ], + "cfg(all(target_arch = \"aarch64\", target_os = \"windows\"))": [ + { + "id": "windows-sys 0.48.0", + "target": "windows_sys" + } + ], + "cfg(any(target_arch = \"aarch64\", target_arch = \"arm\", target_arch = \"x86\", target_arch = \"x86_64\"))": [ + { + "id": "spin 0.9.8", + "target": "spin" + } + ] + } + }, + "edition": "2021", + "version": "0.17.7" + }, + "build_script_attrs": { + "data_glob": [ + "**" + ], + "deps": { + "common": [ + { + "id": "cc 1.0.83", + "target": "cc" + } + ], + "selects": {} + }, + "build_script_env": { + "common": { + "CFLAGS": "-fdebug-prefix-map=$${pwd}=/source" + }, + "selects": {} + }, + "links": "ring_core_0_17_7" + }, + "license": null + }, "ripemd 0.1.3": { "name": "ripemd", "version": "0.1.3", @@ -47185,13 +47296,13 @@ }, "license": "Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT" }, - "rustls 0.21.7": { + "rustls 0.21.10": { "name": "rustls", - "version": "0.21.7", + "version": "0.21.10", "repository": { "Http": { - "url": "https://crates.io/api/v1/crates/rustls/0.21.7/download", - "sha256": "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" + "url": "https://crates.io/api/v1/crates/rustls/0.21.10/download", + "sha256": "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" } }, "targets": [ @@ -47237,15 +47348,15 @@ "target": "log" }, { - "id": "ring 0.16.20", + "id": "ring 0.17.7", "target": "ring" }, { - "id": "rustls 0.21.7", + "id": "rustls 0.21.10", "target": "build_script_build" }, { - "id": "rustls-webpki 0.101.4", + "id": "rustls-webpki 0.101.7", "target": "webpki" }, { @@ -47256,7 +47367,7 @@ "selects": {} }, "edition": "2021", - "version": "0.21.7" + "version": "0.21.10" }, "build_script_attrs": { "data_glob": [ @@ -47265,7 +47376,7 @@ "link_deps": { "common": [ { - "id": "ring 0.16.20", + "id": "ring 0.17.7", "target": "ring" } ], @@ -47459,64 +47570,13 @@ }, "license": "MIT OR Apache-2.0" }, - "rustls-webpki 0.100.2": { - "name": "rustls-webpki", - "version": "0.100.2", - "repository": { - "Http": { - "url": "https://crates.io/api/v1/crates/rustls-webpki/0.100.2/download", - "sha256": "e98ff011474fa39949b7e5c0428f9b4937eda7da7848bbb947786b7be0b27dab" - } - }, - "targets": [ - { - "Library": { - "crate_name": "webpki", - "crate_root": "src/lib.rs", - "srcs": [ - "**/*.rs" - ] - } - } - ], - "library_target_name": "webpki", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "crate_features": { - "common": [ - "alloc", - "default", - "std" - ], - "selects": {} - }, - "deps": { - "common": [ - { - "id": "ring 0.16.20", - "target": "ring" - }, - { - "id": "untrusted 0.7.1", - "target": "untrusted" - } - ], - "selects": {} - }, - "edition": "2018", - "version": "0.100.2" - }, - "license": null - }, - "rustls-webpki 0.101.4": { + "rustls-webpki 0.101.7": { "name": "rustls-webpki", - "version": "0.101.4", + "version": "0.101.7", "repository": { "Http": { - "url": "https://crates.io/api/v1/crates/rustls-webpki/0.101.4/download", - "sha256": "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" + "url": "https://crates.io/api/v1/crates/rustls-webpki/0.101.7/download", + "sha256": "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" } }, "targets": [ @@ -47546,18 +47606,18 @@ "deps": { "common": [ { - "id": "ring 0.16.20", + "id": "ring 0.17.7", "target": "ring" }, { - "id": "untrusted 0.7.1", + "id": "untrusted 0.9.0", "target": "untrusted" } ], "selects": {} }, "edition": "2021", - "version": "0.101.4" + "version": "0.101.7" }, "license": "ISC" }, @@ -48541,7 +48601,7 @@ "deps": { "common": [ { - "id": "cc 1.0.79", + "id": "cc 1.0.83", "target": "cc" } ], @@ -48612,7 +48672,7 @@ "deps": { "common": [ { - "id": "cc 1.0.79", + "id": "cc 1.0.83", "target": "cc" } ], @@ -51987,7 +52047,83 @@ "mutex", "spin_mutex" ], - "selects": {} + "selects": { + "aarch64-apple-darwin": [ + "once" + ], + "aarch64-apple-ios": [ + "once" + ], + "aarch64-apple-ios-sim": [ + "once" + ], + "aarch64-fuchsia": [ + "once" + ], + "aarch64-linux-android": [ + "once" + ], + "aarch64-pc-windows-msvc": [ + "once" + ], + "aarch64-unknown-linux-gnu": [ + "once" + ], + "arm-unknown-linux-gnueabi": [ + "once" + ], + "armv7-linux-androideabi": [ + "once" + ], + "armv7-unknown-linux-gnueabi": [ + "once" + ], + "i686-apple-darwin": [ + "once" + ], + "i686-linux-android": [ + "once" + ], + "i686-pc-windows-msvc": [ + "once" + ], + "i686-unknown-freebsd": [ + "once" + ], + "i686-unknown-linux-gnu": [ + "once" + ], + "thumbv7em-none-eabi": [ + "once" + ], + "thumbv8m.main-none-eabi": [ + "once" + ], + "x86_64-apple-darwin": [ + "once" + ], + "x86_64-apple-ios": [ + "once" + ], + "x86_64-fuchsia": [ + "once" + ], + "x86_64-linux-android": [ + "once" + ], + "x86_64-pc-windows-msvc": [ + "once" + ], + "x86_64-unknown-freebsd": [ + "once" + ], + "x86_64-unknown-linux-gnu": [ + "once" + ], + "x86_64-unknown-none": [ + "once" + ] + } }, "edition": "2015", "version": "0.9.8" @@ -52238,7 +52374,7 @@ "deps": { "common": [ { - "id": "cc 1.0.79", + "id": "cc 1.0.83", "target": "cc" } ], @@ -55380,7 +55516,7 @@ "deps": { "common": [ { - "id": "rustls 0.21.7", + "id": "rustls 0.21.10", "target": "rustls" }, { @@ -58486,6 +58622,36 @@ }, "license": "ISC" }, + "untrusted 0.9.0": { + "name": "untrusted", + "version": "0.9.0", + "repository": { + "Http": { + "url": "https://crates.io/api/v1/crates/untrusted/0.9.0/download", + "sha256": "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + } + }, + "targets": [ + { + "Library": { + "crate_name": "untrusted", + "crate_root": "src/lib.rs", + "srcs": [ + "**/*.rs" + ] + } + } + ], + "library_target_name": "untrusted", + "common_attrs": { + "compile_data_glob": [ + "**" + ], + "edition": "2018", + "version": "0.9.0" + }, + "license": "ISC" + }, "unwind 0.4.1": { "name": "unwind", "version": "0.4.1", @@ -61430,7 +61596,7 @@ "deps": { "common": [ { - "id": "cc 1.0.79", + "id": "cc 1.0.83", "target": "cc" } ], @@ -61818,45 +61984,6 @@ }, "license": "MIT/Apache-2.0" }, - "webpki-roots 0.23.1": { - "name": "webpki-roots", - "version": "0.23.1", - "repository": { - "Http": { - "url": "https://crates.io/api/v1/crates/webpki-roots/0.23.1/download", - "sha256": "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" - } - }, - "targets": [ - { - "Library": { - "crate_name": "webpki_roots", - "crate_root": "src/lib.rs", - "srcs": [ - "**/*.rs" - ] - } - } - ], - "library_target_name": "webpki_roots", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "deps": { - "common": [ - { - "id": "rustls-webpki 0.100.2", - "target": "webpki" - } - ], - "selects": {} - }, - "edition": "2018", - "version": "0.23.1" - }, - "license": "MPL-2.0" - }, "webpki-roots 0.25.2": { "name": "webpki-roots", "version": "0.25.2", @@ -64971,7 +65098,7 @@ "deps": { "common": [ { - "id": "cc 1.0.79", + "id": "cc 1.0.83", "target": "cc" }, { @@ -65042,6 +65169,13 @@ "s390x-unknown-linux-gnu", "x86_64-linux-android" ], + "cfg(all(any(target_os = \"android\", target_os = \"linux\"), any(target_arch = \"aarch64\", target_arch = \"arm\")))": [ + "aarch64-linux-android", + "aarch64-unknown-linux-gnu", + "arm-unknown-linux-gnueabi", + "armv7-linux-androideabi", + "armv7-unknown-linux-gnueabi" + ], "cfg(all(not(rustix_use_libc), not(miri), target_os = \"linux\", any(target_arch = \"x86\", all(target_arch = \"x86_64\", target_pointer_width = \"64\"), all(target_endian = \"little\", any(target_arch = \"arm\", all(target_arch = \"aarch64\", target_pointer_width = \"64\"), target_arch = \"powerpc64\", target_arch = \"riscv64\", target_arch = \"mips\", target_arch = \"mips64\")))))": [ "aarch64-unknown-linux-gnu", "arm-unknown-linux-gnueabi", @@ -65121,6 +65255,9 @@ "cfg(all(target_arch = \"aarch64\", target_os = \"linux\"))": [ "aarch64-unknown-linux-gnu" ], + "cfg(all(target_arch = \"aarch64\", target_os = \"windows\"))": [ + "aarch64-pc-windows-msvc" + ], "cfg(all(target_arch = \"aarch64\", target_vendor = \"apple\"))": [ "aarch64-apple-darwin", "aarch64-apple-ios", @@ -65224,6 +65361,33 @@ "x86_64-unknown-freebsd", "x86_64-unknown-none" ], + "cfg(any(target_arch = \"aarch64\", target_arch = \"arm\", target_arch = \"x86\", target_arch = \"x86_64\"))": [ + "aarch64-apple-darwin", + "aarch64-apple-ios", + "aarch64-apple-ios-sim", + "aarch64-fuchsia", + "aarch64-linux-android", + "aarch64-pc-windows-msvc", + "aarch64-unknown-linux-gnu", + "arm-unknown-linux-gnueabi", + "armv7-linux-androideabi", + "armv7-unknown-linux-gnueabi", + "i686-apple-darwin", + "i686-linux-android", + "i686-pc-windows-msvc", + "i686-unknown-freebsd", + "i686-unknown-linux-gnu", + "thumbv7em-none-eabi", + "thumbv8m.main-none-eabi", + "x86_64-apple-darwin", + "x86_64-apple-ios", + "x86_64-fuchsia", + "x86_64-linux-android", + "x86_64-pc-windows-msvc", + "x86_64-unknown-freebsd", + "x86_64-unknown-linux-gnu", + "x86_64-unknown-none" + ], "cfg(any(target_arch = \"aarch64\", target_arch = \"x86\", target_arch = \"x86_64\"))": [ "aarch64-apple-darwin", "aarch64-apple-ios", diff --git a/Cargo.Bazel.toml.lock b/Cargo.Bazel.toml.lock index 69aa65f970c..e433e1d1ded 100644 --- a/Cargo.Bazel.toml.lock +++ b/Cargo.Bazel.toml.lock @@ -1826,11 +1826,12 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", + "libc", ] [[package]] @@ -3173,7 +3174,7 @@ dependencies = [ "regex", "reqwest", "rgb", - "ring", + "ring 0.16.20", "ripemd", "rlp", "rocksdb", @@ -4779,9 +4780,9 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", "http 0.2.9", @@ -4791,7 +4792,7 @@ dependencies = [ "rustls-native-certs", "tokio", "tokio-rustls", - "webpki-roots 0.23.1", + "webpki-roots", ] [[package]] @@ -4906,8 +4907,8 @@ dependencies = [ "rand 0.8.5", "rangemap", "reqwest", - "ring", - "rustls-webpki 0.101.4", + "ring 0.16.20", + "rustls-webpki", "sec1", "serde", "serde_bytes", @@ -5479,7 +5480,7 @@ dependencies = [ "base64 0.21.6", "hyper 0.14.27", "hyper-rustls", - "ring", + "ring 0.16.20", "serde", "serde_json", "thiserror", @@ -8369,7 +8370,7 @@ checksum = "2c78e758510582acc40acb90458401172d41f1016f8c9dde89e49677afb7eec1" dependencies = [ "bytes", "rand 0.8.5", - "ring", + "ring 0.16.20", "rustc-hash", "rustls", "rustls-native-certs", @@ -8685,7 +8686,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4954fbc00dcd4d8282c987710e50ba513d351400dbdd00e803a05172a90d8976" dependencies = [ "pem 2.0.1", - "ring", + "ring 0.16.20", "time", "yasna", "zeroize", @@ -8854,7 +8855,7 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots 0.25.2", + "webpki-roots", "winreg", ] @@ -8903,11 +8904,25 @@ dependencies = [ "libc", "once_cell", "spin 0.5.2", - "untrusted", + "untrusted 0.7.1", "web-sys", "winapi 0.3.9", ] +[[package]] +name = "ring" +version = "0.17.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" +dependencies = [ + "cc", + "getrandom 0.2.10", + "libc", + "spin 0.9.8", + "untrusted 0.9.0", + "windows-sys 0.48.0", +] + [[package]] name = "ripemd" version = "0.1.3" @@ -9173,13 +9188,13 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.7" +version = "0.21.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" +checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ "log", - "ring", - "rustls-webpki 0.101.4", + "ring 0.17.7", + "rustls-webpki", "sct", ] @@ -9222,22 +9237,12 @@ checksum = "9e9d979b3ce68192e42760c7810125eb6cf2ea10efae545a156063e61f314e2a" [[package]] name = "rustls-webpki" -version = "0.100.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e98ff011474fa39949b7e5c0428f9b4937eda7da7848bbb947786b7be0b27dab" -dependencies = [ - "ring", - "untrusted", -] - -[[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", - "untrusted", + "ring 0.17.7", + "untrusted 0.9.0", ] [[package]] @@ -9372,8 +9377,8 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] @@ -11375,6 +11380,12 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + [[package]] name = "unwind" version = "0.4.1" @@ -12056,15 +12067,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webpki-roots" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" -dependencies = [ - "rustls-webpki 0.100.2", -] - [[package]] name = "webpki-roots" version = "0.25.2" diff --git a/Cargo.lock b/Cargo.lock index 7fce6ec209c..9aa00f74459 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4972,7 +4972,7 @@ dependencies = [ "rand 0.8.5", "rangemap", "reqwest", - "ring", + "ring 0.16.20", "rustls-webpki", "sec1", "serde", @@ -7871,7 +7871,7 @@ dependencies = [ "proptest", "rand 0.8.5", "reqwest", - "ring", + "ring 0.16.20", "rosetta-core", "rusqlite", "serde", @@ -7988,7 +7988,7 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "rand_core 0.6.4", - "ring", + "ring 0.16.20", "serde", "serde_bytes", ] @@ -8019,7 +8019,7 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "rand_core 0.6.4", - "ring", + "ring 0.16.20", "serde", "serde_bytes", ] @@ -8176,7 +8176,7 @@ dependencies = [ "proptest", "rand 0.8.5", "rand_chacha 0.3.1", - "ring", + "ring 0.16.20", "rosetta-core", "serde_bytes", ] @@ -12366,7 +12366,7 @@ dependencies = [ "base64 0.21.5", "hyper 0.14.26", "hyper-rustls", - "ring", + "ring 0.16.20", "serde", "serde_json", "thiserror", @@ -15356,7 +15356,7 @@ checksum = "2c78e758510582acc40acb90458401172d41f1016f8c9dde89e49677afb7eec1" dependencies = [ "bytes", "rand 0.8.5", - "ring", + "ring 0.16.20", "rustc-hash", "rustls", "rustls-native-certs", @@ -15661,7 +15661,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4954fbc00dcd4d8282c987710e50ba513d351400dbdd00e803a05172a90d8976" dependencies = [ "pem 2.0.1", - "ring", + "ring 0.16.20", "time", "yasna", "zeroize", @@ -15952,11 +15952,25 @@ dependencies = [ "libc", "once_cell", "spin 0.5.2", - "untrusted", + "untrusted 0.7.1", "web-sys", "winapi", ] +[[package]] +name = "ring" +version = "0.17.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9babe80d5c16becf6594aa32ad2be8fe08498e7ae60b77de8df700e67f191d7e" +dependencies = [ + "cc", + "getrandom 0.2.8", + "libc", + "spin 0.9.8", + "untrusted 0.9.0", + "windows-sys 0.48.0", +] + [[package]] name = "ripemd" version = "0.1.3" @@ -16266,12 +16280,12 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.7" +version = "0.21.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" +checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ "log", - "ring", + "ring 0.17.3", "rustls-webpki", "sct", ] @@ -16315,12 +16329,12 @@ checksum = "9e9d979b3ce68192e42760c7810125eb6cf2ea10efae545a156063e61f314e2a" [[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", - "untrusted", + "ring 0.17.3", + "untrusted 0.9.0", ] [[package]] @@ -16461,8 +16475,8 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] @@ -17888,7 +17902,7 @@ dependencies = [ "regex", "registry-canister", "reqwest", - "ring", + "ring 0.16.20", "rosetta-core", "rsa", "rust_decimal", @@ -18120,9 +18134,9 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0d409377ff5b1e3ca6437aa86c1eb7d40c134bfec254e44c830defa92669db5" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ "rustls", "tokio", @@ -18805,6 +18819,12 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + [[package]] name = "unwind" version = "0.4.1" @@ -19861,7 +19881,7 @@ dependencies = [ "lazy_static", "nom", "oid-registry", - "ring", + "ring 0.16.20", "rusticata-macros", "thiserror", "time", diff --git a/Cargo.toml b/Cargo.toml index 623375d7059..c7cdfc6495c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -442,6 +442,7 @@ crossbeam-channel = "0.5.11" ethnum = { version = "1.3.2", features = ["serde"] } flate2 = "1.0.28" futures = "0.3.28" +hyper-rustls = { version = "0.24.2", features = ["http2"] } hyper-socks2 = { version = "0.8.0", default_features = false, features = [ "rustls", ] } @@ -493,6 +494,7 @@ reqwest = { version = "0.11.22", default-features = false, features = [ "rustls-tls-webpki-roots", "stream", ] } +rustls = { version = "0.21.10", features = ["dangerous_configuration"] } serde = { version = "1.0", features = ["derive"] } serde_bytes = "0.11" serde_cbor = "0.11.2" @@ -513,12 +515,17 @@ strum_macros = "0.25.3" syn = { version = "1.0.109", features = ["fold", "full"] } time = { version = "0.3.20", features = ["formatting"] } tokio = { version = "1.36.0", features = ["full"] } +tokio-rustls = { version = "0.24.1", features = ["dangerous_configuration"] } tokio-util = { version = "0.7.10", features = ["full"] } tonic = "0.11.0" tonic-build = "0.11.0" tower = { version = "0.4.13", features = ["full"] } tracing = "0.1.40" tracing-appender = "0.2.3" -tracing-subscriber = { version = "0.3.18", features = [ "env-filter", "fmt", "json"] } +tracing-subscriber = { version = "0.3.18", features = [ + "env-filter", + "fmt", + "json", +] } turmoil = "0.6.0" x509-cert = { version = "0.2.4", features = ["builder", "hazmat"] } diff --git a/bazel/external_crates.bzl b/bazel/external_crates.bzl index f434ea9d216..fa7fc108b5f 100644 --- a/bazel/external_crates.bzl +++ b/bazel/external_crates.bzl @@ -512,7 +512,7 @@ def external_crates_repository(name, cargo_lockfile, lockfile, sanitizers_enable ], ), "hyper-rustls": crate.spec( - version = "^0.24.0", + version = "^0.24.2", features = [ "http2", ], @@ -1009,7 +1009,7 @@ def external_crates_repository(name, cargo_lockfile, lockfile, sanitizers_enable version = "^1.1.0", ), "rustls": crate.spec( - version = "^0.21.0", + version = "^0.21.10", features = [ "dangerous_configuration", ], @@ -1219,7 +1219,7 @@ def external_crates_repository(name, cargo_lockfile, lockfile, sanitizers_enable version = "^0.3.0", ), "tokio-rustls": crate.spec( - version = "^0.24.0", + version = "^0.24.1", features = [ "dangerous_configuration", ], diff --git a/rs/boundary_node/certificate_issuance/certificate_syncer/Cargo.toml b/rs/boundary_node/certificate_issuance/certificate_syncer/Cargo.toml index a66d382a8f3..993784b47c7 100644 --- a/rs/boundary_node/certificate_issuance/certificate_syncer/Cargo.toml +++ b/rs/boundary_node/certificate_issuance/certificate_syncer/Cargo.toml @@ -14,7 +14,7 @@ candid = { workspace = true } clap = { version = "4.0.29", features = ["derive"] } futures = { workspace = true } hyper = { version = "0.14.23", features = ["full"] } -hyper-rustls = "0.24.0" +hyper-rustls = { workspace = true } mockall = "0.11.3" nix = { workspace = true } opentelemetry = { version = "0.20", features = ["metrics"] } diff --git a/rs/boundary_node/ic_boundary/Cargo.toml b/rs/boundary_node/ic_boundary/Cargo.toml index 89998b9dc22..6333fafd348 100644 --- a/rs/boundary_node/ic_boundary/Cargo.toml +++ b/rs/boundary_node/ic_boundary/Cargo.toml @@ -34,7 +34,7 @@ http = "0.2.6" http-body = "0.4" hyper = "0.14.18" hyperlocal = "0.8.0" -hyper-rustls = "0.24.0" +hyper-rustls = { workspace = true } ic-base-types = { path = "../../types/base_types" } ic-btc-interface = { workspace = true } ic-certification-test-utils = { path = "../../certification/test-utils" } @@ -73,7 +73,7 @@ rand = "0.8.4" rcgen = { workspace = true } regex = "1.3.9" reqwest = { workspace = true } -rustls = { version = "^0.21.0", features = ["dangerous_configuration"] } +rustls = { workspace = true } serde = { workspace = true } serde_bytes = { workspace = true } serde_cbor = { workspace = true } @@ -83,7 +83,7 @@ strum = "0.25.0" tempfile = "3.6.0" thiserror = "1.0.40" tokio = { workspace = true } -tokio-rustls = { version = "0.24.0", features = ["dangerous_configuration"] } +tokio-rustls = { workspace = true } tower = { workspace = true } tower_governor = "0.1" tower-http = { version = "0.4.4", features = [ diff --git a/rs/boundary_node/icx_proxy/Cargo.toml b/rs/boundary_node/icx_proxy/Cargo.toml index 06fb16bce54..0e2f444ee3f 100644 --- a/rs/boundary_node/icx_proxy/Cargo.toml +++ b/rs/boundary_node/icx_proxy/Cargo.toml @@ -28,7 +28,7 @@ futures = { workspace = true } http = "0.2.6" http-body = "0.4" hyper = { version = "0.14.26", features = ["client", "http2", "http1"] } -hyper-rustls = { version = "0.24.0", features = ["http2"] } +hyper-rustls = { workspace = true } hyperlocal = "0.8.0" itertools = { workspace = true } ic-agent = { workspace = true } @@ -37,7 +37,7 @@ jemallocator = "0.3" opentelemetry = { version = "0.20", features = ["metrics"] } opentelemetry-prometheus = "0.13.0" prometheus = { workspace = true } -rustls = { version = "0.21", features = ["dangerous_configuration"] } +rustls = { workspace = true } rustls-native-certs = "0.6.2" rustls-pemfile = "1" tokio-util = { workspace = true } diff --git a/rs/canister_client/Cargo.toml b/rs/canister_client/Cargo.toml index 6b1426e69db..e5ac4063023 100644 --- a/rs/canister_client/Cargo.toml +++ b/rs/canister_client/Cargo.toml @@ -18,10 +18,10 @@ ic-management-canister-types = { path = "../types/management_canister_types" } ic-types = { path = "../types/types" } futures-util = "0.3.21" hyper = { version = "0.14.18", features = ["client", "tcp", "http1", "http2"] } -hyper-rustls = { version = "0.24.0", features = ["http2"] } +hyper-rustls = { workspace = true } itertools = { workspace = true } prost = { workspace = true } -rustls = { version = "^0.21.0", features = ["dangerous_configuration"] } +rustls = { workspace = true } serde = { workspace = true } serde_cbor = { workspace = true } tokio = { workspace = true } diff --git a/rs/crypto/Cargo.toml b/rs/crypto/Cargo.toml index 665abd683f9..52ff032a2ac 100644 --- a/rs/crypto/Cargo.toml +++ b/rs/crypto/Cargo.toml @@ -51,7 +51,7 @@ tempfile = "3.1.0" tokio = { workspace = true } # We use the `dangerous_configuration` flag for rustls to be able to set custom `ClientCertVerifier` and # `ServerCertVerifier` in order to verify node certificates. -tokio-rustls = { version = "0.24.0", features = ["dangerous_configuration"] } +tokio-rustls = { workspace = true } [dev-dependencies] assert_matches = "1.5.0" diff --git a/rs/crypto/temp_crypto/Cargo.toml b/rs/crypto/temp_crypto/Cargo.toml index a39f04b6b31..57ec918512b 100644 --- a/rs/crypto/temp_crypto/Cargo.toml +++ b/rs/crypto/temp_crypto/Cargo.toml @@ -30,7 +30,7 @@ ic-types = { path = "../../types/types" } rand = "0.8" tempfile = "3.1.0" tokio = { workspace = true } -tokio-rustls = "0.24.0" +tokio-rustls = { workspace = true } [dev-dependencies] assert_matches = "1.5.0" diff --git a/rs/crypto/test_utils/tls/Cargo.toml b/rs/crypto/test_utils/tls/Cargo.toml index f8d79cc9c84..37a1ff80990 100644 --- a/rs/crypto/test_utils/tls/Cargo.toml +++ b/rs/crypto/test_utils/tls/Cargo.toml @@ -23,5 +23,5 @@ rand = "0.8" signature = { workspace = true } time = "0.3.20" tokio = { workspace = true } -tokio-rustls = { version = "0.24.0", features = ["dangerous_configuration"] } +tokio-rustls = { workspace = true } x509-cert = { workspace = true } diff --git a/rs/crypto/tls_interfaces/Cargo.toml b/rs/crypto/tls_interfaces/Cargo.toml index 8660f934784..df633235b69 100644 --- a/rs/crypto/tls_interfaces/Cargo.toml +++ b/rs/crypto/tls_interfaces/Cargo.toml @@ -13,7 +13,7 @@ ic-protobuf = { path = "../../protobuf" } serde = { workspace = true } thiserror = "1.0.56" tokio = { workspace = true } -tokio-rustls = "0.24.0" +tokio-rustls = { workspace = true } x509-parser = "0.15.1" [dev-dependencies] diff --git a/rs/crypto/utils/tls/Cargo.toml b/rs/crypto/utils/tls/Cargo.toml index e28bbb9ca80..6812e1f704a 100644 --- a/rs/crypto/utils/tls/Cargo.toml +++ b/rs/crypto/utils/tls/Cargo.toml @@ -9,5 +9,5 @@ documentation.workspace = true [dependencies] ic-base-types = { path = "../../../types/base_types" } ic-crypto-tls-interfaces = { path = "../../tls_interfaces" } -tokio-rustls = "0.24.0" +tokio-rustls = { workspace = true } x509-parser = { version = "0.15.1" } diff --git a/rs/https_outcalls/adapter/Cargo.toml b/rs/https_outcalls/adapter/Cargo.toml index dfe83f92b39..2414cedf23f 100644 --- a/rs/https_outcalls/adapter/Cargo.toml +++ b/rs/https_outcalls/adapter/Cargo.toml @@ -12,7 +12,7 @@ futures = { workspace = true } http = "0.2" hyper = { version = "0.14.18", features = ["full"] } hyper-socks2 = { workspace = true } -hyper-rustls = "0.24.0" +hyper-rustls = { workspace = true } ic-adapter-metrics-server = { path = "../../monitoring/adapter_metrics_server" } ic-async-utils = { path = "../../async_utils" } ic-config = { path = "../../config" } diff --git a/rs/p2p/quic_transport/Cargo.toml b/rs/p2p/quic_transport/Cargo.toml index 9b4da0ea568..146f384e3ac 100644 --- a/rs/p2p/quic_transport/Cargo.toml +++ b/rs/p2p/quic_transport/Cargo.toml @@ -31,7 +31,7 @@ socket2 = { version = "0.5", features = ["all"] } thiserror = "1.0.50" tokio = { workspace = true } tokio-metrics = "0.3.0" -tokio-rustls = "0.24.0" +tokio-rustls = { workspace = true } tokio-util = { workspace = true } tower = { workspace = true } diff --git a/rs/rosetta-api/Cargo.toml b/rs/rosetta-api/Cargo.toml index f3a9b69ad94..f22eecf56ce 100644 --- a/rs/rosetta-api/Cargo.toml +++ b/rs/rosetta-api/Cargo.toml @@ -53,7 +53,7 @@ strum_macros = { workspace = true } tokio = { workspace = true } url = "2.2.1" ecdsa-secp256k1 = { path = "../crypto/internal/crypto_lib/basic_sig/ecdsa_secp256k1", package = "ic-crypto-internal-basic-sig-ecdsa-secp256k1" } -rustls = "0.21.1" +rustls = { workspace = true } rustls-pemfile = "1.0.3" rolling-file = "0.2.0" rosetta-core = {path ="rosetta_core"} diff --git a/rs/test_utilities/Cargo.toml b/rs/test_utilities/Cargo.toml index 0c2929270b3..3e1e1d86fab 100644 --- a/rs/test_utilities/Cargo.toml +++ b/rs/test_utilities/Cargo.toml @@ -68,7 +68,7 @@ slog = { workspace = true } socket2 = { version = "0.5", features = ["all"] } tempfile = "3.1.0" tokio = { workspace = true } -tokio-rustls = "0.24.0" +tokio-rustls = { workspace = true } wat = "1.0.52" tower = { workspace = true } diff --git a/rs/tests/Cargo.toml b/rs/tests/Cargo.toml index 78d2844d987..cd0a60aec87 100644 --- a/rs/tests/Cargo.toml +++ b/rs/tests/Cargo.toml @@ -120,7 +120,7 @@ k256 = { workspace = true } k8s-openapi = { version = "0.20.0", features = ["v1_22"] } kube = { version = "0.87.2", features = ["runtime", "derive", "ws"] } hyper = "0.14.18" -hyper-rustls = "0.24.0" +hyper-rustls = { workspace = true } http = "0.2.9" lazy_static = "1.4.0" icp-ledger = { path = "../rosetta-api/icp_ledger" } @@ -148,7 +148,7 @@ registry-canister = { path = "../registry/canister" } reqwest = { workspace = true } ring = { version = "0.16.11", features = ["std"] } rsa = { version = "0.9.2", features = ["sha2"] } -rustls = "0.21.0" +rustls = { workspace = true } rust_decimal = "1.25" serde = { workspace = true } serde_bytes = { workspace = true } diff --git a/rs/tests/httpbin-rs/Cargo.toml b/rs/tests/httpbin-rs/Cargo.toml index a3684ced5f3..09104189f78 100644 --- a/rs/tests/httpbin-rs/Cargo.toml +++ b/rs/tests/httpbin-rs/Cargo.toml @@ -12,7 +12,7 @@ documentation.workspace = true axum = "^0.7.0" axum-server = { version = "^0.6.0", features = ["tls-rustls"] } clap = { version = "4.0", features = ["derive"] } -rustls = "0.21.1" +rustls = { workspace = true } rustls-pemfile = "1.0.2" serde_json = { workspace = true } tokio = { workspace = true }