diff --git a/Cargo.lock b/Cargo.lock index cd29910d..ab4940cb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1299,7 +1299,7 @@ dependencies = [ "thiserror 2.0.18", "tls-listener", "tokio", - "tokio-rustls 0.25.0", + "tokio-rustls 0.26.4", "tokio-util", "tracing", "tracing-subscriber", @@ -1387,7 +1387,7 @@ dependencies = [ [[package]] name = "base_rt" version = "0.1.0" -source = "git+https://github.com/p-hoffmann/deno?branch=trex_fix#6815c4c17f7029f780674533f0d86d8b9bca1a0b" +source = "git+https://github.com/p-hoffmann/deno?branch=trex_fix#2dd0b19196379497fffebcd47e63ed1ffe1030b6" dependencies = [ "opentelemetry", ] @@ -2725,7 +2725,7 @@ dependencies = [ [[package]] name = "deno_config" version = "0.71.0" -source = "git+https://github.com/p-hoffmann/deno?branch=trex_fix#6815c4c17f7029f780674533f0d86d8b9bca1a0b" +source = "git+https://github.com/p-hoffmann/deno?branch=trex_fix#2dd0b19196379497fffebcd47e63ed1ffe1030b6" dependencies = [ "boxed_error", "capacity_builder", @@ -2751,7 +2751,7 @@ dependencies = [ [[package]] name = "deno_console" version = "0.221.0" -source = "git+https://github.com/p-hoffmann/deno?branch=trex_fix#6815c4c17f7029f780674533f0d86d8b9bca1a0b" +source = "git+https://github.com/p-hoffmann/deno?branch=trex_fix#2dd0b19196379497fffebcd47e63ed1ffe1030b6" dependencies = [ "deno_core", ] @@ -2843,7 +2843,7 @@ dependencies = [ [[package]] name = "deno_crypto_provider" version = "0.15.0" -source = "git+https://github.com/p-hoffmann/deno?branch=trex_fix#6815c4c17f7029f780674533f0d86d8b9bca1a0b" +source = "git+https://github.com/p-hoffmann/deno?branch=trex_fix#2dd0b19196379497fffebcd47e63ed1ffe1030b6" dependencies = [ "aws-lc-sys 0.26.0", ] @@ -2921,7 +2921,7 @@ dependencies = [ [[package]] name = "deno_features" version = "0.18.0" -source = "git+https://github.com/p-hoffmann/deno?branch=trex_fix#6815c4c17f7029f780674533f0d86d8b9bca1a0b" +source = "git+https://github.com/p-hoffmann/deno?branch=trex_fix#2dd0b19196379497fffebcd47e63ed1ffe1030b6" dependencies = [ "deno_core", "serde", @@ -2931,7 +2931,7 @@ dependencies = [ [[package]] name = "deno_fetch" version = "0.245.0" -source = "git+https://github.com/p-hoffmann/deno?branch=trex_fix#6815c4c17f7029f780674533f0d86d8b9bca1a0b" +source = "git+https://github.com/p-hoffmann/deno?branch=trex_fix#2dd0b19196379497fffebcd47e63ed1ffe1030b6" dependencies = [ "base64 0.22.1", "bytes", @@ -2970,7 +2970,7 @@ dependencies = [ [[package]] name = "deno_fs" version = "0.131.0" -source = "git+https://github.com/p-hoffmann/deno?branch=trex_fix#6815c4c17f7029f780674533f0d86d8b9bca1a0b" +source = "git+https://github.com/p-hoffmann/deno?branch=trex_fix#2dd0b19196379497fffebcd47e63ed1ffe1030b6" dependencies = [ "async-trait", "base32", @@ -3074,7 +3074,7 @@ dependencies = [ [[package]] name = "deno_io" version = "0.131.0" -source = "git+https://github.com/p-hoffmann/deno?branch=trex_fix#6815c4c17f7029f780674533f0d86d8b9bca1a0b" +source = "git+https://github.com/p-hoffmann/deno?branch=trex_fix#2dd0b19196379497fffebcd47e63ed1ffe1030b6" dependencies = [ "async-trait", "deno_core", @@ -3113,7 +3113,7 @@ dependencies = [ [[package]] name = "deno_maybe_sync" version = "0.8.0" -source = "git+https://github.com/p-hoffmann/deno?branch=trex_fix#6815c4c17f7029f780674533f0d86d8b9bca1a0b" +source = "git+https://github.com/p-hoffmann/deno?branch=trex_fix#2dd0b19196379497fffebcd47e63ed1ffe1030b6" dependencies = [ "dashmap", ] @@ -3146,7 +3146,7 @@ dependencies = [ [[package]] name = "deno_net" version = "0.213.0" -source = "git+https://github.com/p-hoffmann/deno?branch=trex_fix#6815c4c17f7029f780674533f0d86d8b9bca1a0b" +source = "git+https://github.com/p-hoffmann/deno?branch=trex_fix#2dd0b19196379497fffebcd47e63ed1ffe1030b6" dependencies = [ "deno_core", "deno_error", @@ -3197,7 +3197,7 @@ dependencies = [ [[package]] name = "deno_npm_cache" version = "0.40.0" -source = "git+https://github.com/p-hoffmann/deno?branch=trex_fix#6815c4c17f7029f780674533f0d86d8b9bca1a0b" +source = "git+https://github.com/p-hoffmann/deno?branch=trex_fix#2dd0b19196379497fffebcd47e63ed1ffe1030b6" dependencies = [ "async-trait", "base64 0.22.1", @@ -3227,7 +3227,7 @@ dependencies = [ [[package]] name = "deno_npm_installer" version = "0.16.0" -source = "git+https://github.com/p-hoffmann/deno?branch=trex_fix#6815c4c17f7029f780674533f0d86d8b9bca1a0b" +source = "git+https://github.com/p-hoffmann/deno?branch=trex_fix#2dd0b19196379497fffebcd47e63ed1ffe1030b6" dependencies = [ "anyhow", "async-once-cell", @@ -3284,7 +3284,7 @@ dependencies = [ [[package]] name = "deno_os" version = "0.38.0" -source = "git+https://github.com/p-hoffmann/deno?branch=trex_fix#6815c4c17f7029f780674533f0d86d8b9bca1a0b" +source = "git+https://github.com/p-hoffmann/deno?branch=trex_fix#2dd0b19196379497fffebcd47e63ed1ffe1030b6" dependencies = [ "deno_core", "deno_error", @@ -3304,7 +3304,7 @@ dependencies = [ [[package]] name = "deno_package_json" version = "0.23.0" -source = "git+https://github.com/p-hoffmann/deno?branch=trex_fix#6815c4c17f7029f780674533f0d86d8b9bca1a0b" +source = "git+https://github.com/p-hoffmann/deno?branch=trex_fix#2dd0b19196379497fffebcd47e63ed1ffe1030b6" dependencies = [ "boxed_error", "deno_error", @@ -3335,7 +3335,7 @@ dependencies = [ [[package]] name = "deno_permissions" version = "0.80.0" -source = "git+https://github.com/p-hoffmann/deno?branch=trex_fix#6815c4c17f7029f780674533f0d86d8b9bca1a0b" +source = "git+https://github.com/p-hoffmann/deno?branch=trex_fix#2dd0b19196379497fffebcd47e63ed1ffe1030b6" dependencies = [ "capacity_builder", "chrono", @@ -3364,7 +3364,7 @@ dependencies = [ [[package]] name = "deno_process" version = "0.36.0" -source = "git+https://github.com/p-hoffmann/deno?branch=trex_fix#6815c4c17f7029f780674533f0d86d8b9bca1a0b" +source = "git+https://github.com/p-hoffmann/deno?branch=trex_fix#2dd0b19196379497fffebcd47e63ed1ffe1030b6" dependencies = [ "deno_core", "deno_error", @@ -3394,7 +3394,7 @@ dependencies = [ [[package]] name = "deno_resolver" version = "0.52.0" -source = "git+https://github.com/p-hoffmann/deno?branch=trex_fix#6815c4c17f7029f780674533f0d86d8b9bca1a0b" +source = "git+https://github.com/p-hoffmann/deno?branch=trex_fix#2dd0b19196379497fffebcd47e63ed1ffe1030b6" dependencies = [ "anyhow", "async-once-cell", @@ -3457,7 +3457,7 @@ dependencies = [ [[package]] name = "deno_signals" version = "0.12.0" -source = "git+https://github.com/p-hoffmann/deno?branch=trex_fix#6815c4c17f7029f780674533f0d86d8b9bca1a0b" +source = "git+https://github.com/p-hoffmann/deno?branch=trex_fix#2dd0b19196379497fffebcd47e63ed1ffe1030b6" dependencies = [ "deno_error", "libc", @@ -3470,7 +3470,7 @@ dependencies = [ [[package]] name = "deno_subprocess_windows" version = "0.16.0" -source = "git+https://github.com/p-hoffmann/deno?branch=trex_fix#6815c4c17f7029f780674533f0d86d8b9bca1a0b" +source = "git+https://github.com/p-hoffmann/deno?branch=trex_fix#2dd0b19196379497fffebcd47e63ed1ffe1030b6" dependencies = [ "fastrand", "futures-channel", @@ -3481,7 +3481,7 @@ dependencies = [ [[package]] name = "deno_telemetry" version = "0.43.0" -source = "git+https://github.com/p-hoffmann/deno?branch=trex_fix#6815c4c17f7029f780674533f0d86d8b9bca1a0b" +source = "git+https://github.com/p-hoffmann/deno?branch=trex_fix#2dd0b19196379497fffebcd47e63ed1ffe1030b6" dependencies = [ "async-trait", "base_rt 0.1.0 (git+https://github.com/p-hoffmann/deno?branch=trex_fix)", @@ -3522,7 +3522,7 @@ dependencies = [ [[package]] name = "deno_tls" version = "0.208.0" -source = "git+https://github.com/p-hoffmann/deno?branch=trex_fix#6815c4c17f7029f780674533f0d86d8b9bca1a0b" +source = "git+https://github.com/p-hoffmann/deno?branch=trex_fix#2dd0b19196379497fffebcd47e63ed1ffe1030b6" dependencies = [ "deno_core", "deno_error", @@ -4330,7 +4330,7 @@ dependencies = [ [[package]] name = "ext_node" version = "0.1.0" -source = "git+https://github.com/p-hoffmann/deno?branch=trex_fix#6815c4c17f7029f780674533f0d86d8b9bca1a0b" +source = "git+https://github.com/p-hoffmann/deno?branch=trex_fix#2dd0b19196379497fffebcd47e63ed1ffe1030b6" dependencies = [ "aead-gcm-stream", "aes", @@ -4383,6 +4383,7 @@ dependencies = [ "lazy-regex", "libc", "libz-sys", + "log", "md-5", "md4", "memchr", @@ -6811,7 +6812,7 @@ dependencies = [ [[package]] name = "node_resolver" version = "0.59.0" -source = "git+https://github.com/p-hoffmann/deno?branch=trex_fix#6815c4c17f7029f780674533f0d86d8b9bca1a0b" +source = "git+https://github.com/p-hoffmann/deno?branch=trex_fix#2dd0b19196379497fffebcd47e63ed1ffe1030b6" dependencies = [ "anyhow", "async-trait", @@ -8425,20 +8426,6 @@ dependencies = [ "sct 0.7.1", ] -[[package]] -name = "rustls" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" -dependencies = [ - "log", - "ring 0.17.14", - "rustls-pki-types", - "rustls-webpki 0.102.8", - "subtle", - "zeroize", -] - [[package]] name = "rustls" version = "0.23.28" @@ -10089,9 +10076,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tls-listener" -version = "0.10.3" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d4511e6fec190f1b99c16d4b53982bcb449295e7ce165d361a673f7ad09339e" +checksum = "1461056cc1ef47003f7ee16e4cef3741068d4c7f6b627bfce49b7c00c120a530" dependencies = [ "futures-util", "pin-project-lite", @@ -10202,17 +10189,6 @@ dependencies = [ "tokio", ] -[[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.4" diff --git a/crates/base/Cargo.toml b/crates/base/Cargo.toml index c90cb5a7..83286812 100644 --- a/crates/base/Cargo.toml +++ b/crates/base/Cargo.toml @@ -79,8 +79,8 @@ async-scoped = { version = "0.9", features = ["use-tokio"] } cooked-waker = "5" flume = "0.11.0" strum = { version = "0.25", features = ["derive"] } -tls-listener = { version = "0.10", features = ["rustls"] } -tokio-rustls = "0.25.0" +tls-listener = { version = "0.11", features = ["rustls-ring"] } +tokio-rustls = { workspace = true } [target.'cfg(windows)'.dependencies] winapi = { workspace = true, features = ["knownfolders", "mswsock", "objbase", "shlobj", "tlhelp32", "winbase", "winerror", "winsock2"] }