diff --git a/Cargo.lock b/Cargo.lock index f4fd13cfccd..1bee385a062 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -765,9 +765,12 @@ dependencies = [ [[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 = [ + "libc", +] [[package]] name = "ccm" @@ -2638,7 +2641,7 @@ dependencies = [ "quick-protobuf", "quickcheck-ext", "rand 0.8.5", - "ring", + "ring 0.17.5", "rmp-serde", "sec1", "serde", @@ -2918,7 +2921,7 @@ dependencies = [ "quickcheck", "quinn", "rand 0.8.5", - "ring", + "ring 0.17.5", "rustls 0.21.7", "socket2 0.5.5", "thiserror", @@ -3123,7 +3126,7 @@ dependencies = [ "libp2p-swarm", "libp2p-yamux", "rcgen", - "ring", + "ring 0.17.5", "rustls 0.21.7", "rustls-webpki", "thiserror", @@ -4254,7 +4257,7 @@ checksum = "2c78e758510582acc40acb90458401172d41f1016f8c9dde89e49677afb7eec1" dependencies = [ "bytes", "rand 0.8.5", - "ring", + "ring 0.16.20", "rustc-hash", "rustls 0.21.7", "slab", @@ -4385,7 +4388,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4954fbc00dcd4d8282c987710e50ba513d351400dbdd00e803a05172a90d8976" dependencies = [ "pem 2.0.1", - "ring", + "ring 0.16.20", "time", "x509-parser", "yasna", @@ -4575,12 +4578,26 @@ dependencies = [ "cc", "libc", "once_cell", - "spin", - "untrusted", + "spin 0.5.2", + "untrusted 0.7.1", "web-sys", "winapi", ] +[[package]] +name = "ring" +version = "0.17.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" +dependencies = [ + "cc", + "getrandom 0.2.10", + "libc", + "spin 0.9.8", + "untrusted 0.9.0", + "windows-sys", +] + [[package]] name = "ringbuf" version = "0.3.3" @@ -4752,7 +4769,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" dependencies = [ "log", - "ring", + "ring 0.16.20", "sct", "webpki", ] @@ -4764,7 +4781,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", - "ring", + "ring 0.16.20", "rustls-webpki", "sct", ] @@ -4796,8 +4813,8 @@ version = "0.101.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] @@ -4867,8 +4884,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]] @@ -5163,7 +5180,7 @@ dependencies = [ "chacha20poly1305", "curve25519-dalek", "rand_core 0.6.4", - "ring", + "ring 0.16.20", "rustc_version", "sha2 0.10.8", "subtle", @@ -5210,6 +5227,12 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + [[package]] name = "spki" version = "0.7.2" @@ -5252,7 +5275,7 @@ dependencies = [ "lazy_static", "md-5", "rand 0.8.5", - "ring", + "ring 0.16.20", "subtle", "thiserror", "tokio", @@ -5775,7 +5798,7 @@ dependencies = [ "log", "md-5", "rand 0.8.5", - "ring", + "ring 0.16.20", "stun", "thiserror", "tokio", @@ -5878,6 +5901,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 = "upnp-example" version = "0.1.0" @@ -6125,8 +6154,8 @@ version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07ecc0cd7cac091bf682ec5efa18b1cff79d617b84181f38b3951dbe135f607f" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] @@ -6153,7 +6182,7 @@ dependencies = [ "rand 0.8.5", "rcgen", "regex", - "ring", + "ring 0.16.20", "rtcp", "rtp", "rustls 0.21.7", @@ -6216,7 +6245,7 @@ dependencies = [ "rand 0.8.5", "rand_core 0.6.4", "rcgen", - "ring", + "ring 0.16.20", "rustls 0.21.7", "sec1", "serde", @@ -6515,7 +6544,7 @@ dependencies = [ "lazy_static", "nom", "oid-registry", - "ring", + "ring 0.16.20", "rusticata-macros", "thiserror", "time", diff --git a/identity/Cargo.toml b/identity/Cargo.toml index 0b9db73983d..7e5752e77b2 100644 --- a/identity/Cargo.toml +++ b/identity/Cargo.toml @@ -30,7 +30,7 @@ void = { version = "1.0", optional = true } zeroize = { version = "1.6", optional = true } [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -ring = { version = "0.16.9", features = [ "alloc", "std"], default-features = false, optional = true } +ring = { version = "0.17.5", features = [ "alloc", "std"], default-features = false, optional = true } [features] secp256k1 = ["dep:libsecp256k1", "dep:asn1_der", "dep:sha2", "dep:hkdf", "dep:zeroize"] diff --git a/transports/quic/Cargo.toml b/transports/quic/Cargo.toml index 254abf7bb81..17e754bec25 100644 --- a/transports/quic/Cargo.toml +++ b/transports/quic/Cargo.toml @@ -25,7 +25,7 @@ rustls = { version = "0.21.7", default-features = false } thiserror = "1.0.50" tokio = { version = "1.33.0", default-features = false, features = ["net", "rt", "time"], optional = true } socket2 = "0.5.5" -ring = "0.16.20" +ring = "0.17.5" [features] tokio = ["dep:tokio", "if-watch/tokio", "quinn/runtime-tokio"] diff --git a/transports/tls/Cargo.toml b/transports/tls/Cargo.toml index 489f12d8ac3..54aa97abb65 100644 --- a/transports/tls/Cargo.toml +++ b/transports/tls/Cargo.toml @@ -14,7 +14,7 @@ futures-rustls = "0.24.0" libp2p-core = { workspace = true } libp2p-identity = { workspace = true } rcgen = "0.11.0" -ring = "0.16.20" +ring = "0.17.5" thiserror = "1.0.50" webpki = { version = "0.101.4", package = "rustls-webpki", features = ["std"] } x509-parser = "0.15.1"