From 191a05236f8a33a5adfbfbbcfae6a25723b224f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pascal=20Eng=C3=A9libert?= Date: Mon, 1 Jun 2026 13:24:32 +0200 Subject: [PATCH] Clean fork deps --- Cargo.lock | 12 +++++++----- Cargo.toml | 13 ++++++------- src/record.rs | 7 ++++--- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index eec380f..2ef72ba 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -218,6 +218,7 @@ dependencies = [ [[package]] name = "boring-additions" version = "0.0.1" +source = "git+https://git.zoai.re/tuxmain/boring-rustls-provider.git?rev=b667e1450b9346e0f3ecef0c222d1c37cdc110cc#b667e1450b9346e0f3ecef0c222d1c37cdc110cc" dependencies = [ "boring", "boring-sys", @@ -227,6 +228,7 @@ dependencies = [ [[package]] name = "boring-rustls-provider" version = "0.0.1" +source = "git+https://git.zoai.re/tuxmain/boring-rustls-provider.git?rev=b667e1450b9346e0f3ecef0c222d1c37cdc110cc#b667e1450b9346e0f3ecef0c222d1c37cdc110cc" dependencies = [ "aead", "boring", @@ -255,6 +257,7 @@ dependencies = [ [[package]] name = "boring-sys-additions" version = "0.0.1" +source = "git+https://git.zoai.re/tuxmain/boring-rustls-provider.git?rev=b667e1450b9346e0f3ecef0c222d1c37cdc110cc#b667e1450b9346e0f3ecef0c222d1c37cdc110cc" dependencies = [ "boring-sys", ] @@ -1362,7 +1365,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.37" +version = "0.23.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef86cd5876211988985292b91c96a8f2d298df24e75989a43a3c73f2d4d8168b" dependencies = [ "aws-lc-rs", "log", @@ -1628,6 +1633,7 @@ dependencies = [ [[package]] name = "sslrelay" version = "0.6.2" +source = "git+https://git.zoai.re/tuxmain/sslrelay.git?rev=11a4777cfebfc41695583c23c545478dc50bdbe0#11a4777cfebfc41695583c23c545478dc50bdbe0" dependencies = [ "openssl", ] @@ -2323,7 +2329,3 @@ name = "zmij" version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa" - -[[patch.unused]] -name = "rustls-platform-verifier" -version = "0.6.1" diff --git a/Cargo.toml b/Cargo.toml index 57cf9e3..1890872 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,8 @@ env_logger = "0.11.8" futures-util = "0.3.31" log = "0.4.28" rustls-platform-verifier = "0.6.2" -sslrelay = { path = "../sslrelay", optional = true } +#sslrelay = { path = "../sslrelay", optional = true } +sslrelay = { git = "https://git.zoai.re/tuxmain/sslrelay.git", rev = "11a4777cfebfc41695583c23c545478dc50bdbe0", optional = true } static_cell = "2.1.1" tokio = { version = "1.49.0", features = ["io-util", "macros", "net", "rt-multi-thread", "sync", "time"]} tokio-rustls = "0.26.4" @@ -20,7 +21,9 @@ x509-parser = "0.18.1" # TLS impls aws-lc-rs = { version = "1.16.0", optional = true } #boring-rustls-provider = { git = "https://github.com/janrueth/boring-rustls-provider.git", rev = "b88c87235dc43c85bb7d93cf9c9f039a865aec00", features = ["tls12", "mlkem"], optional = true } -boring-rustls-provider = { path = "../boring-rustls-provider/boring-rustls-provider", features = ["tls12", "mlkem"], optional = true } +# Our boring-rustls-provider fork only makes public the algorithm lists. +#boring-rustls-provider = { path = "../boring-rustls-provider/boring-rustls-provider", features = ["tls12", "mlkem"], optional = true } +boring-rustls-provider = { git = "https://git.zoai.re/tuxmain/boring-rustls-provider.git", rev = "b667e1450b9346e0f3ecef0c222d1c37cdc110cc", features = ["tls12", "mlkem"], optional = true } rustls-graviola = { version = "0.3.3", optional = true } rustls-openssl = { version = "0.3.0", default-features = false, features = ["tls12"], optional = true } rustls-post-quantum = { version = "0.2.4", optional = true } @@ -28,7 +31,7 @@ rustls-symcrypt = { version = "0.2.1", optional = true, features = ["chacha", "x [features] default = [ - "boring",# Change this to the wanted cryptographic backend (list below) + "aws-lc",# Change this to the wanted cryptographic backend (list below) #"record",# It may be needed to remove the record feature when building with openssl ] @@ -45,7 +48,3 @@ symcrypt = ["rustls-symcrypt"] [profile.release] lto = "fat" - -[patch.crates-io] -rustls = { path = "../rustls/rustls" } -rustls-platform-verifier = { path = "../rustls-platform-verifier/rustls-platform-verifier"} diff --git a/src/record.rs b/src/record.rs index 7b09563..77dcb25 100644 --- a/src/record.rs +++ b/src/record.rs @@ -22,9 +22,10 @@ static TEST_RECORD: &[(u64, &str, Direction, &[u8])] = (0, "upload.wikimedia.org", Direction::ClientToServer, b"GET /bbbbbbbbb HTTP/1.1\r\nHost: upload.wikimedia.org\r\n\r\n"), (0, "upload.wikimedia.org", Direction::ServerToClient, b"HTTP/1.1 200\r\nContent-Length: 7\r\nDate: Wed, 12 Nov 2025 13:52:58 GMT\r\n\r\nbonjour"), (1, "upload.wikimedia.org", Direction::ClientToServer, b"GET /ccccccccc HTTP/1.1\r\nHost: upload.wikimedia.org\r\n\r\n"), - (1, "upload.wikimedia.org", Direction::ServerToClient, b"HTTP/1.1 200\r\nTransfer-Encoding: chunked\r\nDate: Wed, 12 Nov 2025 13:52:58 GMT\r\n\r\n6\r\nbanane\r\n"), - (1, "upload.wikimedia.org", Direction::ServerToClient, b"5\r\npomme\r\n"), - (1, "upload.wikimedia.org", Direction::ServerToClient, b"0\r\n\r\n"), + (1, "upload.wikimedia.org", Direction::ServerToClient, b"HTTP/1.1 200\r\nContent-Length: 11\r\nDate: Wed, 12 Nov 2025 13:52:59 GMT\r\n\r\nlorem ipsum"), + //(1, "upload.wikimedia.org", Direction::ServerToClient, b"HTTP/1.1 200\r\nTransfer-Encoding: chunked\r\nDate: Wed, 12 Nov 2025 13:52:58 GMT\r\n\r\n6\r\nbanane\r\n"), + //(1, "upload.wikimedia.org", Direction::ServerToClient, b"5\r\npomme\r\n"), + //(1, "upload.wikimedia.org", Direction::ServerToClient, b"0\r\n\r\n"), ]; fn write_record(