From cee8a766807f600a30c630b7204353428f40aa00 Mon Sep 17 00:00:00 2001 From: Pavlos Rontidis Date: Fri, 17 Jan 2025 14:07:27 -0500 Subject: [PATCH 1/3] dd-rust-license-tool write --- Cargo.lock | 92 ++++++++++++++++++++++++++------------------ Cargo.toml | 2 +- LICENSE-3rdparty.csv | 1 + 3 files changed, 57 insertions(+), 38 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 928a53086d011..ea2dbdbb62332 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -622,25 +622,24 @@ dependencies = [ [[package]] name = "async-nats" -version = "0.33.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbc1f1a75fd07f0f517322d103211f12d757658e91676def9a2e688774656c60" +checksum = "76433c4de73442daedb3a59e991d94e85c14ebfc33db53dfcd347a21cd6ef4f8" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "bytes 1.9.0", "futures 0.3.31", - "http 0.2.9", "memchr", - "nkeys 0.3.2", + "nkeys", "nuid", "once_cell", + "pin-project", + "portable-atomic", "rand 0.8.5", "regex", - "ring", - "rustls 0.21.11", - "rustls-native-certs 0.6.3", - "rustls-pemfile 1.0.4", - "rustls-webpki 0.101.7", + "rustls-native-certs 0.7.0", + "rustls-pemfile 2.1.0", + "rustls-webpki 0.102.8", "serde", "serde_json", "serde_nanos", @@ -648,9 +647,10 @@ dependencies = [ "thiserror 1.0.68", "time", "tokio", - "tokio-retry", - "tokio-rustls 0.24.1", + "tokio-rustls 0.26.1", + "tokio-util", "tracing 0.1.41", + "tryhard", "url", ] @@ -4523,7 +4523,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.10", + "socket2 0.5.8", "tokio", "tower-service", "tracing 0.1.41", @@ -6180,22 +6180,6 @@ dependencies = [ "libc", ] -[[package]] -name = "nkeys" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aad178aad32087b19042ee36dfd450b73f5f934fbfb058b59b198684dfec4c47" -dependencies = [ - "byteorder", - "data-encoding", - "ed25519", - "ed25519-dalek", - "getrandom 0.2.15", - "log", - "rand 0.8.5", - "signatory", -] - [[package]] name = "nkeys" version = "0.4.4" @@ -7568,7 +7552,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9552f850d5f0964a4e4d0bf306459ac29323ddfbae05e35a7c0d35cb0803cc5" dependencies = [ "anyhow", - "itertools 0.11.0", + "itertools 0.13.0", "proc-macro2 1.0.93", "quote 1.0.38", "syn 2.0.96", @@ -8400,7 +8384,7 @@ dependencies = [ "log", "rustls-native-certs 0.7.0", "rustls-pemfile 2.1.0", - "rustls-webpki 0.102.2", + "rustls-webpki 0.102.8", "thiserror 1.0.68", "tokio", "tokio-rustls 0.25.0", @@ -8510,7 +8494,20 @@ dependencies = [ "log", "ring", "rustls-pki-types", - "rustls-webpki 0.102.2", + "rustls-webpki 0.102.8", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls" +version = "0.23.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f287924602bf649d949c63dc8ac8b235fa5387d394020705b80c4eb597ce5b8" +dependencies = [ + "once_cell", + "rustls-pki-types", + "rustls-webpki 0.102.8", "subtle", "zeroize", ] @@ -8561,9 +8558,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.3.1" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ede67b28608b4c60685c7d54122d4400d90f62b40caee7700e700380a390fa8" +checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37" [[package]] name = "rustls-webpki" @@ -8577,9 +8574,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.102.2" +version = "0.102.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" dependencies = [ "ring", "rustls-pki-types", @@ -9963,6 +9960,16 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-rustls" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37" +dependencies = [ + "rustls 0.23.21", + "tokio", +] + [[package]] name = "tokio-stream" version = "0.1.17" @@ -10485,6 +10492,17 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +[[package]] +name = "tryhard" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c9f0a709784e86923586cff0d872dba54cd2d2e116b3bc57587d15737cfce9d" +dependencies = [ + "futures 0.3.31", + "pin-project-lite", + "tokio", +] + [[package]] name = "tungstenite" version = "0.20.1" @@ -10947,7 +10965,7 @@ dependencies = [ "netlink-packet-utils", "netlink-sys", "nix 0.26.2", - "nkeys 0.4.4", + "nkeys", "nom", "notify", "num-format", diff --git a/Cargo.toml b/Cargo.toml index faf8f8eba5048..092b402317580 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -339,7 +339,7 @@ lru = { version = "0.12.5", default-features = false, optional = true } maxminddb = { version = "0.24.0", default-features = false, optional = true } md-5 = { version = "0.10", default-features = false, optional = true } mongodb = { version = "2.8.2", default-features = false, features = ["tokio-runtime"], optional = true } -async-nats = { version = "0.33.0", default-features = false, optional = true } +async-nats = { version = "0.38.0", default-features = false, optional = true } nkeys = { version = "0.4.4", default-features = false, optional = true } nom = { version = "7.1.3", default-features = false, optional = true } notify = { version = "7.0.0", default-features = false, features = ["macos_fsevent"] } diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv index 5527be948160c..8a69e2e3375e1 100644 --- a/LICENSE-3rdparty.csv +++ b/LICENSE-3rdparty.csv @@ -653,6 +653,7 @@ triomphe,https://github.com/Manishearth/triomphe,MIT OR Apache-2.0,"Manish Goreg trust-dns-proto,https://github.com/bluejekyll/trust-dns,MIT OR Apache-2.0,Benjamin Fry trust-dns-resolver,https://github.com/bluejekyll/trust-dns,MIT OR Apache-2.0,Benjamin Fry try-lock,https://github.com/seanmonstar/try-lock,MIT,Sean McArthur +tryhard,https://github.com/EmbarkStudios/tryhard,MIT OR Apache-2.0,Embark tungstenite,https://github.com/snapview/tungstenite-rs,MIT OR Apache-2.0,"Alexey Galakhov, Daniel Abramov" twox-hash,https://github.com/shepmaster/twox-hash,MIT,Jake Goulding typed-builder,https://github.com/idanarye/rust-typed-builder,MIT OR Apache-2.0,"IdanArye , Chris Morgan " From 279f0f6c2a432f956f0924412541a9dbbeae324b Mon Sep 17 00:00:00 2001 From: Pavlos Rontidis Date: Fri, 17 Jan 2025 14:08:36 -0500 Subject: [PATCH 2/3] add ring feature --- Cargo.lock | 37 +++++++++++++++++++++++++++++++++++++ Cargo.toml | 2 +- 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index ea2dbdbb62332..4d4e3ad1372dd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -637,6 +637,7 @@ dependencies = [ "portable-atomic", "rand 0.8.5", "regex", + "ring", "rustls-native-certs 0.7.0", "rustls-pemfile 2.1.0", "rustls-webpki 0.102.8", @@ -649,6 +650,7 @@ dependencies = [ "tokio", "tokio-rustls 0.26.1", "tokio-util", + "tokio-websockets", "tracing 0.1.41", "tryhard", "url", @@ -8506,6 +8508,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f287924602bf649d949c63dc8ac8b235fa5387d394020705b80c4eb597ce5b8" dependencies = [ "once_cell", + "ring", "rustls-pki-types", "rustls-webpki 0.102.8", "subtle", @@ -8537,6 +8540,19 @@ dependencies = [ "security-framework", ] +[[package]] +name = "rustls-native-certs" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a" +dependencies = [ + "openssl-probe", + "rustls-pemfile 2.1.0", + "rustls-pki-types", + "schannel", + "security-framework", +] + [[package]] name = "rustls-pemfile" version = "1.0.4" @@ -10034,6 +10050,27 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-websockets" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f591660438b3038dd04d16c938271c79e7e06260ad2ea2885a4861bfb238605d" +dependencies = [ + "base64 0.22.1", + "bytes 1.9.0", + "futures-core", + "futures-sink", + "http 1.1.0", + "httparse", + "rand 0.8.5", + "ring", + "rustls-native-certs 0.8.0", + "rustls-pki-types", + "tokio", + "tokio-rustls 0.26.1", + "tokio-util", +] + [[package]] name = "toml" version = "0.8.19" diff --git a/Cargo.toml b/Cargo.toml index 092b402317580..a23e1566be5ac 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -339,7 +339,7 @@ lru = { version = "0.12.5", default-features = false, optional = true } maxminddb = { version = "0.24.0", default-features = false, optional = true } md-5 = { version = "0.10", default-features = false, optional = true } mongodb = { version = "2.8.2", default-features = false, features = ["tokio-runtime"], optional = true } -async-nats = { version = "0.38.0", default-features = false, optional = true } +async-nats = { version = "0.38.0", default-features = false, features = ["ring"], optional = true } nkeys = { version = "0.4.4", default-features = false, optional = true } nom = { version = "7.1.3", default-features = false, optional = true } notify = { version = "7.0.0", default-features = false, features = ["macos_fsevent"] } From e2ed98b66a58a5c2502f6dc871081b38c47fb84e Mon Sep 17 00:00:00 2001 From: Pavlos Rontidis Date: Fri, 17 Jan 2025 14:40:08 -0500 Subject: [PATCH 3/3] dd-rust-license-tool write --- LICENSE-3rdparty.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv index 8a69e2e3375e1..fdf4e295ec3ca 100644 --- a/LICENSE-3rdparty.csv +++ b/LICENSE-3rdparty.csv @@ -637,6 +637,7 @@ tokio-postgres,https://github.com/sfackler/rust-postgres,MIT OR Apache-2.0,Steve tokio-retry,https://github.com/srijs/rust-tokio-retry,MIT,Sam Rijs tokio-rustls,https://github.com/rustls/tokio-rustls,MIT OR Apache-2.0,The tokio-rustls Authors tokio-tungstenite,https://github.com/snapview/tokio-tungstenite,MIT,"Daniel Abramov , Alexey Galakhov " +tokio-websockets,https://github.com/Gelbpunkt/tokio-websockets,MIT,The tokio-websockets Authors toml,https://github.com/toml-rs/toml,MIT OR Apache-2.0,Alex Crichton toml_edit,https://github.com/toml-rs/toml,MIT OR Apache-2.0,"Andronik Ordian , Ed Page " tonic,https://github.com/hyperium/tonic,MIT,Lucio Franco