From dee300e7f6cb3da59909ed07fff913e8a382d4a3 Mon Sep 17 00:00:00 2001 From: DougCh Date: Tue, 17 Dec 2024 19:44:12 +0000 Subject: [PATCH 01/30] chore: move hyper to a newer MSRV --- bindings/rust/Cargo.toml | 3 +-- bindings/rust/integration/Cargo.toml | 1 - {bindings/rust/s2n-tls-hyper => s2n-tls-hyper}/Cargo.toml | 8 ++------ {bindings/rust/s2n-tls-hyper => s2n-tls-hyper}/README.md | 0 s2n-tls-hyper/rust-toolchain | 1 + .../rust/s2n-tls-hyper => s2n-tls-hyper}/src/connector.rs | 0 .../rust/s2n-tls-hyper => s2n-tls-hyper}/src/error.rs | 0 {bindings/rust/s2n-tls-hyper => s2n-tls-hyper}/src/lib.rs | 0 .../rust/s2n-tls-hyper => s2n-tls-hyper}/src/stream.rs | 0 .../s2n-tls-hyper => s2n-tls-hyper}/tests/common/echo.rs | 0 .../s2n-tls-hyper => s2n-tls-hyper}/tests/common/mod.rs | 0 .../rust/s2n-tls-hyper => s2n-tls-hyper}/tests/http.rs | 0 12 files changed, 4 insertions(+), 9 deletions(-) rename {bindings/rust/s2n-tls-hyper => s2n-tls-hyper}/Cargo.toml (65%) rename {bindings/rust/s2n-tls-hyper => s2n-tls-hyper}/README.md (100%) create mode 100644 s2n-tls-hyper/rust-toolchain rename {bindings/rust/s2n-tls-hyper => s2n-tls-hyper}/src/connector.rs (100%) rename {bindings/rust/s2n-tls-hyper => s2n-tls-hyper}/src/error.rs (100%) rename {bindings/rust/s2n-tls-hyper => s2n-tls-hyper}/src/lib.rs (100%) rename {bindings/rust/s2n-tls-hyper => s2n-tls-hyper}/src/stream.rs (100%) rename {bindings/rust/s2n-tls-hyper => s2n-tls-hyper}/tests/common/echo.rs (100%) rename {bindings/rust/s2n-tls-hyper => s2n-tls-hyper}/tests/common/mod.rs (100%) rename {bindings/rust/s2n-tls-hyper => s2n-tls-hyper}/tests/http.rs (100%) diff --git a/bindings/rust/Cargo.toml b/bindings/rust/Cargo.toml index 15b00cc7009..5b1a94fd1a8 100644 --- a/bindings/rust/Cargo.toml +++ b/bindings/rust/Cargo.toml @@ -3,8 +3,7 @@ members = [ "integration", "s2n-tls", "s2n-tls-sys", - "s2n-tls-tokio", - "s2n-tls-hyper", + "s2n-tls-tokio" ] # generate can't be included in the workspace because of a bootstrapping problem # s2n-tls-sys/Cargo.toml (part of the workspace) is generated by diff --git a/bindings/rust/integration/Cargo.toml b/bindings/rust/integration/Cargo.toml index 1b61246f104..1d125a253ee 100644 --- a/bindings/rust/integration/Cargo.toml +++ b/bindings/rust/integration/Cargo.toml @@ -20,7 +20,6 @@ pq = [] [dependencies] s2n-tls = { path = "../s2n-tls", features = ["unstable-testing"]} -s2n-tls-hyper = { path = "../s2n-tls-hyper" } s2n-tls-tokio = { path = "../s2n-tls-tokio" } s2n-tls-sys = { path = "../s2n-tls-sys" } diff --git a/bindings/rust/s2n-tls-hyper/Cargo.toml b/s2n-tls-hyper/Cargo.toml similarity index 65% rename from bindings/rust/s2n-tls-hyper/Cargo.toml rename to s2n-tls-hyper/Cargo.toml index e14eba69a80..a8ff7f9e478 100644 --- a/bindings/rust/s2n-tls-hyper/Cargo.toml +++ b/s2n-tls-hyper/Cargo.toml @@ -13,8 +13,8 @@ publish = false default = [] [dependencies] -s2n-tls = { version = "=0.3.9", path = "../s2n-tls" } -s2n-tls-tokio = { version = "=0.3.9", path = "../s2n-tls-tokio" } +s2n-tls = { version = "=0.3.9", path = "../bindings/rust/s2n-tls" } +s2n-tls-tokio = { version = "=0.3.9", path = "../bindings/rust/s2n-tls-tokio" } hyper = { version = "1" } hyper-util = { version = "0.1", features = ["client-legacy", "tokio", "http1", "http2"] } tower-service = { version = "0.3" } @@ -26,7 +26,3 @@ http-body-util = "0.1" hyper-util = { version = "0.1", features = ["server"] } bytes = "1" -# Newer versions require Rust 1.65, see https://github.com/aws/s2n-tls/issues/4242. -hashbrown = { version = "=0.15.0" } -# Newer versions require Rust 1.70, see https://github.com/aws/s2n-tls/issues/4395. -tokio-util = { version = "=0.7.11" } diff --git a/bindings/rust/s2n-tls-hyper/README.md b/s2n-tls-hyper/README.md similarity index 100% rename from bindings/rust/s2n-tls-hyper/README.md rename to s2n-tls-hyper/README.md diff --git a/s2n-tls-hyper/rust-toolchain b/s2n-tls-hyper/rust-toolchain new file mode 100644 index 00000000000..832e9afb6c1 --- /dev/null +++ b/s2n-tls-hyper/rust-toolchain @@ -0,0 +1 @@ +1.70.0 diff --git a/bindings/rust/s2n-tls-hyper/src/connector.rs b/s2n-tls-hyper/src/connector.rs similarity index 100% rename from bindings/rust/s2n-tls-hyper/src/connector.rs rename to s2n-tls-hyper/src/connector.rs diff --git a/bindings/rust/s2n-tls-hyper/src/error.rs b/s2n-tls-hyper/src/error.rs similarity index 100% rename from bindings/rust/s2n-tls-hyper/src/error.rs rename to s2n-tls-hyper/src/error.rs diff --git a/bindings/rust/s2n-tls-hyper/src/lib.rs b/s2n-tls-hyper/src/lib.rs similarity index 100% rename from bindings/rust/s2n-tls-hyper/src/lib.rs rename to s2n-tls-hyper/src/lib.rs diff --git a/bindings/rust/s2n-tls-hyper/src/stream.rs b/s2n-tls-hyper/src/stream.rs similarity index 100% rename from bindings/rust/s2n-tls-hyper/src/stream.rs rename to s2n-tls-hyper/src/stream.rs diff --git a/bindings/rust/s2n-tls-hyper/tests/common/echo.rs b/s2n-tls-hyper/tests/common/echo.rs similarity index 100% rename from bindings/rust/s2n-tls-hyper/tests/common/echo.rs rename to s2n-tls-hyper/tests/common/echo.rs diff --git a/bindings/rust/s2n-tls-hyper/tests/common/mod.rs b/s2n-tls-hyper/tests/common/mod.rs similarity index 100% rename from bindings/rust/s2n-tls-hyper/tests/common/mod.rs rename to s2n-tls-hyper/tests/common/mod.rs diff --git a/bindings/rust/s2n-tls-hyper/tests/http.rs b/s2n-tls-hyper/tests/http.rs similarity index 100% rename from bindings/rust/s2n-tls-hyper/tests/http.rs rename to s2n-tls-hyper/tests/http.rs From 239b7310a4e1c3af2e82c365c7e7965b1e4178f8 Mon Sep 17 00:00:00 2001 From: DougCh Date: Tue, 17 Dec 2024 22:00:19 +0000 Subject: [PATCH 02/30] chore: Move s2n-tls-hyper to a separate workspace --- bindings/rust/standard/Cargo.toml | 4 ++++ {s2n-tls-hyper => bindings/rust/standard}/rust-toolchain | 0 .../rust/standard/s2n-tls-hyper}/Cargo.toml | 6 +++--- .../rust/standard/s2n-tls-hyper}/README.md | 0 .../rust/standard/s2n-tls-hyper}/src/connector.rs | 0 .../rust/standard/s2n-tls-hyper}/src/error.rs | 0 .../rust/standard/s2n-tls-hyper}/src/lib.rs | 0 .../rust/standard/s2n-tls-hyper}/src/stream.rs | 0 .../rust/standard/s2n-tls-hyper}/tests/common/echo.rs | 0 .../rust/standard/s2n-tls-hyper}/tests/common/mod.rs | 4 ++-- .../rust/standard/s2n-tls-hyper}/tests/http.rs | 4 ++-- 11 files changed, 11 insertions(+), 7 deletions(-) create mode 100644 bindings/rust/standard/Cargo.toml rename {s2n-tls-hyper => bindings/rust/standard}/rust-toolchain (100%) rename {s2n-tls-hyper => bindings/rust/standard/s2n-tls-hyper}/Cargo.toml (79%) rename {s2n-tls-hyper => bindings/rust/standard/s2n-tls-hyper}/README.md (100%) rename {s2n-tls-hyper => bindings/rust/standard/s2n-tls-hyper}/src/connector.rs (100%) rename {s2n-tls-hyper => bindings/rust/standard/s2n-tls-hyper}/src/error.rs (100%) rename {s2n-tls-hyper => bindings/rust/standard/s2n-tls-hyper}/src/lib.rs (100%) rename {s2n-tls-hyper => bindings/rust/standard/s2n-tls-hyper}/src/stream.rs (100%) rename {s2n-tls-hyper => bindings/rust/standard/s2n-tls-hyper}/tests/common/echo.rs (100%) rename {s2n-tls-hyper => bindings/rust/standard/s2n-tls-hyper}/tests/common/mod.rs (87%) rename {s2n-tls-hyper => bindings/rust/standard/s2n-tls-hyper}/tests/http.rs (99%) diff --git a/bindings/rust/standard/Cargo.toml b/bindings/rust/standard/Cargo.toml new file mode 100644 index 00000000000..f21dffea3c4 --- /dev/null +++ b/bindings/rust/standard/Cargo.toml @@ -0,0 +1,4 @@ +[workspace] +members = [ + "s2n-tls-hyper" +] \ No newline at end of file diff --git a/s2n-tls-hyper/rust-toolchain b/bindings/rust/standard/rust-toolchain similarity index 100% rename from s2n-tls-hyper/rust-toolchain rename to bindings/rust/standard/rust-toolchain diff --git a/s2n-tls-hyper/Cargo.toml b/bindings/rust/standard/s2n-tls-hyper/Cargo.toml similarity index 79% rename from s2n-tls-hyper/Cargo.toml rename to bindings/rust/standard/s2n-tls-hyper/Cargo.toml index a8ff7f9e478..d004e71a7ad 100644 --- a/s2n-tls-hyper/Cargo.toml +++ b/bindings/rust/standard/s2n-tls-hyper/Cargo.toml @@ -4,7 +4,7 @@ description = "A compatbility crate allowing s2n-tls to be used with the hyper H version = "0.0.1" authors = ["AWS s2n"] edition = "2021" -rust-version = "1.63.0" +rust-version = "1.70.0" repository = "https://github.com/aws/s2n-tls" license = "Apache-2.0" publish = false @@ -13,8 +13,8 @@ publish = false default = [] [dependencies] -s2n-tls = { version = "=0.3.9", path = "../bindings/rust/s2n-tls" } -s2n-tls-tokio = { version = "=0.3.9", path = "../bindings/rust/s2n-tls-tokio" } +s2n-tls = { version = "=0.3", path = "../../s2n-tls" } +s2n-tls-tokio = { version = "=0.3", path = "../../s2n-tls-tokio" } hyper = { version = "1" } hyper-util = { version = "0.1", features = ["client-legacy", "tokio", "http1", "http2"] } tower-service = { version = "0.3" } diff --git a/s2n-tls-hyper/README.md b/bindings/rust/standard/s2n-tls-hyper/README.md similarity index 100% rename from s2n-tls-hyper/README.md rename to bindings/rust/standard/s2n-tls-hyper/README.md diff --git a/s2n-tls-hyper/src/connector.rs b/bindings/rust/standard/s2n-tls-hyper/src/connector.rs similarity index 100% rename from s2n-tls-hyper/src/connector.rs rename to bindings/rust/standard/s2n-tls-hyper/src/connector.rs diff --git a/s2n-tls-hyper/src/error.rs b/bindings/rust/standard/s2n-tls-hyper/src/error.rs similarity index 100% rename from s2n-tls-hyper/src/error.rs rename to bindings/rust/standard/s2n-tls-hyper/src/error.rs diff --git a/s2n-tls-hyper/src/lib.rs b/bindings/rust/standard/s2n-tls-hyper/src/lib.rs similarity index 100% rename from s2n-tls-hyper/src/lib.rs rename to bindings/rust/standard/s2n-tls-hyper/src/lib.rs diff --git a/s2n-tls-hyper/src/stream.rs b/bindings/rust/standard/s2n-tls-hyper/src/stream.rs similarity index 100% rename from s2n-tls-hyper/src/stream.rs rename to bindings/rust/standard/s2n-tls-hyper/src/stream.rs diff --git a/s2n-tls-hyper/tests/common/echo.rs b/bindings/rust/standard/s2n-tls-hyper/tests/common/echo.rs similarity index 100% rename from s2n-tls-hyper/tests/common/echo.rs rename to bindings/rust/standard/s2n-tls-hyper/tests/common/echo.rs diff --git a/s2n-tls-hyper/tests/common/mod.rs b/bindings/rust/standard/s2n-tls-hyper/tests/common/mod.rs similarity index 87% rename from s2n-tls-hyper/tests/common/mod.rs rename to bindings/rust/standard/s2n-tls-hyper/tests/common/mod.rs index 2da6cdace69..9c6b0df30fc 100644 --- a/s2n-tls-hyper/tests/common/mod.rs +++ b/bindings/rust/standard/s2n-tls-hyper/tests/common/mod.rs @@ -7,8 +7,8 @@ pub mod echo; /// NOTE: this certificate and key are used for testing purposes only! pub const CERT_PEM: &[u8] = - include_bytes!(concat!(env!("CARGO_MANIFEST_DIR"), "/../certs/cert.pem")); -pub const KEY_PEM: &[u8] = include_bytes!(concat!(env!("CARGO_MANIFEST_DIR"), "/../certs/key.pem")); + include_bytes!(concat!(env!("CARGO_MANIFEST_DIR"), "/../../certs/cert.pem")); +pub const KEY_PEM: &[u8] = include_bytes!(concat!(env!("CARGO_MANIFEST_DIR"), "/../../certs/key.pem")); pub fn config() -> Result { let mut builder = config::Config::builder(); diff --git a/s2n-tls-hyper/tests/http.rs b/bindings/rust/standard/s2n-tls-hyper/tests/http.rs similarity index 99% rename from s2n-tls-hyper/tests/http.rs rename to bindings/rust/standard/s2n-tls-hyper/tests/http.rs index 9f9b87e29a0..c3f5ffb83b3 100644 --- a/s2n-tls-hyper/tests/http.rs +++ b/bindings/rust/standard/s2n-tls-hyper/tests/http.rs @@ -231,11 +231,11 @@ async fn ipv6() -> Result<(), Box> { // matches this identity. let localhost_ipv6_cert: &[u8] = include_bytes!(concat!( env!("CARGO_MANIFEST_DIR"), - "/../certs/cert_localhost_ipv6.pem" + "/../../certs/cert_localhost_ipv6.pem" )); let localhost_ipv6_key: &[u8] = include_bytes!(concat!( env!("CARGO_MANIFEST_DIR"), - "/../certs/key_localhost_ipv6.pem" + "/../../certs/key_localhost_ipv6.pem" )); let mut builder = config::Config::builder(); From 237ee1509460b3b366dffc457f266ffd26ecb6dd Mon Sep 17 00:00:00 2001 From: DougCh Date: Tue, 17 Dec 2024 22:37:30 +0000 Subject: [PATCH 03/30] move integration to the standard workspace --- bindings/rust/Cargo.toml | 1 - bindings/rust/standard/Cargo.toml | 3 ++- bindings/rust/{ => standard}/integration/Cargo.toml | 6 +++--- bindings/rust/{ => standard}/integration/build.rs | 0 bindings/rust/{ => standard}/integration/src/lib.rs | 0 bindings/rust/{ => standard}/integration/src/main.rs | 0 .../{ => standard}/integration/src/network/https_client.rs | 0 bindings/rust/{ => standard}/integration/src/network/mod.rs | 0 .../{ => standard}/integration/src/network/tls_client.rs | 0 9 files changed, 5 insertions(+), 5 deletions(-) rename bindings/rust/{ => standard}/integration/Cargo.toml (85%) rename bindings/rust/{ => standard}/integration/build.rs (100%) rename bindings/rust/{ => standard}/integration/src/lib.rs (100%) rename bindings/rust/{ => standard}/integration/src/main.rs (100%) rename bindings/rust/{ => standard}/integration/src/network/https_client.rs (100%) rename bindings/rust/{ => standard}/integration/src/network/mod.rs (100%) rename bindings/rust/{ => standard}/integration/src/network/tls_client.rs (100%) diff --git a/bindings/rust/Cargo.toml b/bindings/rust/Cargo.toml index 5b1a94fd1a8..9b7a87673a9 100644 --- a/bindings/rust/Cargo.toml +++ b/bindings/rust/Cargo.toml @@ -1,6 +1,5 @@ [workspace] members = [ - "integration", "s2n-tls", "s2n-tls-sys", "s2n-tls-tokio" diff --git a/bindings/rust/standard/Cargo.toml b/bindings/rust/standard/Cargo.toml index f21dffea3c4..b934f0cd536 100644 --- a/bindings/rust/standard/Cargo.toml +++ b/bindings/rust/standard/Cargo.toml @@ -1,4 +1,5 @@ [workspace] members = [ + "integration", "s2n-tls-hyper" -] \ No newline at end of file +] diff --git a/bindings/rust/integration/Cargo.toml b/bindings/rust/standard/integration/Cargo.toml similarity index 85% rename from bindings/rust/integration/Cargo.toml rename to bindings/rust/standard/integration/Cargo.toml index 1d125a253ee..09a0d444877 100644 --- a/bindings/rust/integration/Cargo.toml +++ b/bindings/rust/standard/integration/Cargo.toml @@ -19,9 +19,9 @@ no-network-tests = [] pq = [] [dependencies] -s2n-tls = { path = "../s2n-tls", features = ["unstable-testing"]} -s2n-tls-tokio = { path = "../s2n-tls-tokio" } -s2n-tls-sys = { path = "../s2n-tls-sys" } +s2n-tls = { path = "../../s2n-tls", features = ["unstable-testing"]} +s2n-tls-tokio = { path = "../../s2n-tls-tokio" } +s2n-tls-sys = { path = "../../s2n-tls-sys" } [dev-dependencies] tokio = { version = "1", features = ["macros", "test-util"] } diff --git a/bindings/rust/integration/build.rs b/bindings/rust/standard/integration/build.rs similarity index 100% rename from bindings/rust/integration/build.rs rename to bindings/rust/standard/integration/build.rs diff --git a/bindings/rust/integration/src/lib.rs b/bindings/rust/standard/integration/src/lib.rs similarity index 100% rename from bindings/rust/integration/src/lib.rs rename to bindings/rust/standard/integration/src/lib.rs diff --git a/bindings/rust/integration/src/main.rs b/bindings/rust/standard/integration/src/main.rs similarity index 100% rename from bindings/rust/integration/src/main.rs rename to bindings/rust/standard/integration/src/main.rs diff --git a/bindings/rust/integration/src/network/https_client.rs b/bindings/rust/standard/integration/src/network/https_client.rs similarity index 100% rename from bindings/rust/integration/src/network/https_client.rs rename to bindings/rust/standard/integration/src/network/https_client.rs diff --git a/bindings/rust/integration/src/network/mod.rs b/bindings/rust/standard/integration/src/network/mod.rs similarity index 100% rename from bindings/rust/integration/src/network/mod.rs rename to bindings/rust/standard/integration/src/network/mod.rs diff --git a/bindings/rust/integration/src/network/tls_client.rs b/bindings/rust/standard/integration/src/network/tls_client.rs similarity index 100% rename from bindings/rust/integration/src/network/tls_client.rs rename to bindings/rust/standard/integration/src/network/tls_client.rs From b8bb646fbbbc77356dc1368e9583a34274cca496 Mon Sep 17 00:00:00 2001 From: DougCh Date: Tue, 17 Dec 2024 22:50:26 +0000 Subject: [PATCH 04/30] update integration path --- bindings/rust/generate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bindings/rust/generate.sh b/bindings/rust/generate.sh index 9949928f1ce..78ab374cb3b 100755 --- a/bindings/rust/generate.sh +++ b/bindings/rust/generate.sh @@ -52,7 +52,7 @@ cargo publish --dry-run --allow-dirty cargo publish --dry-run --allow-dirty --all-features popd -pushd integration +pushd standard/integration cargo run popd From d1dec6b303bd1d0a2aa9ae7c99789c0828ebaa18 Mon Sep 17 00:00:00 2001 From: DougCh Date: Tue, 17 Dec 2024 23:02:59 +0000 Subject: [PATCH 05/30] fix GHA integraiton path --- .github/workflows/ci_rust.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_rust.yml b/.github/workflows/ci_rust.yml index 26340529efc..21993e60534 100644 --- a/.github/workflows/ci_rust.yml +++ b/.github/workflows/ci_rust.yml @@ -59,7 +59,7 @@ jobs: run: cargo test --features unstable-renegotiate - name: Network-enabled integration tests - working-directory: ${{env.ROOT_PATH}}/integration + working-directory: ${{env.ROOT_PATH}}/standard/integration # no-default-features is used because network tests are hidden behind a # default "negative" feature. This is because we don't want network tests # invoked on the `cargo test --all-features` pattern. From bd709c5e32302c6cf7da87f418e721f0ecbc88fa Mon Sep 17 00:00:00 2001 From: DougCh Date: Tue, 17 Dec 2024 23:16:08 +0000 Subject: [PATCH 06/30] add the hyper dep back --- bindings/rust/standard/integration/Cargo.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/bindings/rust/standard/integration/Cargo.toml b/bindings/rust/standard/integration/Cargo.toml index 09a0d444877..9a9f20c1ca8 100644 --- a/bindings/rust/standard/integration/Cargo.toml +++ b/bindings/rust/standard/integration/Cargo.toml @@ -20,6 +20,7 @@ pq = [] [dependencies] s2n-tls = { path = "../../s2n-tls", features = ["unstable-testing"]} +s2n-tls-hyper = { path = "../s2n-tls-hyper" } s2n-tls-tokio = { path = "../../s2n-tls-tokio" } s2n-tls-sys = { path = "../../s2n-tls-sys" } From f3aaf2b582ef8dfe5a58e584ef855cec95720550 Mon Sep 17 00:00:00 2001 From: DougCh Date: Wed, 18 Dec 2024 18:24:49 +0000 Subject: [PATCH 07/30] fix path for external build GHA --- .github/workflows/ci_rust.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_rust.yml b/.github/workflows/ci_rust.yml index 21993e60534..7e671a5740b 100644 --- a/.github/workflows/ci_rust.yml +++ b/.github/workflows/ci_rust.yml @@ -83,7 +83,7 @@ jobs: cd ${{env.ROOT_PATH}} ./generate.sh - ldd target/debug/integration | grep libs2n.so + ldd standard/target/debug/integration | grep libs2n.so # our benchmark testing includes interop tests between s2n-tls, rustls, and # openssl From 68f352c86902dddf7a508e191a602ee5c6843eb5 Mon Sep 17 00:00:00 2001 From: DougCh Date: Wed, 18 Dec 2024 21:13:22 +0000 Subject: [PATCH 08/30] PR feedback --- .github/workflows/ci_rust.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/ci_rust.yml b/.github/workflows/ci_rust.yml index 7e671a5740b..7092955cb7f 100644 --- a/.github/workflows/ci_rust.yml +++ b/.github/workflows/ci_rust.yml @@ -49,6 +49,11 @@ jobs: working-directory: ${{env.ROOT_PATH}} run: cargo test + # Test the standard workspace + - name: Standard Workspace Tests + working-directory: ${{env.ROOT_PATH}}/standard + run: cargo test + - name: "Feature Tests: Fingerprint, kTLS, QUIC, and PQ" working-directory: ${{env.ROOT_PATH}} # Test all features except for FIPS, which is tested separately. From 6bbfff90ae856da803e0505c8ecaaa7f2449083e Mon Sep 17 00:00:00 2001 From: DougCh Date: Wed, 18 Dec 2024 22:54:09 +0000 Subject: [PATCH 09/30] revert pinning change --- bindings/rust/standard/s2n-tls-hyper/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bindings/rust/standard/s2n-tls-hyper/Cargo.toml b/bindings/rust/standard/s2n-tls-hyper/Cargo.toml index d004e71a7ad..9855cc957e4 100644 --- a/bindings/rust/standard/s2n-tls-hyper/Cargo.toml +++ b/bindings/rust/standard/s2n-tls-hyper/Cargo.toml @@ -13,8 +13,8 @@ publish = false default = [] [dependencies] -s2n-tls = { version = "=0.3", path = "../../s2n-tls" } -s2n-tls-tokio = { version = "=0.3", path = "../../s2n-tls-tokio" } +s2n-tls = { version = "=0.3.9", path = "../../s2n-tls" } +s2n-tls-tokio = { version = "=0.3.9", path = "../../s2n-tls-tokio" } hyper = { version = "1" } hyper-util = { version = "0.1", features = ["client-legacy", "tokio", "http1", "http2"] } tower-service = { version = "0.3" } From c26dfb004e5f1569d0376d96083ec1483744f0b7 Mon Sep 17 00:00:00 2001 From: DougCh Date: Thu, 19 Dec 2024 22:39:52 +0000 Subject: [PATCH 10/30] move the original workspace down a level --- bindings/rust/{ => extended}/.clippy.toml | 0 bindings/rust/{ => extended}/.gitignore | 0 bindings/rust/{ => extended}/Cargo.toml | 0 bindings/rust/{ => extended}/Makefile | 0 bindings/rust/{ => extended}/certs/cert.pem | 0 .../certs/cert_localhost_ipv6.pem | 0 .../rust/{ => extended}/certs/cert_rsa.pem | 0 .../rust/{ => extended}/certs/generate.sh | 0 bindings/rust/{ => extended}/certs/key.pem | 0 .../certs/key_localhost_ipv6.pem | 0 .../rust/{ => extended}/certs/key_rsa.pem | 0 bindings/rust/{ => extended}/generate.sh | 0 .../rust/{ => extended}/generate/Cargo.toml | 0 .../rust/{ => extended}/generate/src/main.rs | 0 bindings/rust/{ => extended}/rust-toolchain | 0 .../rust/{ => extended}/s2n-tls-sys/README.md | 0 .../rust/{ => extended}/s2n-tls-sys/build.rs | 0 .../{ => extended}/s2n-tls-sys/src/lib.rs | 0 .../s2n-tls-sys/templates/Cargo.template | 0 .../s2n-tls-sys/templates/features.template | 0 .../s2n-tls-sys/tests/s2n_init.rs | 0 .../{ => extended}/s2n-tls-tokio/Cargo.toml | 0 .../{ => extended}/s2n-tls-tokio/README.md | 0 .../{ => extended}/s2n-tls-tokio/src/lib.rs | 0 .../s2n-tls-tokio/src/task/mod.rs | 0 .../s2n-tls-tokio/src/task/waker.rs | 0 .../s2n-tls-tokio/src/task/waker/contract.rs | 0 .../s2n-tls-tokio/tests/common/mod.rs | 0 .../s2n-tls-tokio/tests/common/stream.rs | 0 .../s2n-tls-tokio/tests/common/time.rs | 0 .../s2n-tls-tokio/tests/handshake.rs | 0 .../s2n-tls-tokio/tests/send_and_recv.rs | 0 .../s2n-tls-tokio/tests/shutdown.rs | 0 .../{ => extended}/s2n-tls-tokio/tests/tcp.rs | 0 .../rust/{ => extended}/s2n-tls/Cargo.toml | 0 .../rust/{ => extended}/s2n-tls/README.md | 0 .../{ => extended}/s2n-tls/src/callbacks.rs | 0 .../s2n-tls/src/callbacks/async_cb.rs | 0 .../s2n-tls/src/callbacks/client_hello.rs | 0 .../s2n-tls/src/callbacks/pkey.rs | 0 .../s2n-tls/src/callbacks/session_ticket.rs | 0 .../{ => extended}/s2n-tls/src/cert_chain.rs | 0 .../s2n-tls/src/client_hello.rs | 0 .../rust/{ => extended}/s2n-tls/src/config.rs | 0 .../{ => extended}/s2n-tls/src/connection.rs | 0 .../s2n-tls/src/connection/builder.rs | 0 .../rust/{ => extended}/s2n-tls/src/enums.rs | 0 .../rust/{ => extended}/s2n-tls/src/error.rs | 0 .../{ => extended}/s2n-tls/src/fingerprint.rs | 0 .../rust/{ => extended}/s2n-tls/src/init.rs | 0 .../rust/{ => extended}/s2n-tls/src/lib.rs | 0 .../rust/{ => extended}/s2n-tls/src/pool.rs | 0 .../{ => extended}/s2n-tls/src/renegotiate.rs | 0 .../{ => extended}/s2n-tls/src/security.rs | 0 .../{ => extended}/s2n-tls/src/testing.rs | 0 .../s2n-tls/src/testing/client_hello.rs | 0 .../s2n-tls/src/testing/resumption.rs | 0 .../s2n-tls/src/testing/s2n_tls.rs | 0 bindings/rust/{ => standard}/bench/.gitignore | 0 bindings/rust/{ => standard}/bench/Cargo.toml | 0 bindings/rust/{ => standard}/bench/README.md | 0 .../bench/benches/connection_creation.rs | 0 .../{ => standard}/bench/benches/handshake.rs | 0 .../bench/benches/resumption.rs | 0 .../bench/benches/throughput.rs | 0 .../rust/{ => standard}/bench/certs/ecdsa256 | 0 .../rust/{ => standard}/bench/certs/ecdsa384 | 0 .../rust/{ => standard}/bench/certs/readme.md | 0 .../rust/{ => standard}/bench/certs/rsa2048 | 0 .../rust/{ => standard}/bench/certs/rsa3072 | 0 .../rust/{ => standard}/bench/certs/rsa4096 | 0 .../rust/{ => standard}/bench/rust-toolchain | 0 .../{ => standard}/bench/src/harness/io.rs | 0 .../{ => standard}/bench/src/harness/mod.rs | 0 bindings/rust/{ => standard}/bench/src/lib.rs | 0 .../rust/{ => standard}/bench/src/openssl.rs | 0 .../rust/{ => standard}/bench/src/rustls.rs | 0 .../rust/{ => standard}/bench/src/s2n_tls.rs | 0 bindings/rust/standard/certs/cert.pem | 14 +++++ .../standard/certs/cert_localhost_ipv6.pem | 23 ++++++++ bindings/rust/standard/certs/cert_rsa.pem | 33 ++++++++++++ bindings/rust/standard/certs/generate.sh | 27 ++++++++++ bindings/rust/standard/certs/key.pem | 5 ++ .../standard/certs/key_localhost_ipv6.pem | 28 ++++++++++ bindings/rust/standard/certs/key_rsa.pem | 52 +++++++++++++++++++ 85 files changed, 182 insertions(+) rename bindings/rust/{ => extended}/.clippy.toml (100%) rename bindings/rust/{ => extended}/.gitignore (100%) rename bindings/rust/{ => extended}/Cargo.toml (100%) rename bindings/rust/{ => extended}/Makefile (100%) rename bindings/rust/{ => extended}/certs/cert.pem (100%) rename bindings/rust/{ => extended}/certs/cert_localhost_ipv6.pem (100%) rename bindings/rust/{ => extended}/certs/cert_rsa.pem (100%) rename bindings/rust/{ => extended}/certs/generate.sh (100%) rename bindings/rust/{ => extended}/certs/key.pem (100%) rename bindings/rust/{ => extended}/certs/key_localhost_ipv6.pem (100%) rename bindings/rust/{ => extended}/certs/key_rsa.pem (100%) rename bindings/rust/{ => extended}/generate.sh (100%) rename bindings/rust/{ => extended}/generate/Cargo.toml (100%) rename bindings/rust/{ => extended}/generate/src/main.rs (100%) rename bindings/rust/{ => extended}/rust-toolchain (100%) rename bindings/rust/{ => extended}/s2n-tls-sys/README.md (100%) rename bindings/rust/{ => extended}/s2n-tls-sys/build.rs (100%) rename bindings/rust/{ => extended}/s2n-tls-sys/src/lib.rs (100%) rename bindings/rust/{ => extended}/s2n-tls-sys/templates/Cargo.template (100%) rename bindings/rust/{ => extended}/s2n-tls-sys/templates/features.template (100%) rename bindings/rust/{ => extended}/s2n-tls-sys/tests/s2n_init.rs (100%) rename bindings/rust/{ => extended}/s2n-tls-tokio/Cargo.toml (100%) rename bindings/rust/{ => extended}/s2n-tls-tokio/README.md (100%) rename bindings/rust/{ => extended}/s2n-tls-tokio/src/lib.rs (100%) rename bindings/rust/{ => extended}/s2n-tls-tokio/src/task/mod.rs (100%) rename bindings/rust/{ => extended}/s2n-tls-tokio/src/task/waker.rs (100%) rename bindings/rust/{ => extended}/s2n-tls-tokio/src/task/waker/contract.rs (100%) rename bindings/rust/{ => extended}/s2n-tls-tokio/tests/common/mod.rs (100%) rename bindings/rust/{ => extended}/s2n-tls-tokio/tests/common/stream.rs (100%) rename bindings/rust/{ => extended}/s2n-tls-tokio/tests/common/time.rs (100%) rename bindings/rust/{ => extended}/s2n-tls-tokio/tests/handshake.rs (100%) rename bindings/rust/{ => extended}/s2n-tls-tokio/tests/send_and_recv.rs (100%) rename bindings/rust/{ => extended}/s2n-tls-tokio/tests/shutdown.rs (100%) rename bindings/rust/{ => extended}/s2n-tls-tokio/tests/tcp.rs (100%) rename bindings/rust/{ => extended}/s2n-tls/Cargo.toml (100%) rename bindings/rust/{ => extended}/s2n-tls/README.md (100%) rename bindings/rust/{ => extended}/s2n-tls/src/callbacks.rs (100%) rename bindings/rust/{ => extended}/s2n-tls/src/callbacks/async_cb.rs (100%) rename bindings/rust/{ => extended}/s2n-tls/src/callbacks/client_hello.rs (100%) rename bindings/rust/{ => extended}/s2n-tls/src/callbacks/pkey.rs (100%) rename bindings/rust/{ => extended}/s2n-tls/src/callbacks/session_ticket.rs (100%) rename bindings/rust/{ => extended}/s2n-tls/src/cert_chain.rs (100%) rename bindings/rust/{ => extended}/s2n-tls/src/client_hello.rs (100%) rename bindings/rust/{ => extended}/s2n-tls/src/config.rs (100%) rename bindings/rust/{ => extended}/s2n-tls/src/connection.rs (100%) rename bindings/rust/{ => extended}/s2n-tls/src/connection/builder.rs (100%) rename bindings/rust/{ => extended}/s2n-tls/src/enums.rs (100%) rename bindings/rust/{ => extended}/s2n-tls/src/error.rs (100%) rename bindings/rust/{ => extended}/s2n-tls/src/fingerprint.rs (100%) rename bindings/rust/{ => extended}/s2n-tls/src/init.rs (100%) rename bindings/rust/{ => extended}/s2n-tls/src/lib.rs (100%) rename bindings/rust/{ => extended}/s2n-tls/src/pool.rs (100%) rename bindings/rust/{ => extended}/s2n-tls/src/renegotiate.rs (100%) rename bindings/rust/{ => extended}/s2n-tls/src/security.rs (100%) rename bindings/rust/{ => extended}/s2n-tls/src/testing.rs (100%) rename bindings/rust/{ => extended}/s2n-tls/src/testing/client_hello.rs (100%) rename bindings/rust/{ => extended}/s2n-tls/src/testing/resumption.rs (100%) rename bindings/rust/{ => extended}/s2n-tls/src/testing/s2n_tls.rs (100%) rename bindings/rust/{ => standard}/bench/.gitignore (100%) rename bindings/rust/{ => standard}/bench/Cargo.toml (100%) rename bindings/rust/{ => standard}/bench/README.md (100%) rename bindings/rust/{ => standard}/bench/benches/connection_creation.rs (100%) rename bindings/rust/{ => standard}/bench/benches/handshake.rs (100%) rename bindings/rust/{ => standard}/bench/benches/resumption.rs (100%) rename bindings/rust/{ => standard}/bench/benches/throughput.rs (100%) rename bindings/rust/{ => standard}/bench/certs/ecdsa256 (100%) rename bindings/rust/{ => standard}/bench/certs/ecdsa384 (100%) rename bindings/rust/{ => standard}/bench/certs/readme.md (100%) rename bindings/rust/{ => standard}/bench/certs/rsa2048 (100%) rename bindings/rust/{ => standard}/bench/certs/rsa3072 (100%) rename bindings/rust/{ => standard}/bench/certs/rsa4096 (100%) rename bindings/rust/{ => standard}/bench/rust-toolchain (100%) rename bindings/rust/{ => standard}/bench/src/harness/io.rs (100%) rename bindings/rust/{ => standard}/bench/src/harness/mod.rs (100%) rename bindings/rust/{ => standard}/bench/src/lib.rs (100%) rename bindings/rust/{ => standard}/bench/src/openssl.rs (100%) rename bindings/rust/{ => standard}/bench/src/rustls.rs (100%) rename bindings/rust/{ => standard}/bench/src/s2n_tls.rs (100%) create mode 100644 bindings/rust/standard/certs/cert.pem create mode 100644 bindings/rust/standard/certs/cert_localhost_ipv6.pem create mode 100644 bindings/rust/standard/certs/cert_rsa.pem create mode 100755 bindings/rust/standard/certs/generate.sh create mode 100644 bindings/rust/standard/certs/key.pem create mode 100644 bindings/rust/standard/certs/key_localhost_ipv6.pem create mode 100644 bindings/rust/standard/certs/key_rsa.pem diff --git a/bindings/rust/.clippy.toml b/bindings/rust/extended/.clippy.toml similarity index 100% rename from bindings/rust/.clippy.toml rename to bindings/rust/extended/.clippy.toml diff --git a/bindings/rust/.gitignore b/bindings/rust/extended/.gitignore similarity index 100% rename from bindings/rust/.gitignore rename to bindings/rust/extended/.gitignore diff --git a/bindings/rust/Cargo.toml b/bindings/rust/extended/Cargo.toml similarity index 100% rename from bindings/rust/Cargo.toml rename to bindings/rust/extended/Cargo.toml diff --git a/bindings/rust/Makefile b/bindings/rust/extended/Makefile similarity index 100% rename from bindings/rust/Makefile rename to bindings/rust/extended/Makefile diff --git a/bindings/rust/certs/cert.pem b/bindings/rust/extended/certs/cert.pem similarity index 100% rename from bindings/rust/certs/cert.pem rename to bindings/rust/extended/certs/cert.pem diff --git a/bindings/rust/certs/cert_localhost_ipv6.pem b/bindings/rust/extended/certs/cert_localhost_ipv6.pem similarity index 100% rename from bindings/rust/certs/cert_localhost_ipv6.pem rename to bindings/rust/extended/certs/cert_localhost_ipv6.pem diff --git a/bindings/rust/certs/cert_rsa.pem b/bindings/rust/extended/certs/cert_rsa.pem similarity index 100% rename from bindings/rust/certs/cert_rsa.pem rename to bindings/rust/extended/certs/cert_rsa.pem diff --git a/bindings/rust/certs/generate.sh b/bindings/rust/extended/certs/generate.sh similarity index 100% rename from bindings/rust/certs/generate.sh rename to bindings/rust/extended/certs/generate.sh diff --git a/bindings/rust/certs/key.pem b/bindings/rust/extended/certs/key.pem similarity index 100% rename from bindings/rust/certs/key.pem rename to bindings/rust/extended/certs/key.pem diff --git a/bindings/rust/certs/key_localhost_ipv6.pem b/bindings/rust/extended/certs/key_localhost_ipv6.pem similarity index 100% rename from bindings/rust/certs/key_localhost_ipv6.pem rename to bindings/rust/extended/certs/key_localhost_ipv6.pem diff --git a/bindings/rust/certs/key_rsa.pem b/bindings/rust/extended/certs/key_rsa.pem similarity index 100% rename from bindings/rust/certs/key_rsa.pem rename to bindings/rust/extended/certs/key_rsa.pem diff --git a/bindings/rust/generate.sh b/bindings/rust/extended/generate.sh similarity index 100% rename from bindings/rust/generate.sh rename to bindings/rust/extended/generate.sh diff --git a/bindings/rust/generate/Cargo.toml b/bindings/rust/extended/generate/Cargo.toml similarity index 100% rename from bindings/rust/generate/Cargo.toml rename to bindings/rust/extended/generate/Cargo.toml diff --git a/bindings/rust/generate/src/main.rs b/bindings/rust/extended/generate/src/main.rs similarity index 100% rename from bindings/rust/generate/src/main.rs rename to bindings/rust/extended/generate/src/main.rs diff --git a/bindings/rust/rust-toolchain b/bindings/rust/extended/rust-toolchain similarity index 100% rename from bindings/rust/rust-toolchain rename to bindings/rust/extended/rust-toolchain diff --git a/bindings/rust/s2n-tls-sys/README.md b/bindings/rust/extended/s2n-tls-sys/README.md similarity index 100% rename from bindings/rust/s2n-tls-sys/README.md rename to bindings/rust/extended/s2n-tls-sys/README.md diff --git a/bindings/rust/s2n-tls-sys/build.rs b/bindings/rust/extended/s2n-tls-sys/build.rs similarity index 100% rename from bindings/rust/s2n-tls-sys/build.rs rename to bindings/rust/extended/s2n-tls-sys/build.rs diff --git a/bindings/rust/s2n-tls-sys/src/lib.rs b/bindings/rust/extended/s2n-tls-sys/src/lib.rs similarity index 100% rename from bindings/rust/s2n-tls-sys/src/lib.rs rename to bindings/rust/extended/s2n-tls-sys/src/lib.rs diff --git a/bindings/rust/s2n-tls-sys/templates/Cargo.template b/bindings/rust/extended/s2n-tls-sys/templates/Cargo.template similarity index 100% rename from bindings/rust/s2n-tls-sys/templates/Cargo.template rename to bindings/rust/extended/s2n-tls-sys/templates/Cargo.template diff --git a/bindings/rust/s2n-tls-sys/templates/features.template b/bindings/rust/extended/s2n-tls-sys/templates/features.template similarity index 100% rename from bindings/rust/s2n-tls-sys/templates/features.template rename to bindings/rust/extended/s2n-tls-sys/templates/features.template diff --git a/bindings/rust/s2n-tls-sys/tests/s2n_init.rs b/bindings/rust/extended/s2n-tls-sys/tests/s2n_init.rs similarity index 100% rename from bindings/rust/s2n-tls-sys/tests/s2n_init.rs rename to bindings/rust/extended/s2n-tls-sys/tests/s2n_init.rs diff --git a/bindings/rust/s2n-tls-tokio/Cargo.toml b/bindings/rust/extended/s2n-tls-tokio/Cargo.toml similarity index 100% rename from bindings/rust/s2n-tls-tokio/Cargo.toml rename to bindings/rust/extended/s2n-tls-tokio/Cargo.toml diff --git a/bindings/rust/s2n-tls-tokio/README.md b/bindings/rust/extended/s2n-tls-tokio/README.md similarity index 100% rename from bindings/rust/s2n-tls-tokio/README.md rename to bindings/rust/extended/s2n-tls-tokio/README.md diff --git a/bindings/rust/s2n-tls-tokio/src/lib.rs b/bindings/rust/extended/s2n-tls-tokio/src/lib.rs similarity index 100% rename from bindings/rust/s2n-tls-tokio/src/lib.rs rename to bindings/rust/extended/s2n-tls-tokio/src/lib.rs diff --git a/bindings/rust/s2n-tls-tokio/src/task/mod.rs b/bindings/rust/extended/s2n-tls-tokio/src/task/mod.rs similarity index 100% rename from bindings/rust/s2n-tls-tokio/src/task/mod.rs rename to bindings/rust/extended/s2n-tls-tokio/src/task/mod.rs diff --git a/bindings/rust/s2n-tls-tokio/src/task/waker.rs b/bindings/rust/extended/s2n-tls-tokio/src/task/waker.rs similarity index 100% rename from bindings/rust/s2n-tls-tokio/src/task/waker.rs rename to bindings/rust/extended/s2n-tls-tokio/src/task/waker.rs diff --git a/bindings/rust/s2n-tls-tokio/src/task/waker/contract.rs b/bindings/rust/extended/s2n-tls-tokio/src/task/waker/contract.rs similarity index 100% rename from bindings/rust/s2n-tls-tokio/src/task/waker/contract.rs rename to bindings/rust/extended/s2n-tls-tokio/src/task/waker/contract.rs diff --git a/bindings/rust/s2n-tls-tokio/tests/common/mod.rs b/bindings/rust/extended/s2n-tls-tokio/tests/common/mod.rs similarity index 100% rename from bindings/rust/s2n-tls-tokio/tests/common/mod.rs rename to bindings/rust/extended/s2n-tls-tokio/tests/common/mod.rs diff --git a/bindings/rust/s2n-tls-tokio/tests/common/stream.rs b/bindings/rust/extended/s2n-tls-tokio/tests/common/stream.rs similarity index 100% rename from bindings/rust/s2n-tls-tokio/tests/common/stream.rs rename to bindings/rust/extended/s2n-tls-tokio/tests/common/stream.rs diff --git a/bindings/rust/s2n-tls-tokio/tests/common/time.rs b/bindings/rust/extended/s2n-tls-tokio/tests/common/time.rs similarity index 100% rename from bindings/rust/s2n-tls-tokio/tests/common/time.rs rename to bindings/rust/extended/s2n-tls-tokio/tests/common/time.rs diff --git a/bindings/rust/s2n-tls-tokio/tests/handshake.rs b/bindings/rust/extended/s2n-tls-tokio/tests/handshake.rs similarity index 100% rename from bindings/rust/s2n-tls-tokio/tests/handshake.rs rename to bindings/rust/extended/s2n-tls-tokio/tests/handshake.rs diff --git a/bindings/rust/s2n-tls-tokio/tests/send_and_recv.rs b/bindings/rust/extended/s2n-tls-tokio/tests/send_and_recv.rs similarity index 100% rename from bindings/rust/s2n-tls-tokio/tests/send_and_recv.rs rename to bindings/rust/extended/s2n-tls-tokio/tests/send_and_recv.rs diff --git a/bindings/rust/s2n-tls-tokio/tests/shutdown.rs b/bindings/rust/extended/s2n-tls-tokio/tests/shutdown.rs similarity index 100% rename from bindings/rust/s2n-tls-tokio/tests/shutdown.rs rename to bindings/rust/extended/s2n-tls-tokio/tests/shutdown.rs diff --git a/bindings/rust/s2n-tls-tokio/tests/tcp.rs b/bindings/rust/extended/s2n-tls-tokio/tests/tcp.rs similarity index 100% rename from bindings/rust/s2n-tls-tokio/tests/tcp.rs rename to bindings/rust/extended/s2n-tls-tokio/tests/tcp.rs diff --git a/bindings/rust/s2n-tls/Cargo.toml b/bindings/rust/extended/s2n-tls/Cargo.toml similarity index 100% rename from bindings/rust/s2n-tls/Cargo.toml rename to bindings/rust/extended/s2n-tls/Cargo.toml diff --git a/bindings/rust/s2n-tls/README.md b/bindings/rust/extended/s2n-tls/README.md similarity index 100% rename from bindings/rust/s2n-tls/README.md rename to bindings/rust/extended/s2n-tls/README.md diff --git a/bindings/rust/s2n-tls/src/callbacks.rs b/bindings/rust/extended/s2n-tls/src/callbacks.rs similarity index 100% rename from bindings/rust/s2n-tls/src/callbacks.rs rename to bindings/rust/extended/s2n-tls/src/callbacks.rs diff --git a/bindings/rust/s2n-tls/src/callbacks/async_cb.rs b/bindings/rust/extended/s2n-tls/src/callbacks/async_cb.rs similarity index 100% rename from bindings/rust/s2n-tls/src/callbacks/async_cb.rs rename to bindings/rust/extended/s2n-tls/src/callbacks/async_cb.rs diff --git a/bindings/rust/s2n-tls/src/callbacks/client_hello.rs b/bindings/rust/extended/s2n-tls/src/callbacks/client_hello.rs similarity index 100% rename from bindings/rust/s2n-tls/src/callbacks/client_hello.rs rename to bindings/rust/extended/s2n-tls/src/callbacks/client_hello.rs diff --git a/bindings/rust/s2n-tls/src/callbacks/pkey.rs b/bindings/rust/extended/s2n-tls/src/callbacks/pkey.rs similarity index 100% rename from bindings/rust/s2n-tls/src/callbacks/pkey.rs rename to bindings/rust/extended/s2n-tls/src/callbacks/pkey.rs diff --git a/bindings/rust/s2n-tls/src/callbacks/session_ticket.rs b/bindings/rust/extended/s2n-tls/src/callbacks/session_ticket.rs similarity index 100% rename from bindings/rust/s2n-tls/src/callbacks/session_ticket.rs rename to bindings/rust/extended/s2n-tls/src/callbacks/session_ticket.rs diff --git a/bindings/rust/s2n-tls/src/cert_chain.rs b/bindings/rust/extended/s2n-tls/src/cert_chain.rs similarity index 100% rename from bindings/rust/s2n-tls/src/cert_chain.rs rename to bindings/rust/extended/s2n-tls/src/cert_chain.rs diff --git a/bindings/rust/s2n-tls/src/client_hello.rs b/bindings/rust/extended/s2n-tls/src/client_hello.rs similarity index 100% rename from bindings/rust/s2n-tls/src/client_hello.rs rename to bindings/rust/extended/s2n-tls/src/client_hello.rs diff --git a/bindings/rust/s2n-tls/src/config.rs b/bindings/rust/extended/s2n-tls/src/config.rs similarity index 100% rename from bindings/rust/s2n-tls/src/config.rs rename to bindings/rust/extended/s2n-tls/src/config.rs diff --git a/bindings/rust/s2n-tls/src/connection.rs b/bindings/rust/extended/s2n-tls/src/connection.rs similarity index 100% rename from bindings/rust/s2n-tls/src/connection.rs rename to bindings/rust/extended/s2n-tls/src/connection.rs diff --git a/bindings/rust/s2n-tls/src/connection/builder.rs b/bindings/rust/extended/s2n-tls/src/connection/builder.rs similarity index 100% rename from bindings/rust/s2n-tls/src/connection/builder.rs rename to bindings/rust/extended/s2n-tls/src/connection/builder.rs diff --git a/bindings/rust/s2n-tls/src/enums.rs b/bindings/rust/extended/s2n-tls/src/enums.rs similarity index 100% rename from bindings/rust/s2n-tls/src/enums.rs rename to bindings/rust/extended/s2n-tls/src/enums.rs diff --git a/bindings/rust/s2n-tls/src/error.rs b/bindings/rust/extended/s2n-tls/src/error.rs similarity index 100% rename from bindings/rust/s2n-tls/src/error.rs rename to bindings/rust/extended/s2n-tls/src/error.rs diff --git a/bindings/rust/s2n-tls/src/fingerprint.rs b/bindings/rust/extended/s2n-tls/src/fingerprint.rs similarity index 100% rename from bindings/rust/s2n-tls/src/fingerprint.rs rename to bindings/rust/extended/s2n-tls/src/fingerprint.rs diff --git a/bindings/rust/s2n-tls/src/init.rs b/bindings/rust/extended/s2n-tls/src/init.rs similarity index 100% rename from bindings/rust/s2n-tls/src/init.rs rename to bindings/rust/extended/s2n-tls/src/init.rs diff --git a/bindings/rust/s2n-tls/src/lib.rs b/bindings/rust/extended/s2n-tls/src/lib.rs similarity index 100% rename from bindings/rust/s2n-tls/src/lib.rs rename to bindings/rust/extended/s2n-tls/src/lib.rs diff --git a/bindings/rust/s2n-tls/src/pool.rs b/bindings/rust/extended/s2n-tls/src/pool.rs similarity index 100% rename from bindings/rust/s2n-tls/src/pool.rs rename to bindings/rust/extended/s2n-tls/src/pool.rs diff --git a/bindings/rust/s2n-tls/src/renegotiate.rs b/bindings/rust/extended/s2n-tls/src/renegotiate.rs similarity index 100% rename from bindings/rust/s2n-tls/src/renegotiate.rs rename to bindings/rust/extended/s2n-tls/src/renegotiate.rs diff --git a/bindings/rust/s2n-tls/src/security.rs b/bindings/rust/extended/s2n-tls/src/security.rs similarity index 100% rename from bindings/rust/s2n-tls/src/security.rs rename to bindings/rust/extended/s2n-tls/src/security.rs diff --git a/bindings/rust/s2n-tls/src/testing.rs b/bindings/rust/extended/s2n-tls/src/testing.rs similarity index 100% rename from bindings/rust/s2n-tls/src/testing.rs rename to bindings/rust/extended/s2n-tls/src/testing.rs diff --git a/bindings/rust/s2n-tls/src/testing/client_hello.rs b/bindings/rust/extended/s2n-tls/src/testing/client_hello.rs similarity index 100% rename from bindings/rust/s2n-tls/src/testing/client_hello.rs rename to bindings/rust/extended/s2n-tls/src/testing/client_hello.rs diff --git a/bindings/rust/s2n-tls/src/testing/resumption.rs b/bindings/rust/extended/s2n-tls/src/testing/resumption.rs similarity index 100% rename from bindings/rust/s2n-tls/src/testing/resumption.rs rename to bindings/rust/extended/s2n-tls/src/testing/resumption.rs diff --git a/bindings/rust/s2n-tls/src/testing/s2n_tls.rs b/bindings/rust/extended/s2n-tls/src/testing/s2n_tls.rs similarity index 100% rename from bindings/rust/s2n-tls/src/testing/s2n_tls.rs rename to bindings/rust/extended/s2n-tls/src/testing/s2n_tls.rs diff --git a/bindings/rust/bench/.gitignore b/bindings/rust/standard/bench/.gitignore similarity index 100% rename from bindings/rust/bench/.gitignore rename to bindings/rust/standard/bench/.gitignore diff --git a/bindings/rust/bench/Cargo.toml b/bindings/rust/standard/bench/Cargo.toml similarity index 100% rename from bindings/rust/bench/Cargo.toml rename to bindings/rust/standard/bench/Cargo.toml diff --git a/bindings/rust/bench/README.md b/bindings/rust/standard/bench/README.md similarity index 100% rename from bindings/rust/bench/README.md rename to bindings/rust/standard/bench/README.md diff --git a/bindings/rust/bench/benches/connection_creation.rs b/bindings/rust/standard/bench/benches/connection_creation.rs similarity index 100% rename from bindings/rust/bench/benches/connection_creation.rs rename to bindings/rust/standard/bench/benches/connection_creation.rs diff --git a/bindings/rust/bench/benches/handshake.rs b/bindings/rust/standard/bench/benches/handshake.rs similarity index 100% rename from bindings/rust/bench/benches/handshake.rs rename to bindings/rust/standard/bench/benches/handshake.rs diff --git a/bindings/rust/bench/benches/resumption.rs b/bindings/rust/standard/bench/benches/resumption.rs similarity index 100% rename from bindings/rust/bench/benches/resumption.rs rename to bindings/rust/standard/bench/benches/resumption.rs diff --git a/bindings/rust/bench/benches/throughput.rs b/bindings/rust/standard/bench/benches/throughput.rs similarity index 100% rename from bindings/rust/bench/benches/throughput.rs rename to bindings/rust/standard/bench/benches/throughput.rs diff --git a/bindings/rust/bench/certs/ecdsa256 b/bindings/rust/standard/bench/certs/ecdsa256 similarity index 100% rename from bindings/rust/bench/certs/ecdsa256 rename to bindings/rust/standard/bench/certs/ecdsa256 diff --git a/bindings/rust/bench/certs/ecdsa384 b/bindings/rust/standard/bench/certs/ecdsa384 similarity index 100% rename from bindings/rust/bench/certs/ecdsa384 rename to bindings/rust/standard/bench/certs/ecdsa384 diff --git a/bindings/rust/bench/certs/readme.md b/bindings/rust/standard/bench/certs/readme.md similarity index 100% rename from bindings/rust/bench/certs/readme.md rename to bindings/rust/standard/bench/certs/readme.md diff --git a/bindings/rust/bench/certs/rsa2048 b/bindings/rust/standard/bench/certs/rsa2048 similarity index 100% rename from bindings/rust/bench/certs/rsa2048 rename to bindings/rust/standard/bench/certs/rsa2048 diff --git a/bindings/rust/bench/certs/rsa3072 b/bindings/rust/standard/bench/certs/rsa3072 similarity index 100% rename from bindings/rust/bench/certs/rsa3072 rename to bindings/rust/standard/bench/certs/rsa3072 diff --git a/bindings/rust/bench/certs/rsa4096 b/bindings/rust/standard/bench/certs/rsa4096 similarity index 100% rename from bindings/rust/bench/certs/rsa4096 rename to bindings/rust/standard/bench/certs/rsa4096 diff --git a/bindings/rust/bench/rust-toolchain b/bindings/rust/standard/bench/rust-toolchain similarity index 100% rename from bindings/rust/bench/rust-toolchain rename to bindings/rust/standard/bench/rust-toolchain diff --git a/bindings/rust/bench/src/harness/io.rs b/bindings/rust/standard/bench/src/harness/io.rs similarity index 100% rename from bindings/rust/bench/src/harness/io.rs rename to bindings/rust/standard/bench/src/harness/io.rs diff --git a/bindings/rust/bench/src/harness/mod.rs b/bindings/rust/standard/bench/src/harness/mod.rs similarity index 100% rename from bindings/rust/bench/src/harness/mod.rs rename to bindings/rust/standard/bench/src/harness/mod.rs diff --git a/bindings/rust/bench/src/lib.rs b/bindings/rust/standard/bench/src/lib.rs similarity index 100% rename from bindings/rust/bench/src/lib.rs rename to bindings/rust/standard/bench/src/lib.rs diff --git a/bindings/rust/bench/src/openssl.rs b/bindings/rust/standard/bench/src/openssl.rs similarity index 100% rename from bindings/rust/bench/src/openssl.rs rename to bindings/rust/standard/bench/src/openssl.rs diff --git a/bindings/rust/bench/src/rustls.rs b/bindings/rust/standard/bench/src/rustls.rs similarity index 100% rename from bindings/rust/bench/src/rustls.rs rename to bindings/rust/standard/bench/src/rustls.rs diff --git a/bindings/rust/bench/src/s2n_tls.rs b/bindings/rust/standard/bench/src/s2n_tls.rs similarity index 100% rename from bindings/rust/bench/src/s2n_tls.rs rename to bindings/rust/standard/bench/src/s2n_tls.rs diff --git a/bindings/rust/standard/certs/cert.pem b/bindings/rust/standard/certs/cert.pem new file mode 100644 index 00000000000..648d70d1d1f --- /dev/null +++ b/bindings/rust/standard/certs/cert.pem @@ -0,0 +1,14 @@ +-----BEGIN CERTIFICATE----- +MIICLDCCAdOgAwIBAgIUTihKtj/RM4hq5r9fmryUGwDlYC4wCgYIKoZIzj0EAwIw +azELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkFaMQ4wDAYDVQQHDAVUZW1wZTEPMA0G +A1UECgwGQW1hem9uMRowGAYDVQQLDBFBbWF6b25XZWJTZXJ2aWNlczESMBAGA1UE +AwwJbG9jYWxob3N0MCAXDTIzMDUyNDA2MjYyN1oYDzIxMjMwNDMwMDYyNjI3WjBr +MQswCQYDVQQGEwJVUzELMAkGA1UECAwCQVoxDjAMBgNVBAcMBVRlbXBlMQ8wDQYD +VQQKDAZBbWF6b24xGjAYBgNVBAsMEUFtYXpvbldlYlNlcnZpY2VzMRIwEAYDVQQD +DAlsb2NhbGhvc3QwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAS4be8OVofY925i +AVfv2brqeJF55DeUSP3Q1cUI3QhPxw8ZFBTg25rnYsbpGQBsW1iSmE6v1YHGlmf5 +mAbhoAKJo1MwUTAdBgNVHQ4EFgQUCpoWu/Qw0+c9wyejGR0n16FNofwwHwYDVR0j +BBgwFoAUCpoWu/Qw0+c9wyejGR0n16FNofwwDwYDVR0TAQH/BAUwAwEB/zAKBggq +hkjOPQQDAgNHADBEAiBdYxkSxWkqaY6fv4QhNVPX8pNysB02lHBoLR2yVFf7MwIg +f+86G4gdpIi8tGO7Q217BAIpsWwCMrYw7O41ltGHOog= +-----END CERTIFICATE----- diff --git a/bindings/rust/standard/certs/cert_localhost_ipv6.pem b/bindings/rust/standard/certs/cert_localhost_ipv6.pem new file mode 100644 index 00000000000..2c3ae7365f7 --- /dev/null +++ b/bindings/rust/standard/certs/cert_localhost_ipv6.pem @@ -0,0 +1,23 @@ +-----BEGIN CERTIFICATE----- +MIID2DCCAsCgAwIBAgIUT1hXpXZFhpbeq6UkbqlnOKAeUoowDQYJKoZIhvcNAQEL +BQAwbDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAk1BMQ8wDQYDVQQHDAZCb3N0b24x +DzANBgNVBAoMBkFtYXpvbjEaMBgGA1UECwwRQW1hem9uV2ViU2VydmljZXMxEjAQ +BgNVBAMMCWxvY2FsaG9zdDAgFw0yNDExMjYwNDUyNDdaGA8yMTI0MTEwMjA0NTI0 +N1owbDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAk1BMQ8wDQYDVQQHDAZCb3N0b24x +DzANBgNVBAoMBkFtYXpvbjEaMBgGA1UECwwRQW1hem9uV2ViU2VydmljZXMxEjAQ +BgNVBAMMCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB +AKE6vnPsBDz69ET25yWSikTchned2PvOzZ9zOd7jtQM7A504jHGMOoyXsZaLF+R2 +6M4Fo/7sWQfPImbrfDELIGoZo9V/DbJoETgmEsE6rSj2poEF46ZbNWa0THBNko0O +q3zgpwPmUPtPTF3QHH0JC/Kbm7V9S4yVx4Qit7GSPUr9Cgj3MJF6MAZqi29LpgSK +uMQ1bf6T9t6F5hNH3A4T5dfjtjcQczDhbnkKCUFa8DbOR+5vecQQjI6vJoK3suIU +xS4U6rNRhLYL+grswpqVh2AXI3qsl12jhcer7hbRovRM8MQkDCPnLDb9Chm2zVWW +5HgkUbtsZrpldrWoVdNihqUCAwEAAaNwMG4wHQYDVR0OBBYEFE6+x/LP/KNspKSj +uOY77KG+u/eAMB8GA1UdIwQYMBaAFE6+x/LP/KNspKSjuOY77KG+u/eAMA8GA1Ud +EwEB/wQFMAMBAf8wGwYDVR0RBBQwEocQAAAAAAAAAAAAAAAAAAAAATANBgkqhkiG +9w0BAQsFAAOCAQEAE//QpOTdTJfc2OM+/kilicGx/PiV3WjiqoaeQo6uUd7cD7wD +6JuXABtUSndfkxryeQzKQmq2KBedbQCOKnt/OeY0yMqCxbws3l3H+uwPwwAACIUn +3e5+RtotiQQBreSiHJJ6omFpd+cyvluZwZ20t3dhlgGU5NUN3zcHkdc8hGpaxtfJ +AaunssA40QcjQFQYI8ADTiQHW20rZcsVRKkwRkNVps/vMDpLBCyBp96xhTAtkoDH +Xs/Zi1bJiJ8xw3TkDeJFShpP+cQPYHI36qWqNjTei9eHrNX8sNFAdNZVyitoZ3/W +FrPdms/ivlvgQbWWB3EKxD+PsQXoYvjkGhMNmg== +-----END CERTIFICATE----- diff --git a/bindings/rust/standard/certs/cert_rsa.pem b/bindings/rust/standard/certs/cert_rsa.pem new file mode 100644 index 00000000000..8aa428c638c --- /dev/null +++ b/bindings/rust/standard/certs/cert_rsa.pem @@ -0,0 +1,33 @@ +-----BEGIN CERTIFICATE----- +MIIFqzCCA5OgAwIBAgIUPecTUedBPhAjrzsM16hwH5f/8HswDQYJKoZIhvcNAQEL +BQAwZDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkFaMQ4wDAYDVQQHDAVUZW1wZTEN +MAsGA1UECgwETWFhczEVMBMGA1UECwwMQmlvQ29tcHV0aW5nMRIwEAYDVQQDDAls +b2NhbGhvc3QwIBcNMjMwNTI0MDYyNjI3WhgPMjEyMzA0MzAwNjI2MjdaMGQxCzAJ +BgNVBAYTAlVTMQswCQYDVQQIDAJBWjEOMAwGA1UEBwwFVGVtcGUxDTALBgNVBAoM +BE1hYXMxFTATBgNVBAsMDEJpb0NvbXB1dGluZzESMBAGA1UEAwwJbG9jYWxob3N0 +MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAnflx61sSH4pF9AmdOR3r +ilFM9Z1RIZ4aZXk5Dov9UP4KykCIFC12I7wryyKHH5PoKjKKtYW+4G/lAOw/O7kP +6oDfbcQbH3E5LCT7k2a+tOwxywxmsQFpK/YCicKxkFvbKqfbb+S5U9CZ9Rmx3jGh +FldIVXYrkdq2AfFu7U0BB5rdDQLBx1GAZjtmDjP9dpPe0GuukInHqaogO9d08x2O +3WN3grxdj2NN0tjaR6/S+a1L4vwcybJ5UZ8Zq8Bd41YR6uPNJSjABcXHXAlxR83t +ENNRKl8m8uP4SqFgpmFBHHmXviyVirZRpVudWG2Zkk6WSTj+cwDlcXYucVO6cmkS +/FQsslXn2YAYDiSsuthl4UGTXyWbxskAwx65ERHZ2CwOix6TIKxB0lOGVIuoT7Hj +q6gqFRxrjAQwUk76z+j/NFwZhAe0b5G0uyHcgPuaJMI9BpzvwpqgMNSMlbeH8rd3 +LsLOeCFrVcQzrYqS/aLB/FRE7QxkZutuRgAG5N3sBhxJNizROBzCd+zUEpJi2ZgH +eFstYAL4sXEh4m/7uXxMROO9rFqpZXiYocYipfddjjZ6NF3RIIfQG/Ubydm2YJe5 +s3o3Q2nGuBY6l0KXJvq1uX3B5JmFcVr0eiWbZ4UZioJbZ40JEUx7ECNZqooC7QjT +EeQZXwEfvUotP5lvAFEFK5MCAwEAAaNTMFEwHQYDVR0OBBYEFFRIP81Ul8Um6h8u +ru05X1QGuPceMB8GA1UdIwQYMBaAFFRIP81Ul8Um6h8uru05X1QGuPceMA8GA1Ud +EwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAIBDHQC3LfuH1YVieC0100IV +4tpSiQ63n5TItLRPxpPMjohAC1ZggQjU1/rVeBkP/x2dBQFgPpRXBFye9iavUVBt +xXj06Rm8kdLwF3KZHECDQArztdYqogmvXtxx5WA23nhua5NwUV6jM5i7EV7d/Bcp ++wGZKaze6fBR4Wh9FkIh9HG2tIOgJibLI33JAFjxkdY6bYoqDSUzlKZmUCMpxrXF +Zg/vYhBnBss2uvF9Ce+6Nedxgourjyma6MiH7QPwMM3Cr1rWTnG5C7MBhm4Q13Xr +LeaOayTE2JChXwyXqBjrctPs5GCbAJJFovQphyJhxNTXzHxMRu4MBCl3jFT2lzIi +r6DkgoQ3tuy5C3i4ZWNZUjqFrCu1uIeGYb9x+Wzv9/i370juF+aO5zJC3mp8bKsU +zdFQE8/q9ltuiazueCGPkFoVEVmLFICIckV6q+zh/ahXcdbSf8JxDGXElXhDK6Z3 +2axo2m5f/x77FREZCmyVA9I8fYDo3A7srGgkwMc+isdrbzytSC2KKo4/XnpvIRWo +vvKKslTzyaMoSv3i9qj23kWowRKqrguCs0wG1d7QiCRdEAsFO+MZPzsde5zKqcQ1 +AC8kSUZrFRjFfZfc0JAB7pI6BSlVwzVItdIdlA9jzEZr2c7430djTyidyTKiWj3D +FkfWZeLWo9l/1vC+Qyeo +-----END CERTIFICATE----- diff --git a/bindings/rust/standard/certs/generate.sh b/bindings/rust/standard/certs/generate.sh new file mode 100755 index 00000000000..982ff12cc60 --- /dev/null +++ b/bindings/rust/standard/certs/generate.sh @@ -0,0 +1,27 @@ +# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +# SPDX-License-Identifier: Apache-2.0 + +# This script will generate all of the certs used for examples and tests in +# the rust bindings crates. + +# Used for TLS 1.2 connections. +echo "generating rsa key and cert" +openssl req -x509 -newkey rsa:4096 -keyout key_rsa.pem -out cert_rsa.pem -sha256 -days 36500 -nodes -subj "/C=US/ST=AZ/L=Tempe/O=Maas/OU=BioComputing/CN=localhost" + + +# Used for TLS 1.3 connections. +echo "generating ec key and cert" +openssl req -x509 -newkey ec -pkeyopt ec_paramgen_curve:P-256 -keyout key.pem -out cert.pem -sha256 -days 36500 -nodes -subj "/C=US/ST=AZ/L=Tempe/O=Amazon/OU=AmazonWebServices/CN=localhost" + + +# Used for testing IPv6. Includes the localhost IPv6 address as a SAN. +echo "generating localhost IPv6 key and cert" +openssl req -x509 \ + -newkey rsa:2048 \ + -keyout key_localhost_ipv6.pem \ + -out cert_localhost_ipv6.pem \ + -sha256 \ + -days 36500 \ + -nodes \ + -subj "/C=US/ST=MA/L=Boston/O=Amazon/OU=AmazonWebServices/CN=localhost" \ + -addext "subjectAltName = IP:0:0:0:0:0:0:0:1" diff --git a/bindings/rust/standard/certs/key.pem b/bindings/rust/standard/certs/key.pem new file mode 100644 index 00000000000..ecd0a4215a6 --- /dev/null +++ b/bindings/rust/standard/certs/key.pem @@ -0,0 +1,5 @@ +-----BEGIN PRIVATE KEY----- +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg7CYotHO5H76smTyL +DHb6esNVfzBEDAi+vZMvtM2SItahRANCAAS4be8OVofY925iAVfv2brqeJF55DeU +SP3Q1cUI3QhPxw8ZFBTg25rnYsbpGQBsW1iSmE6v1YHGlmf5mAbhoAKJ +-----END PRIVATE KEY----- diff --git a/bindings/rust/standard/certs/key_localhost_ipv6.pem b/bindings/rust/standard/certs/key_localhost_ipv6.pem new file mode 100644 index 00000000000..57b8152ef0b --- /dev/null +++ b/bindings/rust/standard/certs/key_localhost_ipv6.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQChOr5z7AQ8+vRE +9uclkopE3IZ3ndj7zs2fczne47UDOwOdOIxxjDqMl7GWixfkdujOBaP+7FkHzyJm +63wxCyBqGaPVfw2yaBE4JhLBOq0o9qaBBeOmWzVmtExwTZKNDqt84KcD5lD7T0xd +0Bx9CQvym5u1fUuMlceEIrexkj1K/QoI9zCRejAGaotvS6YEirjENW3+k/beheYT +R9wOE+XX47Y3EHMw4W55CglBWvA2zkfub3nEEIyOryaCt7LiFMUuFOqzUYS2C/oK +7MKalYdgFyN6rJddo4XHq+4W0aL0TPDEJAwj5yw2/QoZts1VluR4JFG7bGa6ZXa1 +qFXTYoalAgMBAAECggEAOmyjnDUv+fsEbkM8UrCt+zMgZRMlkGYJvBiQpXTFYNTP +Q/c8aV8jzlOf7kocD9WJGjMQEO4LexlzwXDe8ZSzG8+Lv29JgtdUOhEN5ciB/CCZ +CJMeQee2S6/VLTLnAseIm/l6fB7HRLIhHbOuxx5ynmkF/TfYmyqhgH/mKeow3M2O +hhSigu1sIfVWAwMq7pNJ1+Dr6z4LzGVjJOBFHFt/UCSngT9NJehwF+VNU7UW2g98 +buUEwT6qgsDQCWEjLORppWMQTvZOQnPrE/fBf7t/QCLZ42I0y155jrMYXJIx92Q4 +dqlgWmAFliLayNd1+9lJPDMG9JmA+JAv4bfSHqLMRwKBgQDXv5yA29KWVtCkzF83 +QHECOV5Fv5KE3eLP6CnZjOI7G3OqrTc/EEtvl+bXZBQa/97IAYpYVO2KDY/tVbrr +La1ArR7s/zN1OxHNcuSuL9ghD61nHTgQg9psPqvXqVD/lsMiUNu64GtU0Bw6yce5 +yf508Y8vXtm0A+riEv2H5dKtEwKBgQC/Tz5cpYCLi1riL6IthQrp22ILS7AxhPXb +h6EBBAUR3P92Bq27ArFuBOqLobF1fAeBichC2oCxWc+BPwqauJM75PNSKsXgFb/N +W2oDVjXIBk1PRc8d6QUHpl4nxphzL1W1xur/f1bIDixZUltOQjMOx1lgLQ/wwRWT +ekYU0LYMZwKBgQDLT68tI3o04ITn+Av2ZkzYmrVDJz/s46g84nylnYUHzFvYyDja +vgFInS4VZiMoOl13vzPe/9GFmjg6oOJvg3DUFRCip++XFt407IOhvkZ/CWYQWNGf +hpGMFhccOVuyMCGdMfOPDLM4jpE7uTD03Oxkycp0Cn8/i72J4/l1WleJbwKBgQCE +QkiezFx+HK2MSdoZFi1hV6YEoSMCWSWPy8hnZ1wJ6XtDIYLiEw6PPR7ZwcNpsYGO +8K5eaakm8ywd8nNmW8yOT85YM/Hw5ZhgZJ56CBPOYWz5LQ3vY7VygHX/kbC7kTH0 +Jb05PdPFIudOKT2ucN3TjcYgU4b9rr834gSpR1FUaQKBgQC4hCEX1kO/NIlJ1fBz +kHm0LKQT1ggMDRvQ+M5If7a8BqdvXdFN5V9No3DQseXMB1q3OxxbWtJwYiLOskjI +F2TC98TE9XnPaMABLB3nLBnPW2DHN5DS6A9ool48fV7nZeSUnuytgLPR3s1FrqEf +yc2ARE24uiZT4QhFoZY2TG2Vpw== +-----END PRIVATE KEY----- diff --git a/bindings/rust/standard/certs/key_rsa.pem b/bindings/rust/standard/certs/key_rsa.pem new file mode 100644 index 00000000000..a25cb4bafb5 --- /dev/null +++ b/bindings/rust/standard/certs/key_rsa.pem @@ -0,0 +1,52 @@ +-----BEGIN PRIVATE KEY----- +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 +HexuSf301dcJjvvhVwij3vhljQp8QA== +-----END PRIVATE KEY----- From 52fad503d52994c73481fc9a7d1691683c48a6e3 Mon Sep 17 00:00:00 2001 From: DougCh Date: Thu, 19 Dec 2024 22:58:52 +0000 Subject: [PATCH 11/30] fix paths for extended tests --- bindings/rust/extended/generate.sh | 20 +++++++++---------- bindings/rust/extended/s2n-tls/src/testing.rs | 2 +- bindings/rust/standard/Cargo.toml | 1 + bindings/rust/standard/bench/Cargo.toml | 2 +- bindings/rust/standard/integration/Cargo.toml | 6 +++--- .../rust/standard/s2n-tls-hyper/Cargo.toml | 4 ++-- 6 files changed, 18 insertions(+), 17 deletions(-) diff --git a/bindings/rust/extended/generate.sh b/bindings/rust/extended/generate.sh index 78ab374cb3b..db4201d95e8 100755 --- a/bindings/rust/extended/generate.sh +++ b/bindings/rust/extended/generate.sh @@ -16,21 +16,21 @@ mkdir -p s2n-tls-sys/src/features # we copy the C sources into the `lib` directory so they get published in the # actual crate artifact. cp -r \ - ../../api \ - ../../crypto \ - ../../error \ - ../../stuffer \ - ../../tls \ - ../../utils \ + ../../../api \ + ../../../crypto \ + ../../../error \ + ../../../stuffer \ + ../../../tls \ + ../../../utils \ s2n-tls-sys/lib/ cp -r \ - ../../tests/features \ + ../../../tests/features \ s2n-tls-sys/lib/tests/ cp -r \ - ../../CMakeLists.txt \ - ../../cmake \ + ../../../CMakeLists.txt \ + ../../../cmake \ s2n-tls-sys/lib/ # generate the bindings modules from the copied sources @@ -52,7 +52,7 @@ cargo publish --dry-run --allow-dirty cargo publish --dry-run --allow-dirty --all-features popd -pushd standard/integration +pushd ../standard/integration cargo run popd diff --git a/bindings/rust/extended/s2n-tls/src/testing.rs b/bindings/rust/extended/s2n-tls/src/testing.rs index 4eb74fa396b..cc5da441b4b 100644 --- a/bindings/rust/extended/s2n-tls/src/testing.rs +++ b/bindings/rust/extended/s2n-tls/src/testing.rs @@ -97,7 +97,7 @@ impl Default for CertKeyPair { impl CertKeyPair { /// This is the directory holding all of the pems used for s2n-tls unit tests const TEST_PEMS_PATH: &'static str = - concat!(env!("CARGO_MANIFEST_DIR"), "/../../../tests/pems/"); + concat!(env!("CARGO_MANIFEST_DIR"), "/../../../../tests/pems/"); /// Create a test CertKeyPair /// * `prefix`: The *relative* prefix from the s2n-tls/tests/pems/ folder. diff --git a/bindings/rust/standard/Cargo.toml b/bindings/rust/standard/Cargo.toml index b934f0cd536..43c1a15aa27 100644 --- a/bindings/rust/standard/Cargo.toml +++ b/bindings/rust/standard/Cargo.toml @@ -1,5 +1,6 @@ [workspace] members = [ + "bench", "integration", "s2n-tls-hyper" ] diff --git a/bindings/rust/standard/bench/Cargo.toml b/bindings/rust/standard/bench/Cargo.toml index ab4da6cb9d4..b8621ea1f89 100644 --- a/bindings/rust/standard/bench/Cargo.toml +++ b/bindings/rust/standard/bench/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -s2n-tls = { path = "../s2n-tls" } +s2n-tls = { path = "../../extended/s2n-tls" } errno = "0.3" libc = "0.2" strum = { version = "0.25", features = ["derive"] } diff --git a/bindings/rust/standard/integration/Cargo.toml b/bindings/rust/standard/integration/Cargo.toml index 9a9f20c1ca8..ae2f19ded2f 100644 --- a/bindings/rust/standard/integration/Cargo.toml +++ b/bindings/rust/standard/integration/Cargo.toml @@ -19,10 +19,10 @@ no-network-tests = [] pq = [] [dependencies] -s2n-tls = { path = "../../s2n-tls", features = ["unstable-testing"]} +s2n-tls = { path = "../../extended/s2n-tls", features = ["unstable-testing"]} s2n-tls-hyper = { path = "../s2n-tls-hyper" } -s2n-tls-tokio = { path = "../../s2n-tls-tokio" } -s2n-tls-sys = { path = "../../s2n-tls-sys" } +s2n-tls-tokio = { path = "../../extended/s2n-tls-tokio" } +s2n-tls-sys = { path = "../../extended/s2n-tls-sys" } [dev-dependencies] tokio = { version = "1", features = ["macros", "test-util"] } diff --git a/bindings/rust/standard/s2n-tls-hyper/Cargo.toml b/bindings/rust/standard/s2n-tls-hyper/Cargo.toml index 9855cc957e4..808862a6a4a 100644 --- a/bindings/rust/standard/s2n-tls-hyper/Cargo.toml +++ b/bindings/rust/standard/s2n-tls-hyper/Cargo.toml @@ -13,8 +13,8 @@ publish = false default = [] [dependencies] -s2n-tls = { version = "=0.3.9", path = "../../s2n-tls" } -s2n-tls-tokio = { version = "=0.3.9", path = "../../s2n-tls-tokio" } +s2n-tls = { version = "=0.3.9", path = "../../extended/s2n-tls" } +s2n-tls-tokio = { version = "=0.3.9", path = "../../extended/s2n-tls-tokio" } hyper = { version = "1" } hyper-util = { version = "0.1", features = ["client-legacy", "tokio", "http1", "http2"] } tower-service = { version = "0.3" } From 55ce66e1a3cb7cdc8e236e0fed5c19fa02f35fd3 Mon Sep 17 00:00:00 2001 From: DougCh Date: Thu, 19 Dec 2024 23:19:46 +0000 Subject: [PATCH 12/30] bump MSRV once more --- bindings/rust/standard/bench/Cargo.toml | 2 +- bindings/rust/standard/rust-toolchain | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bindings/rust/standard/bench/Cargo.toml b/bindings/rust/standard/bench/Cargo.toml index b8621ea1f89..bb4d66bb102 100644 --- a/bindings/rust/standard/bench/Cargo.toml +++ b/bindings/rust/standard/bench/Cargo.toml @@ -14,7 +14,7 @@ openssl = { version = "0.10", features = ["vendored"] } [dev-dependencies] criterion = "0.5" -pprof = { version = "0.12", features = ["criterion", "flamegraph"] } +pprof = { version = "0.14", features = ["criterion", "flamegraph"] } # env_logger and log are used to enable logging for rustls, which can help with # debugging interop failures env_logger = "0.10" diff --git a/bindings/rust/standard/rust-toolchain b/bindings/rust/standard/rust-toolchain index 832e9afb6c1..dc87e8af82f 100644 --- a/bindings/rust/standard/rust-toolchain +++ b/bindings/rust/standard/rust-toolchain @@ -1 +1 @@ -1.70.0 +1.74.0 From 9fbbcee899ec4396eaa2a4d0ff6b9fe9a5f9994d Mon Sep 17 00:00:00 2001 From: DougCh Date: Thu, 19 Dec 2024 23:23:52 +0000 Subject: [PATCH 13/30] fix cert paths --- bindings/rust/standard/s2n-tls-hyper/tests/common/mod.rs | 4 ++-- bindings/rust/standard/s2n-tls-hyper/tests/http.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bindings/rust/standard/s2n-tls-hyper/tests/common/mod.rs b/bindings/rust/standard/s2n-tls-hyper/tests/common/mod.rs index 9c6b0df30fc..2da6cdace69 100644 --- a/bindings/rust/standard/s2n-tls-hyper/tests/common/mod.rs +++ b/bindings/rust/standard/s2n-tls-hyper/tests/common/mod.rs @@ -7,8 +7,8 @@ pub mod echo; /// NOTE: this certificate and key are used for testing purposes only! pub const CERT_PEM: &[u8] = - include_bytes!(concat!(env!("CARGO_MANIFEST_DIR"), "/../../certs/cert.pem")); -pub const KEY_PEM: &[u8] = include_bytes!(concat!(env!("CARGO_MANIFEST_DIR"), "/../../certs/key.pem")); + include_bytes!(concat!(env!("CARGO_MANIFEST_DIR"), "/../certs/cert.pem")); +pub const KEY_PEM: &[u8] = include_bytes!(concat!(env!("CARGO_MANIFEST_DIR"), "/../certs/key.pem")); pub fn config() -> Result { let mut builder = config::Config::builder(); diff --git a/bindings/rust/standard/s2n-tls-hyper/tests/http.rs b/bindings/rust/standard/s2n-tls-hyper/tests/http.rs index c3f5ffb83b3..9f9b87e29a0 100644 --- a/bindings/rust/standard/s2n-tls-hyper/tests/http.rs +++ b/bindings/rust/standard/s2n-tls-hyper/tests/http.rs @@ -231,11 +231,11 @@ async fn ipv6() -> Result<(), Box> { // matches this identity. let localhost_ipv6_cert: &[u8] = include_bytes!(concat!( env!("CARGO_MANIFEST_DIR"), - "/../../certs/cert_localhost_ipv6.pem" + "/../certs/cert_localhost_ipv6.pem" )); let localhost_ipv6_key: &[u8] = include_bytes!(concat!( env!("CARGO_MANIFEST_DIR"), - "/../../certs/key_localhost_ipv6.pem" + "/../certs/key_localhost_ipv6.pem" )); let mut builder = config::Config::builder(); From 741cc4d3eb93ef82dbfc8e9b903ba971cfc2034f Mon Sep 17 00:00:00 2001 From: DougCh Date: Thu, 19 Dec 2024 23:42:10 +0000 Subject: [PATCH 14/30] Fix generate paths in GHA --- .github/workflows/ci_rust.yml | 2 +- .github/workflows/dependencies.yml | 2 +- .github/workflows/regression_ci.yml | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci_rust.yml b/.github/workflows/ci_rust.yml index 7092955cb7f..cd8ad8bc313 100644 --- a/.github/workflows/ci_rust.yml +++ b/.github/workflows/ci_rust.yml @@ -12,7 +12,7 @@ env: # Pin the nightly toolchain to prevent breakage. # This should be occasionally updated. RUST_NIGHTLY_TOOLCHAIN: nightly-2024-12-01 - ROOT_PATH: bindings/rust + ROOT_PATH: bindings/rust/extended EXAMPLE_WORKSPACE: bindings/rust-examples PCAP_TEST_PATH: tests/pcap diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml index cc5fd9d2e05..58c54b11bd6 100644 --- a/.github/workflows/dependencies.yml +++ b/.github/workflows/dependencies.yml @@ -18,7 +18,7 @@ on: - cron: "0 18 * * *" env: - ROOT_PATH: bindings/rust + ROOT_PATH: bindings/rust/extended jobs: audit: diff --git a/.github/workflows/regression_ci.yml b/.github/workflows/regression_ci.yml index 0ba35de94c8..6ffd29392af 100644 --- a/.github/workflows/regression_ci.yml +++ b/.github/workflows/regression_ci.yml @@ -14,6 +14,9 @@ on: types: [checks_requested] branches: [main] +env: + ROOT_PATH: bindings/rust/extended + jobs: regression-test: runs-on: ubuntu-latest @@ -54,7 +57,7 @@ jobs: # Generate bindings for main branch - name: Generate bindings (mainline) - run: ${{env.ROOT_PATH}}bindings/rust/generate.sh --skip-tests + run: ${{env.ROOT_PATH}}/generate.sh --skip-tests # Run performance tests using Valgrind for main branch - name: Run scalar performance test (mainline) @@ -68,7 +71,7 @@ jobs: # Generate bindings for PR branch - name: Generate bindings (PR branch) - run: ${{env.ROOT_PATH}}bindings/rust/generate.sh --skip-tests + run: ${{env.ROOT_PATH}}/generate.sh --skip-tests # Run performance tests using Valgrind for PR branch - name: Run scalar performance test (PR branch) From 2be3b36ab5752322724721ba96c938e5c015abc4 Mon Sep 17 00:00:00 2001 From: DougCh Date: Fri, 20 Dec 2024 00:31:17 +0000 Subject: [PATCH 15/30] move rust-examples --- .github/workflows/ci_rust.yml | 7 +++++-- .../client-hello-config-resolution/Cargo.toml | 4 ++-- bindings/rust-examples/tokio-server-client/Cargo.toml | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci_rust.yml b/.github/workflows/ci_rust.yml index cd8ad8bc313..04d765a98e4 100644 --- a/.github/workflows/ci_rust.yml +++ b/.github/workflows/ci_rust.yml @@ -12,7 +12,10 @@ env: # Pin the nightly toolchain to prevent breakage. # This should be occasionally updated. RUST_NIGHTLY_TOOLCHAIN: nightly-2024-12-01 + # Extended support MSRV ROOT_PATH: bindings/rust/extended + # Standard support MSRV + STANDARD_PATH: bindings/rust/standard EXAMPLE_WORKSPACE: bindings/rust-examples PCAP_TEST_PATH: tests/pcap @@ -51,7 +54,7 @@ jobs: # Test the standard workspace - name: Standard Workspace Tests - working-directory: ${{env.ROOT_PATH}}/standard + working-directory: ${{env.STANDARD_PATH}} run: cargo test - name: "Feature Tests: Fingerprint, kTLS, QUIC, and PQ" @@ -107,7 +110,7 @@ jobs: run: ${{env.ROOT_PATH}}/generate.sh --skip-tests - name: bench tests - working-directory: ${{env.ROOT_PATH}}/bench + working-directory: ${{env.standard_PATH}}/bench run: cargo test s2n-tls-binding-examples: diff --git a/bindings/rust-examples/client-hello-config-resolution/Cargo.toml b/bindings/rust-examples/client-hello-config-resolution/Cargo.toml index 96f59aa1249..94caf6849db 100644 --- a/bindings/rust-examples/client-hello-config-resolution/Cargo.toml +++ b/bindings/rust-examples/client-hello-config-resolution/Cargo.toml @@ -8,6 +8,6 @@ edition.workspace = true [dependencies] clap = { version = "4", features = ["derive"] } -s2n-tls = { path = "../../rust/s2n-tls" } -s2n-tls-tokio = { path = "../../rust/s2n-tls-tokio" } +s2n-tls = { path = "../../rust/extended/s2n-tls" } +s2n-tls-tokio = { path = "../../rust/extended/s2n-tls-tokio" } tokio = { version = "1", features = ["full"] } diff --git a/bindings/rust-examples/tokio-server-client/Cargo.toml b/bindings/rust-examples/tokio-server-client/Cargo.toml index b2fc2d0f397..f573de1768a 100644 --- a/bindings/rust-examples/tokio-server-client/Cargo.toml +++ b/bindings/rust-examples/tokio-server-client/Cargo.toml @@ -7,7 +7,7 @@ license.workspace = true edition.workspace = true [dependencies] -s2n-tls = { path = "../../rust/s2n-tls" } -s2n-tls-tokio = { path = "../../rust/s2n-tls-tokio" } +s2n-tls = { path = "../../rust/extended/s2n-tls" } +s2n-tls-tokio = { path = "../../rust/extended/s2n-tls-tokio" } tokio = { version = "1", features = ["full"] } clap = { version = "4", features = ["derive"] } From 07033db5a72d938608e7c94c1f546b6c2b1e94a0 Mon Sep 17 00:00:00 2001 From: DougCh Date: Fri, 20 Dec 2024 00:41:19 +0000 Subject: [PATCH 16/30] fix pcap GHA path --- tests/pcap/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/pcap/Cargo.toml b/tests/pcap/Cargo.toml index bb8f5fce414..04f87f0928b 100644 --- a/tests/pcap/Cargo.toml +++ b/tests/pcap/Cargo.toml @@ -23,5 +23,5 @@ rtshark = "2.9.0" [dev-dependencies] # We want to test against the latest, local version of s2n -s2n-tls-sys = { path = "../../bindings/rust/s2n-tls-sys" } -s2n-tls = { path = "../../bindings/rust/s2n-tls", features = ["unstable-fingerprint"] } +s2n-tls-sys = { path = "../../bindings/rust/extended/s2n-tls-sys" } +s2n-tls = { path = "../../bindings/rust/extended/s2n-tls", features = ["unstable-fingerprint"] } From 8fc068a8ccbe46214cffefedd9a82bb68dca6b58 Mon Sep 17 00:00:00 2001 From: DougCh Date: Fri, 20 Dec 2024 00:44:21 +0000 Subject: [PATCH 17/30] CaSe MatTerS --- .github/workflows/ci_rust.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_rust.yml b/.github/workflows/ci_rust.yml index 04d765a98e4..59974b73f7e 100644 --- a/.github/workflows/ci_rust.yml +++ b/.github/workflows/ci_rust.yml @@ -110,7 +110,7 @@ jobs: run: ${{env.ROOT_PATH}}/generate.sh --skip-tests - name: bench tests - working-directory: ${{env.standard_PATH}}/bench + working-directory: ${{env.STANDARD_PATH}}/bench run: cargo test s2n-tls-binding-examples: From c57b4dc6a3136cf4f086c00240376ef19428187f Mon Sep 17 00:00:00 2001 From: DougCh Date: Fri, 20 Dec 2024 01:01:52 +0000 Subject: [PATCH 18/30] fix cert symlink paths --- bindings/rust/standard/bench/certs/ecdsa256 | 2 +- bindings/rust/standard/bench/certs/ecdsa384 | 2 +- bindings/rust/standard/bench/certs/readme.md | 10 +++++----- bindings/rust/standard/bench/certs/rsa2048 | 2 +- bindings/rust/standard/bench/certs/rsa3072 | 2 +- bindings/rust/standard/bench/certs/rsa4096 | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/bindings/rust/standard/bench/certs/ecdsa256 b/bindings/rust/standard/bench/certs/ecdsa256 index 51083f89227..49362b6581f 120000 --- a/bindings/rust/standard/bench/certs/ecdsa256 +++ b/bindings/rust/standard/bench/certs/ecdsa256 @@ -1 +1 @@ -../../../../tests/pems/permutations/ec_ecdsa_p256_sha256 \ No newline at end of file +../../../../../tests/pems/permutations/ec_ecdsa_p256_sha256 \ No newline at end of file diff --git a/bindings/rust/standard/bench/certs/ecdsa384 b/bindings/rust/standard/bench/certs/ecdsa384 index 46bafdb4033..e381686215b 120000 --- a/bindings/rust/standard/bench/certs/ecdsa384 +++ b/bindings/rust/standard/bench/certs/ecdsa384 @@ -1 +1 @@ -../../../../tests/pems/permutations/ec_ecdsa_p384_sha384 \ No newline at end of file +../../../../../tests/pems/permutations/ec_ecdsa_p384_sha384 \ No newline at end of file diff --git a/bindings/rust/standard/bench/certs/readme.md b/bindings/rust/standard/bench/certs/readme.md index 1f154c74b6f..0cc008d7ca3 100644 --- a/bindings/rust/standard/bench/certs/readme.md +++ b/bindings/rust/standard/bench/certs/readme.md @@ -1,9 +1,9 @@ This folder actually just contains symlinks to the files in s2n-tls/test/pems/permutations ``` -ln -s ../../../../tests/pems/permutations/ec_ecdsa_p256_sha256 ecdsa256 -ln -s ../../../../tests/pems/permutations/ec_ecdsa_p384_sha384 ecdsa384 -ln -s ../../../../tests/pems/permutations/rsae_pkcs_2048_sha256 rsa2048 -ln -s ../../../../tests/pems/permutations/rsae_pkcs_3072_sha384 rsa3072 -ln -s ../../../../tests/pems/permutations/rsae_pkcs_4096_sha384 rsa4096 +ln -s ../../../../../tests/pems/permutations/ec_ecdsa_p256_sha256 ecdsa256 +ln -s ../../../../../tests/pems/permutations/ec_ecdsa_p384_sha384 ecdsa384 +ln -s ../../../../../tests/pems/permutations/rsae_pkcs_2048_sha256 rsa2048 +ln -s ../../../../../tests/pems/permutations/rsae_pkcs_3072_sha384 rsa3072 +ln -s ../../../../../tests/pems/permutations/rsae_pkcs_4096_sha384 rsa4096 ``` diff --git a/bindings/rust/standard/bench/certs/rsa2048 b/bindings/rust/standard/bench/certs/rsa2048 index b87fbc80028..c1ca5cdf76d 120000 --- a/bindings/rust/standard/bench/certs/rsa2048 +++ b/bindings/rust/standard/bench/certs/rsa2048 @@ -1 +1 @@ -../../../../tests/pems/permutations/rsae_pkcs_2048_sha256 \ No newline at end of file +../../../../../tests/pems/permutations/rsae_pkcs_2048_sha256 \ No newline at end of file diff --git a/bindings/rust/standard/bench/certs/rsa3072 b/bindings/rust/standard/bench/certs/rsa3072 index a168bb3f8a5..09c414fd448 120000 --- a/bindings/rust/standard/bench/certs/rsa3072 +++ b/bindings/rust/standard/bench/certs/rsa3072 @@ -1 +1 @@ -../../../../tests/pems/permutations/rsae_pkcs_3072_sha384 \ No newline at end of file +../../../../../tests/pems/permutations/rsae_pkcs_3072_sha384 \ No newline at end of file diff --git a/bindings/rust/standard/bench/certs/rsa4096 b/bindings/rust/standard/bench/certs/rsa4096 index 7086e5a73f2..391d9e91841 120000 --- a/bindings/rust/standard/bench/certs/rsa4096 +++ b/bindings/rust/standard/bench/certs/rsa4096 @@ -1 +1 @@ -../../../../tests/pems/permutations/rsae_pkcs_4096_sha384 \ No newline at end of file +../../../../../tests/pems/permutations/rsae_pkcs_4096_sha384 \ No newline at end of file From 26c1c57e2dc96ed3a1ddfee8068ac085276414c3 Mon Sep 17 00:00:00 2001 From: DougCh Date: Fri, 20 Dec 2024 01:24:18 +0000 Subject: [PATCH 19/30] move README; fix var --- .github/workflows/ci_rust.yml | 2 +- bindings/{rust => }/README.md | 21 ++++++++++++++++++--- 2 files changed, 19 insertions(+), 4 deletions(-) rename bindings/{rust => }/README.md (55%) diff --git a/.github/workflows/ci_rust.yml b/.github/workflows/ci_rust.yml index 59974b73f7e..11cf0df5522 100644 --- a/.github/workflows/ci_rust.yml +++ b/.github/workflows/ci_rust.yml @@ -67,7 +67,7 @@ jobs: run: cargo test --features unstable-renegotiate - name: Network-enabled integration tests - working-directory: ${{env.ROOT_PATH}}/standard/integration + working-directory: ${{env.STANDARD_PATH}}/integration # no-default-features is used because network tests are hidden behind a # default "negative" feature. This is because we don't want network tests # invoked on the `cargo test --all-features` pattern. diff --git a/bindings/rust/README.md b/bindings/README.md similarity index 55% rename from bindings/rust/README.md rename to bindings/README.md index 37ff3ff51ed..0817beba9f4 100644 --- a/bindings/rust/README.md +++ b/bindings/README.md @@ -17,7 +17,7 @@ In order to generate rust bindings for s2n-tls, you need to have the following i Generating rust bindings can be accomplished by running the `generate.sh` script: ``` -$ ./bindings/rust/generate.sh +$ ./bindings/rust/extended/generate.sh ``` This script generates the low-level bindings in the crate `s2n-tls-sys`, which is used by the `s2n-tls` crate to provide higher-level bindings. @@ -25,7 +25,22 @@ See [s2n-tls-sys](https://github.com/aws/s2n-tls/blob/main/bindings/rust/s2n-tls ## Minimum Supported Rust Version (MSRV) -`s2n-tls` will maintain a rolling MSRV (minimum supported rust version) policy of at least 6 months. The current s2n-quic version is not guaranteed to build on Rust versions earlier than the MSRV. +There are three workspaces, with slightly different MSRV policies, to keep broad support for the bindings, while allowing newer MSRV for integrations, like `s2n-tls-hyper`. + +### Extended + +The current MSRV for `s2n-tls`, `s2n-tls-sys` and `s2n-tls-tokio` is [1.63.0][msrv-url]. + +### Standard + +We will maintain a rolling MSRV (minimum supported rust version) policy of at least 6 months. The current s2n-quic version is not guaranteed to build on Rust versions earlier than the MSRV. + +The current MSRV for the standard workspace is [1.74.0][msrv-url]. + +### Rust Examples + +The current MSRV for the Rust Examples workspace is [stable][msrv-url]. + + -The current MSRV is [1.63.0][msrv-url]. From fe70621e741dec3ed0e28342589d61f097052db4 Mon Sep 17 00:00:00 2001 From: DougCh Date: Fri, 20 Dec 2024 01:25:38 +0000 Subject: [PATCH 20/30] make MSRV match workspace --- bindings/rust/standard/s2n-tls-hyper/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bindings/rust/standard/s2n-tls-hyper/Cargo.toml b/bindings/rust/standard/s2n-tls-hyper/Cargo.toml index 808862a6a4a..75a95007129 100644 --- a/bindings/rust/standard/s2n-tls-hyper/Cargo.toml +++ b/bindings/rust/standard/s2n-tls-hyper/Cargo.toml @@ -4,7 +4,7 @@ description = "A compatbility crate allowing s2n-tls to be used with the hyper H version = "0.0.1" authors = ["AWS s2n"] edition = "2021" -rust-version = "1.70.0" +rust-version = "1.74.0" repository = "https://github.com/aws/s2n-tls" license = "Apache-2.0" publish = false From a28a7cf228da20deae3632917dd8294b6d3b64c8 Mon Sep 17 00:00:00 2001 From: Doug Chapman <54039637+dougch@users.noreply.github.com> Date: Fri, 20 Dec 2024 10:45:00 -0800 Subject: [PATCH 21/30] Update bindings/README.md Co-authored-by: Sam Clark <3758302+goatgoose@users.noreply.github.com> --- bindings/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bindings/README.md b/bindings/README.md index 0817beba9f4..b1f45dae70c 100644 --- a/bindings/README.md +++ b/bindings/README.md @@ -25,7 +25,7 @@ See [s2n-tls-sys](https://github.com/aws/s2n-tls/blob/main/bindings/rust/s2n-tls ## Minimum Supported Rust Version (MSRV) -There are three workspaces, with slightly different MSRV policies, to keep broad support for the bindings, while allowing newer MSRV for integrations, like `s2n-tls-hyper`. +There are two rust bindings workspaces that have different MSRV policies. Crates in `standard` maintain a rolling MSRV policy of at least 6 months. Crates in `extended` maintain an older MSRV for increased support. ### Extended From 0cf71cecb3aa48d304a49a9965a4e63524a8cf87 Mon Sep 17 00:00:00 2001 From: DougCh Date: Fri, 20 Dec 2024 19:30:26 +0000 Subject: [PATCH 22/30] Fix msrv-url; more PR feedback --- .github/workflows/ci_rust.yml | 2 +- bindings/README.md | 6 +++--- bindings/rust/standard/.gitignore | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 bindings/rust/standard/.gitignore diff --git a/.github/workflows/ci_rust.yml b/.github/workflows/ci_rust.yml index 11cf0df5522..b8a0acb362c 100644 --- a/.github/workflows/ci_rust.yml +++ b/.github/workflows/ci_rust.yml @@ -91,7 +91,7 @@ jobs: cd ${{env.ROOT_PATH}} ./generate.sh - ldd standard/target/debug/integration | grep libs2n.so + ldd ${{env.STANDARD_PATH}}/target/debug/integration | grep libs2n.so # our benchmark testing includes interop tests between s2n-tls, rustls, and # openssl diff --git a/bindings/README.md b/bindings/README.md index b1f45dae70c..a74d880cd76 100644 --- a/bindings/README.md +++ b/bindings/README.md @@ -29,17 +29,17 @@ There are two rust bindings workspaces that have different MSRV policies. Crates ### Extended -The current MSRV for `s2n-tls`, `s2n-tls-sys` and `s2n-tls-tokio` is [1.63.0][msrv-url]. +The current MSRV for `s2n-tls`, `s2n-tls-sys` and `s2n-tls-tokio` is [1.63.0](https://releases.rs/docs/1.63.0/). ### Standard We will maintain a rolling MSRV (minimum supported rust version) policy of at least 6 months. The current s2n-quic version is not guaranteed to build on Rust versions earlier than the MSRV. -The current MSRV for the standard workspace is [1.74.0][msrv-url]. +The current MSRV for the standard workspace is [1.74.0](https://releases.rs/docs/1.74.0/) ### Rust Examples -The current MSRV for the Rust Examples workspace is [stable][msrv-url]. +The current MSRV for the Rust Examples workspace is [stable](https://releases.rs/). diff --git a/bindings/rust/standard/.gitignore b/bindings/rust/standard/.gitignore new file mode 100644 index 00000000000..2c96eb1b651 --- /dev/null +++ b/bindings/rust/standard/.gitignore @@ -0,0 +1,2 @@ +target/ +Cargo.lock From ce46cd6f811a6719a1f192ea242b95a510de678a Mon Sep 17 00:00:00 2001 From: DougCh Date: Fri, 20 Dec 2024 20:06:09 +0000 Subject: [PATCH 23/30] fix GHA paths --- .github/workflows/ci_rust.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci_rust.yml b/.github/workflows/ci_rust.yml index b8a0acb362c..4ab5916337f 100644 --- a/.github/workflows/ci_rust.yml +++ b/.github/workflows/ci_rust.yml @@ -91,6 +91,8 @@ jobs: cd ${{env.ROOT_PATH}} ./generate.sh + # Relative paths + cd ../../.. ldd ${{env.STANDARD_PATH}}/target/debug/integration | grep libs2n.so # our benchmark testing includes interop tests between s2n-tls, rustls, and From ee8fda1acd771d0a1a0774d31fb03ba845298126 Mon Sep 17 00:00:00 2001 From: DougCh Date: Fri, 20 Dec 2024 20:27:10 +0000 Subject: [PATCH 24/30] additional Readme --- bindings/README.md | 39 +++------------------------------------ bindings/rust/README.md | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 36 deletions(-) create mode 100644 bindings/rust/README.md diff --git a/bindings/README.md b/bindings/README.md index a74d880cd76..599b5378999 100644 --- a/bindings/README.md +++ b/bindings/README.md @@ -1,41 +1,8 @@ -# s2n-tls rust bindings +# s2n-tls rust workspaces -**NOTICE: These bindings are currently subject to change and should not be used without the expectation -of future breakage.** +### Rust -## Installation - -In order to generate rust bindings for s2n-tls, you need to have the following installed: - -* Rust - this can be easily installed with [rustup](https://rustup.rs/) -* libclang - this is usually installed through your system's package manager -* libssl-dev -* pkg-config - -## Usage - -Generating rust bindings can be accomplished by running the `generate.sh` script: - -``` -$ ./bindings/rust/extended/generate.sh -``` - -This script generates the low-level bindings in the crate `s2n-tls-sys`, which is used by the `s2n-tls` crate to provide higher-level bindings. -See [s2n-tls-sys](https://github.com/aws/s2n-tls/blob/main/bindings/rust/s2n-tls-sys/README.md) for more information on `s2n-tls-sys` crate. - -## Minimum Supported Rust Version (MSRV) - -There are two rust bindings workspaces that have different MSRV policies. Crates in `standard` maintain a rolling MSRV policy of at least 6 months. Crates in `extended` maintain an older MSRV for increased support. - -### Extended - -The current MSRV for `s2n-tls`, `s2n-tls-sys` and `s2n-tls-tokio` is [1.63.0](https://releases.rs/docs/1.63.0/). - -### Standard - -We will maintain a rolling MSRV (minimum supported rust version) policy of at least 6 months. The current s2n-quic version is not guaranteed to build on Rust versions earlier than the MSRV. - -The current MSRV for the standard workspace is [1.74.0](https://releases.rs/docs/1.74.0/) +Contains the bindings and other integrations, in two workspaces based on MSRV. ### Rust Examples diff --git a/bindings/rust/README.md b/bindings/rust/README.md new file mode 100644 index 00000000000..c3895929d45 --- /dev/null +++ b/bindings/rust/README.md @@ -0,0 +1,37 @@ +# s2n-tls Rust Bindings + +**NOTICE: These bindings are currently subject to change and should not be used without the expectation +of future breakage.** + +## Installation + +In order to generate rust bindings for s2n-tls, you need to have the following installed: + +* Rust - this can be easily installed with [rustup](https://rustup.rs/) +* libclang - this is usually installed through your system's package manager +* libssl-dev +* pkg-config +## Usage + +Generating rust bindings can be accomplished by running the `generate.sh` script: + +``` +$ ./bindings/rust/extended/generate.sh +``` + +This script generates the low-level bindings in the crate `s2n-tls-sys`, which is used by the `s2n-tls` crate to provide higher-level bindings. +See [s2n-tls-sys](https://github.com/aws/s2n-tls/blob/main/bindings/rust/s2n-tls-sys/README.md) for more information on `s2n-tls-sys` crate. + +## Minimum Supported Rust Version (MSRV) + +There are two rust bindings workspaces that have different MSRV policies. Crates in `standard` maintain a rolling MSRV policy of at least 6 months. Crates in `extended` maintain an older MSRV for increased support. + +### Extended + +The current MSRV for `s2n-tls`, `s2n-tls-sys` and `s2n-tls-tokio` is [1.63.0](https://releases.rs/docs/1.63.0/). + +### Standard + +We will maintain a rolling MSRV (minimum supported rust version) policy of at least 6 months. The current s2n-quic version is not guaranteed to build on Rust versions earlier than the MSRV. + +The current MSRV for the standard workspace is [1.74.0](https://releases.rs/docs/1.74.0/) From e8c567b674466da947c7559452197e7445f202e4 Mon Sep 17 00:00:00 2001 From: DougCh Date: Fri, 20 Dec 2024 22:07:50 +0000 Subject: [PATCH 25/30] symlink to one certs dir --- bindings/rust/{extended => }/certs/cert.pem | 0 .../certs/cert_localhost_ipv6.pem | 0 .../rust/{extended => }/certs/cert_rsa.pem | 0 .../rust/{extended => }/certs/generate.sh | 0 bindings/rust/{extended => }/certs/key.pem | 0 .../certs/key_localhost_ipv6.pem | 0 .../rust/{extended => }/certs/key_rsa.pem | 0 bindings/rust/extended/certs | 1 + bindings/rust/standard/certs | 1 + bindings/rust/standard/certs/cert.pem | 14 ----- .../standard/certs/cert_localhost_ipv6.pem | 23 -------- bindings/rust/standard/certs/cert_rsa.pem | 33 ------------ bindings/rust/standard/certs/generate.sh | 27 ---------- bindings/rust/standard/certs/key.pem | 5 -- .../standard/certs/key_localhost_ipv6.pem | 28 ---------- bindings/rust/standard/certs/key_rsa.pem | 52 ------------------- 16 files changed, 2 insertions(+), 182 deletions(-) rename bindings/rust/{extended => }/certs/cert.pem (100%) rename bindings/rust/{extended => }/certs/cert_localhost_ipv6.pem (100%) rename bindings/rust/{extended => }/certs/cert_rsa.pem (100%) rename bindings/rust/{extended => }/certs/generate.sh (100%) rename bindings/rust/{extended => }/certs/key.pem (100%) rename bindings/rust/{extended => }/certs/key_localhost_ipv6.pem (100%) rename bindings/rust/{extended => }/certs/key_rsa.pem (100%) create mode 120000 bindings/rust/extended/certs create mode 120000 bindings/rust/standard/certs delete mode 100644 bindings/rust/standard/certs/cert.pem delete mode 100644 bindings/rust/standard/certs/cert_localhost_ipv6.pem delete mode 100644 bindings/rust/standard/certs/cert_rsa.pem delete mode 100755 bindings/rust/standard/certs/generate.sh delete mode 100644 bindings/rust/standard/certs/key.pem delete mode 100644 bindings/rust/standard/certs/key_localhost_ipv6.pem delete mode 100644 bindings/rust/standard/certs/key_rsa.pem diff --git a/bindings/rust/extended/certs/cert.pem b/bindings/rust/certs/cert.pem similarity index 100% rename from bindings/rust/extended/certs/cert.pem rename to bindings/rust/certs/cert.pem diff --git a/bindings/rust/extended/certs/cert_localhost_ipv6.pem b/bindings/rust/certs/cert_localhost_ipv6.pem similarity index 100% rename from bindings/rust/extended/certs/cert_localhost_ipv6.pem rename to bindings/rust/certs/cert_localhost_ipv6.pem diff --git a/bindings/rust/extended/certs/cert_rsa.pem b/bindings/rust/certs/cert_rsa.pem similarity index 100% rename from bindings/rust/extended/certs/cert_rsa.pem rename to bindings/rust/certs/cert_rsa.pem diff --git a/bindings/rust/extended/certs/generate.sh b/bindings/rust/certs/generate.sh similarity index 100% rename from bindings/rust/extended/certs/generate.sh rename to bindings/rust/certs/generate.sh diff --git a/bindings/rust/extended/certs/key.pem b/bindings/rust/certs/key.pem similarity index 100% rename from bindings/rust/extended/certs/key.pem rename to bindings/rust/certs/key.pem diff --git a/bindings/rust/extended/certs/key_localhost_ipv6.pem b/bindings/rust/certs/key_localhost_ipv6.pem similarity index 100% rename from bindings/rust/extended/certs/key_localhost_ipv6.pem rename to bindings/rust/certs/key_localhost_ipv6.pem diff --git a/bindings/rust/extended/certs/key_rsa.pem b/bindings/rust/certs/key_rsa.pem similarity index 100% rename from bindings/rust/extended/certs/key_rsa.pem rename to bindings/rust/certs/key_rsa.pem diff --git a/bindings/rust/extended/certs b/bindings/rust/extended/certs new file mode 120000 index 00000000000..36343b9bb72 --- /dev/null +++ b/bindings/rust/extended/certs @@ -0,0 +1 @@ +../certs \ No newline at end of file diff --git a/bindings/rust/standard/certs b/bindings/rust/standard/certs new file mode 120000 index 00000000000..36343b9bb72 --- /dev/null +++ b/bindings/rust/standard/certs @@ -0,0 +1 @@ +../certs \ No newline at end of file diff --git a/bindings/rust/standard/certs/cert.pem b/bindings/rust/standard/certs/cert.pem deleted file mode 100644 index 648d70d1d1f..00000000000 --- a/bindings/rust/standard/certs/cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICLDCCAdOgAwIBAgIUTihKtj/RM4hq5r9fmryUGwDlYC4wCgYIKoZIzj0EAwIw -azELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkFaMQ4wDAYDVQQHDAVUZW1wZTEPMA0G -A1UECgwGQW1hem9uMRowGAYDVQQLDBFBbWF6b25XZWJTZXJ2aWNlczESMBAGA1UE -AwwJbG9jYWxob3N0MCAXDTIzMDUyNDA2MjYyN1oYDzIxMjMwNDMwMDYyNjI3WjBr -MQswCQYDVQQGEwJVUzELMAkGA1UECAwCQVoxDjAMBgNVBAcMBVRlbXBlMQ8wDQYD -VQQKDAZBbWF6b24xGjAYBgNVBAsMEUFtYXpvbldlYlNlcnZpY2VzMRIwEAYDVQQD -DAlsb2NhbGhvc3QwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAS4be8OVofY925i -AVfv2brqeJF55DeUSP3Q1cUI3QhPxw8ZFBTg25rnYsbpGQBsW1iSmE6v1YHGlmf5 -mAbhoAKJo1MwUTAdBgNVHQ4EFgQUCpoWu/Qw0+c9wyejGR0n16FNofwwHwYDVR0j -BBgwFoAUCpoWu/Qw0+c9wyejGR0n16FNofwwDwYDVR0TAQH/BAUwAwEB/zAKBggq -hkjOPQQDAgNHADBEAiBdYxkSxWkqaY6fv4QhNVPX8pNysB02lHBoLR2yVFf7MwIg -f+86G4gdpIi8tGO7Q217BAIpsWwCMrYw7O41ltGHOog= ------END CERTIFICATE----- diff --git a/bindings/rust/standard/certs/cert_localhost_ipv6.pem b/bindings/rust/standard/certs/cert_localhost_ipv6.pem deleted file mode 100644 index 2c3ae7365f7..00000000000 --- a/bindings/rust/standard/certs/cert_localhost_ipv6.pem +++ /dev/null @@ -1,23 +0,0 @@ ------BEGIN CERTIFICATE----- -MIID2DCCAsCgAwIBAgIUT1hXpXZFhpbeq6UkbqlnOKAeUoowDQYJKoZIhvcNAQEL -BQAwbDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAk1BMQ8wDQYDVQQHDAZCb3N0b24x -DzANBgNVBAoMBkFtYXpvbjEaMBgGA1UECwwRQW1hem9uV2ViU2VydmljZXMxEjAQ -BgNVBAMMCWxvY2FsaG9zdDAgFw0yNDExMjYwNDUyNDdaGA8yMTI0MTEwMjA0NTI0 -N1owbDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAk1BMQ8wDQYDVQQHDAZCb3N0b24x -DzANBgNVBAoMBkFtYXpvbjEaMBgGA1UECwwRQW1hem9uV2ViU2VydmljZXMxEjAQ -BgNVBAMMCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB -AKE6vnPsBDz69ET25yWSikTchned2PvOzZ9zOd7jtQM7A504jHGMOoyXsZaLF+R2 -6M4Fo/7sWQfPImbrfDELIGoZo9V/DbJoETgmEsE6rSj2poEF46ZbNWa0THBNko0O -q3zgpwPmUPtPTF3QHH0JC/Kbm7V9S4yVx4Qit7GSPUr9Cgj3MJF6MAZqi29LpgSK -uMQ1bf6T9t6F5hNH3A4T5dfjtjcQczDhbnkKCUFa8DbOR+5vecQQjI6vJoK3suIU -xS4U6rNRhLYL+grswpqVh2AXI3qsl12jhcer7hbRovRM8MQkDCPnLDb9Chm2zVWW -5HgkUbtsZrpldrWoVdNihqUCAwEAAaNwMG4wHQYDVR0OBBYEFE6+x/LP/KNspKSj -uOY77KG+u/eAMB8GA1UdIwQYMBaAFE6+x/LP/KNspKSjuOY77KG+u/eAMA8GA1Ud -EwEB/wQFMAMBAf8wGwYDVR0RBBQwEocQAAAAAAAAAAAAAAAAAAAAATANBgkqhkiG -9w0BAQsFAAOCAQEAE//QpOTdTJfc2OM+/kilicGx/PiV3WjiqoaeQo6uUd7cD7wD -6JuXABtUSndfkxryeQzKQmq2KBedbQCOKnt/OeY0yMqCxbws3l3H+uwPwwAACIUn -3e5+RtotiQQBreSiHJJ6omFpd+cyvluZwZ20t3dhlgGU5NUN3zcHkdc8hGpaxtfJ -AaunssA40QcjQFQYI8ADTiQHW20rZcsVRKkwRkNVps/vMDpLBCyBp96xhTAtkoDH -Xs/Zi1bJiJ8xw3TkDeJFShpP+cQPYHI36qWqNjTei9eHrNX8sNFAdNZVyitoZ3/W -FrPdms/ivlvgQbWWB3EKxD+PsQXoYvjkGhMNmg== ------END CERTIFICATE----- diff --git a/bindings/rust/standard/certs/cert_rsa.pem b/bindings/rust/standard/certs/cert_rsa.pem deleted file mode 100644 index 8aa428c638c..00000000000 --- a/bindings/rust/standard/certs/cert_rsa.pem +++ /dev/null @@ -1,33 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIFqzCCA5OgAwIBAgIUPecTUedBPhAjrzsM16hwH5f/8HswDQYJKoZIhvcNAQEL -BQAwZDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkFaMQ4wDAYDVQQHDAVUZW1wZTEN -MAsGA1UECgwETWFhczEVMBMGA1UECwwMQmlvQ29tcHV0aW5nMRIwEAYDVQQDDAls -b2NhbGhvc3QwIBcNMjMwNTI0MDYyNjI3WhgPMjEyMzA0MzAwNjI2MjdaMGQxCzAJ -BgNVBAYTAlVTMQswCQYDVQQIDAJBWjEOMAwGA1UEBwwFVGVtcGUxDTALBgNVBAoM -BE1hYXMxFTATBgNVBAsMDEJpb0NvbXB1dGluZzESMBAGA1UEAwwJbG9jYWxob3N0 -MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAnflx61sSH4pF9AmdOR3r -ilFM9Z1RIZ4aZXk5Dov9UP4KykCIFC12I7wryyKHH5PoKjKKtYW+4G/lAOw/O7kP -6oDfbcQbH3E5LCT7k2a+tOwxywxmsQFpK/YCicKxkFvbKqfbb+S5U9CZ9Rmx3jGh -FldIVXYrkdq2AfFu7U0BB5rdDQLBx1GAZjtmDjP9dpPe0GuukInHqaogO9d08x2O -3WN3grxdj2NN0tjaR6/S+a1L4vwcybJ5UZ8Zq8Bd41YR6uPNJSjABcXHXAlxR83t -ENNRKl8m8uP4SqFgpmFBHHmXviyVirZRpVudWG2Zkk6WSTj+cwDlcXYucVO6cmkS -/FQsslXn2YAYDiSsuthl4UGTXyWbxskAwx65ERHZ2CwOix6TIKxB0lOGVIuoT7Hj -q6gqFRxrjAQwUk76z+j/NFwZhAe0b5G0uyHcgPuaJMI9BpzvwpqgMNSMlbeH8rd3 -LsLOeCFrVcQzrYqS/aLB/FRE7QxkZutuRgAG5N3sBhxJNizROBzCd+zUEpJi2ZgH -eFstYAL4sXEh4m/7uXxMROO9rFqpZXiYocYipfddjjZ6NF3RIIfQG/Ubydm2YJe5 -s3o3Q2nGuBY6l0KXJvq1uX3B5JmFcVr0eiWbZ4UZioJbZ40JEUx7ECNZqooC7QjT -EeQZXwEfvUotP5lvAFEFK5MCAwEAAaNTMFEwHQYDVR0OBBYEFFRIP81Ul8Um6h8u -ru05X1QGuPceMB8GA1UdIwQYMBaAFFRIP81Ul8Um6h8uru05X1QGuPceMA8GA1Ud -EwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAIBDHQC3LfuH1YVieC0100IV -4tpSiQ63n5TItLRPxpPMjohAC1ZggQjU1/rVeBkP/x2dBQFgPpRXBFye9iavUVBt -xXj06Rm8kdLwF3KZHECDQArztdYqogmvXtxx5WA23nhua5NwUV6jM5i7EV7d/Bcp -+wGZKaze6fBR4Wh9FkIh9HG2tIOgJibLI33JAFjxkdY6bYoqDSUzlKZmUCMpxrXF -Zg/vYhBnBss2uvF9Ce+6Nedxgourjyma6MiH7QPwMM3Cr1rWTnG5C7MBhm4Q13Xr -LeaOayTE2JChXwyXqBjrctPs5GCbAJJFovQphyJhxNTXzHxMRu4MBCl3jFT2lzIi -r6DkgoQ3tuy5C3i4ZWNZUjqFrCu1uIeGYb9x+Wzv9/i370juF+aO5zJC3mp8bKsU -zdFQE8/q9ltuiazueCGPkFoVEVmLFICIckV6q+zh/ahXcdbSf8JxDGXElXhDK6Z3 -2axo2m5f/x77FREZCmyVA9I8fYDo3A7srGgkwMc+isdrbzytSC2KKo4/XnpvIRWo -vvKKslTzyaMoSv3i9qj23kWowRKqrguCs0wG1d7QiCRdEAsFO+MZPzsde5zKqcQ1 -AC8kSUZrFRjFfZfc0JAB7pI6BSlVwzVItdIdlA9jzEZr2c7430djTyidyTKiWj3D -FkfWZeLWo9l/1vC+Qyeo ------END CERTIFICATE----- diff --git a/bindings/rust/standard/certs/generate.sh b/bindings/rust/standard/certs/generate.sh deleted file mode 100755 index 982ff12cc60..00000000000 --- a/bindings/rust/standard/certs/generate.sh +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. -# SPDX-License-Identifier: Apache-2.0 - -# This script will generate all of the certs used for examples and tests in -# the rust bindings crates. - -# Used for TLS 1.2 connections. -echo "generating rsa key and cert" -openssl req -x509 -newkey rsa:4096 -keyout key_rsa.pem -out cert_rsa.pem -sha256 -days 36500 -nodes -subj "/C=US/ST=AZ/L=Tempe/O=Maas/OU=BioComputing/CN=localhost" - - -# Used for TLS 1.3 connections. -echo "generating ec key and cert" -openssl req -x509 -newkey ec -pkeyopt ec_paramgen_curve:P-256 -keyout key.pem -out cert.pem -sha256 -days 36500 -nodes -subj "/C=US/ST=AZ/L=Tempe/O=Amazon/OU=AmazonWebServices/CN=localhost" - - -# Used for testing IPv6. Includes the localhost IPv6 address as a SAN. -echo "generating localhost IPv6 key and cert" -openssl req -x509 \ - -newkey rsa:2048 \ - -keyout key_localhost_ipv6.pem \ - -out cert_localhost_ipv6.pem \ - -sha256 \ - -days 36500 \ - -nodes \ - -subj "/C=US/ST=MA/L=Boston/O=Amazon/OU=AmazonWebServices/CN=localhost" \ - -addext "subjectAltName = IP:0:0:0:0:0:0:0:1" diff --git a/bindings/rust/standard/certs/key.pem b/bindings/rust/standard/certs/key.pem deleted file mode 100644 index ecd0a4215a6..00000000000 --- a/bindings/rust/standard/certs/key.pem +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg7CYotHO5H76smTyL -DHb6esNVfzBEDAi+vZMvtM2SItahRANCAAS4be8OVofY925iAVfv2brqeJF55DeU -SP3Q1cUI3QhPxw8ZFBTg25rnYsbpGQBsW1iSmE6v1YHGlmf5mAbhoAKJ ------END PRIVATE KEY----- diff --git a/bindings/rust/standard/certs/key_localhost_ipv6.pem b/bindings/rust/standard/certs/key_localhost_ipv6.pem deleted file mode 100644 index 57b8152ef0b..00000000000 --- a/bindings/rust/standard/certs/key_localhost_ipv6.pem +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQChOr5z7AQ8+vRE -9uclkopE3IZ3ndj7zs2fczne47UDOwOdOIxxjDqMl7GWixfkdujOBaP+7FkHzyJm -63wxCyBqGaPVfw2yaBE4JhLBOq0o9qaBBeOmWzVmtExwTZKNDqt84KcD5lD7T0xd -0Bx9CQvym5u1fUuMlceEIrexkj1K/QoI9zCRejAGaotvS6YEirjENW3+k/beheYT -R9wOE+XX47Y3EHMw4W55CglBWvA2zkfub3nEEIyOryaCt7LiFMUuFOqzUYS2C/oK -7MKalYdgFyN6rJddo4XHq+4W0aL0TPDEJAwj5yw2/QoZts1VluR4JFG7bGa6ZXa1 -qFXTYoalAgMBAAECggEAOmyjnDUv+fsEbkM8UrCt+zMgZRMlkGYJvBiQpXTFYNTP -Q/c8aV8jzlOf7kocD9WJGjMQEO4LexlzwXDe8ZSzG8+Lv29JgtdUOhEN5ciB/CCZ -CJMeQee2S6/VLTLnAseIm/l6fB7HRLIhHbOuxx5ynmkF/TfYmyqhgH/mKeow3M2O -hhSigu1sIfVWAwMq7pNJ1+Dr6z4LzGVjJOBFHFt/UCSngT9NJehwF+VNU7UW2g98 -buUEwT6qgsDQCWEjLORppWMQTvZOQnPrE/fBf7t/QCLZ42I0y155jrMYXJIx92Q4 -dqlgWmAFliLayNd1+9lJPDMG9JmA+JAv4bfSHqLMRwKBgQDXv5yA29KWVtCkzF83 -QHECOV5Fv5KE3eLP6CnZjOI7G3OqrTc/EEtvl+bXZBQa/97IAYpYVO2KDY/tVbrr -La1ArR7s/zN1OxHNcuSuL9ghD61nHTgQg9psPqvXqVD/lsMiUNu64GtU0Bw6yce5 -yf508Y8vXtm0A+riEv2H5dKtEwKBgQC/Tz5cpYCLi1riL6IthQrp22ILS7AxhPXb -h6EBBAUR3P92Bq27ArFuBOqLobF1fAeBichC2oCxWc+BPwqauJM75PNSKsXgFb/N -W2oDVjXIBk1PRc8d6QUHpl4nxphzL1W1xur/f1bIDixZUltOQjMOx1lgLQ/wwRWT -ekYU0LYMZwKBgQDLT68tI3o04ITn+Av2ZkzYmrVDJz/s46g84nylnYUHzFvYyDja -vgFInS4VZiMoOl13vzPe/9GFmjg6oOJvg3DUFRCip++XFt407IOhvkZ/CWYQWNGf -hpGMFhccOVuyMCGdMfOPDLM4jpE7uTD03Oxkycp0Cn8/i72J4/l1WleJbwKBgQCE -QkiezFx+HK2MSdoZFi1hV6YEoSMCWSWPy8hnZ1wJ6XtDIYLiEw6PPR7ZwcNpsYGO -8K5eaakm8ywd8nNmW8yOT85YM/Hw5ZhgZJ56CBPOYWz5LQ3vY7VygHX/kbC7kTH0 -Jb05PdPFIudOKT2ucN3TjcYgU4b9rr834gSpR1FUaQKBgQC4hCEX1kO/NIlJ1fBz -kHm0LKQT1ggMDRvQ+M5If7a8BqdvXdFN5V9No3DQseXMB1q3OxxbWtJwYiLOskjI -F2TC98TE9XnPaMABLB3nLBnPW2DHN5DS6A9ool48fV7nZeSUnuytgLPR3s1FrqEf -yc2ARE24uiZT4QhFoZY2TG2Vpw== ------END PRIVATE KEY----- diff --git a/bindings/rust/standard/certs/key_rsa.pem b/bindings/rust/standard/certs/key_rsa.pem deleted file mode 100644 index a25cb4bafb5..00000000000 --- a/bindings/rust/standard/certs/key_rsa.pem +++ /dev/null @@ -1,52 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIJQgIBADANBgkqhkiG9w0BAQEFAASCCSwwggkoAgEAAoICAQCd+XHrWxIfikX0 -CZ05HeuKUUz1nVEhnhpleTkOi/1Q/grKQIgULXYjvCvLIocfk+gqMoq1hb7gb+UA -7D87uQ/qgN9txBsfcTksJPuTZr607DHLDGaxAWkr9gKJwrGQW9sqp9tv5LlT0Jn1 -GbHeMaEWV0hVdiuR2rYB8W7tTQEHmt0NAsHHUYBmO2YOM/12k97Qa66QicepqiA7 -13TzHY7dY3eCvF2PY03S2NpHr9L5rUvi/BzJsnlRnxmrwF3jVhHq480lKMAFxcdc -CXFHze0Q01EqXyby4/hKoWCmYUEceZe+LJWKtlGlW51YbZmSTpZJOP5zAOVxdi5x -U7pyaRL8VCyyVefZgBgOJKy62GXhQZNfJZvGyQDDHrkREdnYLA6LHpMgrEHSU4ZU -i6hPseOrqCoVHGuMBDBSTvrP6P80XBmEB7RvkbS7IdyA+5okwj0GnO/CmqAw1IyV -t4fyt3cuws54IWtVxDOtipL9osH8VETtDGRm625GAAbk3ewGHEk2LNE4HMJ37NQS -kmLZmAd4Wy1gAvixcSHib/u5fExE472sWqlleJihxiKl912ONno0XdEgh9Ab9RvJ -2bZgl7mzejdDaca4FjqXQpcm+rW5fcHkmYVxWvR6JZtnhRmKgltnjQkRTHsQI1mq -igLtCNMR5BlfAR+9Si0/mW8AUQUrkwIDAQABAoICABNeh+C/IFg8qHoVCbF8oSoq -8MA2w0FXdM4XUG8fq/YXx/PneKfcsR0Nj+MOvzmYdYFjBA3gsbgsEAyOauxkMvbi -SULYpiizRbrLaAs5ME3Xnf1S7m5qiV4qAkKo3AOit5shzK6KAU0tCQt71Iq1VBZ8 -qjJMVGhEREe1tg+jfupTSyIywdayAAfI5aj9J+k3lTzBzzwKoLAFW4Fq1/yNFbzA -WuFtPh18JAkjrJPYk4oofOL+XXs/hk+DLe8YnYpnvbeqqbcSKYUrrFd1Eu4mahhD -iLKkyw5B9GoWIlcUGpsmr3vSVJ2W4CjhtEeo3IkLWLLuqYgpRnikcGpVxUkM6BZV -3Oyliy9bI2HUXrKsMiJI5vTp7MPb/BqSGLxSc209tQ2YEYS912dwLWloNPbsC4ka -ubIN9FA+ihHc+kcNC4C+p4Q0+6zKm7TINwIPYEXKLkCaDvnJNa3EPk+HBDcUe+y0 -sMFb7nDaFtGkqrz/yBuiAxJ3LHumDZrLiI+RF19ITc6z83ZkJL44iCMlmusiD6/v -pTih2QZcwl3nTRZ5U4QiKG926Kpr7YPnEa4Jb/EIZqM3atWI3TdM9wt1oR0Xwah2 -22LA6uB20+5ayyr3bbqpBGGtRR0nzx1MfmNSjS9CXY1A4oVoNIfSyFzRSDzR75Nc -QYB1mkaySe26fHY2IvE9AoIBAQDKguV92UmGa2YLZW9KKzlYiB8v8fMylHOWZWPo -VsNO5ioO32ZdQTnI1mb8u4Gu40FmsiWmYcymF0sBmgj5WKW8H/QWShSSxsRy37xK -B7MLXaDNxX/GdrN3vzP8/v0jNSouyhdraR5CQFaPydcEC4go7VdtapqYKwO8K6QP -+nAxDFDNLmoUgCJ5HYdJjPiyYiEk/oBJPFuJJEzhy8/1bL0FRa7Xf3t4hMvKQmn5 -lB9AUWJQe3sdSJIeTBEeBKI5IRs6pLTpRhXISzl9U6ne3DMmNjdUSdnIAlD1IRVz -GLcv2WAJA9nyFuyI2vXpEREntsBAUDqH8/4r0X051cihGqFPAoIBAQDHsx5W4CGz -yPK4NFJsrBbTMnlC2eRikwh3KUZxqfV2hArxj2o8hQoJF1KL3uTzGwMjENkPSEOF -l6tvt5dIAkDB5V5Kl2050f7HNOT8beGSTC+XhYJVQR0WlVmH0wL4JoSRCiBuJFgl -VQLLLULk1IPfLXO/WIT+HMtdQJuxOZ87YBl8bk6L7TIo6dzVumilthkwMEx5Bpt1 -4a/RSB2ytgEZ+nq0rw6B3x2A+oe/WDmKJz1hzlwqtWjcErDbyh/URhsPMy8v7YfS -yfFI5xs4V0y/6cPeiwzEt2j/ri0l6iXuHIo3vfiVmjfbCNt5xdfLwLMyPvb50w78 -cOGIrJTOixh9AoIBAHTi9pkcCJ8ocD7VrlWt+yyJbQ7cZRXlr424OeFJ6vMoUFBD -S685zaOJdOodRC3wh7hBzQ9q1ZdsTGPBR7q8GvUpsFYJLjTFu2/eiaxlI0fFI+KB -Q04HB3FvkA9QEkX3EsDs7nWVt9xfjFb0FkIEcfPFgjfqVw7LjR1YRxrd31HAHQdA -6gOpLbygeYzPbGBx2VWj++HJj7/pjuKpJAAxYiyf2toRf+/BHmtAyDBA+YTDNK7l -htsRHx2TpDGiVQwKes/vb2hRhpMUMDuRRbQXfwJoOqlQ8v3JsHa8QMgtFNbubcrm -SS69Yotfbp62tiMpDXBRnmcIQsWB5fiy11l9qGsCggEBALo2jQjncKXLsIER0PYi -thnzy90JfwxoHJG4/EYK/Kep0uaTG7YZPFVj2QYyLv1957vv/udgNA5Dcon3AOsV -prrnHbiiYSh0Z4XsDcZQ0/Fud0ZsKS9ES1J+q4Caw/8PM7hnX/w0ibkt/y/kIadt -fxZBtNftO/4UbZGkKEnm+FMOdlVwKnASGx7Ji7IEY4Z6OhyUPQrxnU8bxq14+LBn -RLmrtnX7cqSpn0Jg2uoS43yuwG8OVSVCCeiEyUP5wxpW0O6ohMzFSkzFH+giEGDG -Dvw5h/phYOOiPxeDm/fp0bqqBDycOUuPBZyKMtXnJSWKp84npncoVqYQwE2I2C2M -yKUCggEAPwjoA4mtGgLNEcDYTR8HyBwiZfpuA1F0nupj2DpyhqSeXDN03jpkjn7Z -uKrigxbjVp+2gYMjkPVJPFu7xrIkDSaL+CCMjz/9yF2Zc58qlaZ8yQqIKu278rrC -G3WO7Fiz5hYovNDPZonHKVJ6vmYdRoxEoUgGRUNaWHBICTEXlEhP1Pn88XTTsIs7 -fKFZXqWJmdv1jyyoP9QnABamBcpVUXDIJZj5apOV8tvhmgw4xoZDXYYYBaQNfCeo -5BIzcBiGf0cb0SLDYFKNfL52jQw4tMgU5TWD3X80eX3jx9f0MKKr7W72ZKtqFy0l -HexuSf301dcJjvvhVwij3vhljQp8QA== ------END PRIVATE KEY----- From 1081cb7745e5b6e10f087fbcde27f8a43ef6e134 Mon Sep 17 00:00:00 2001 From: Doug Chapman <54039637+dougch@users.noreply.github.com> Date: Fri, 20 Dec 2024 15:45:01 -0800 Subject: [PATCH 26/30] Update bindings/rust/README.md Co-authored-by: James Mayclin --- bindings/rust/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/bindings/rust/README.md b/bindings/rust/README.md index c3895929d45..99f39c83505 100644 --- a/bindings/rust/README.md +++ b/bindings/rust/README.md @@ -34,4 +34,3 @@ The current MSRV for `s2n-tls`, `s2n-tls-sys` and `s2n-tls-tokio` is [1.63.0](ht We will maintain a rolling MSRV (minimum supported rust version) policy of at least 6 months. The current s2n-quic version is not guaranteed to build on Rust versions earlier than the MSRV. -The current MSRV for the standard workspace is [1.74.0](https://releases.rs/docs/1.74.0/) From a4417530fab063507cefc06bd57674a6446af9e8 Mon Sep 17 00:00:00 2001 From: Doug Chapman <54039637+dougch@users.noreply.github.com> Date: Fri, 20 Dec 2024 15:45:16 -0800 Subject: [PATCH 27/30] Update bindings/rust/README.md Co-authored-by: James Mayclin --- bindings/rust/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bindings/rust/README.md b/bindings/rust/README.md index 99f39c83505..ade059e12d6 100644 --- a/bindings/rust/README.md +++ b/bindings/rust/README.md @@ -28,7 +28,7 @@ There are two rust bindings workspaces that have different MSRV policies. Crates ### Extended -The current MSRV for `s2n-tls`, `s2n-tls-sys` and `s2n-tls-tokio` is [1.63.0](https://releases.rs/docs/1.63.0/). +Crates in the `extended` workspace currently have support an "extended" MSRV of [1.63.0](https://releases.rs/docs/1.63.0/). This is a temporary state. Customers must not rely on `s2n-tls` crates maintaining this level of stability. We expect to revert back to the mentioned standard policy shortly. ### Standard From c855fe648d949ffc0cd57c289fdad7fd259d604e Mon Sep 17 00:00:00 2001 From: Doug Chapman <54039637+dougch@users.noreply.github.com> Date: Mon, 23 Dec 2024 09:46:13 -0800 Subject: [PATCH 28/30] Update bindings/rust/README.md Co-authored-by: Sam Clark <3758302+goatgoose@users.noreply.github.com> --- bindings/rust/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bindings/rust/README.md b/bindings/rust/README.md index ade059e12d6..95b9da8ef8f 100644 --- a/bindings/rust/README.md +++ b/bindings/rust/README.md @@ -32,5 +32,5 @@ Crates in the `extended` workspace currently have support an "extended" MSRV of ### Standard -We will maintain a rolling MSRV (minimum supported rust version) policy of at least 6 months. The current s2n-quic version is not guaranteed to build on Rust versions earlier than the MSRV. +We will maintain a rolling MSRV (minimum supported rust version) policy of at least 6 months. The current s2n-tls version is not guaranteed to build on Rust versions earlier than the MSRV. From 49239a041d4d0ed08fa86f37415d43fd9fc0cb20 Mon Sep 17 00:00:00 2001 From: Doug Chapman <54039637+dougch@users.noreply.github.com> Date: Mon, 23 Dec 2024 09:46:42 -0800 Subject: [PATCH 29/30] Update bindings/rust/README.md Co-authored-by: Sam Clark <3758302+goatgoose@users.noreply.github.com> --- bindings/rust/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bindings/rust/README.md b/bindings/rust/README.md index 95b9da8ef8f..83c495c2813 100644 --- a/bindings/rust/README.md +++ b/bindings/rust/README.md @@ -28,7 +28,7 @@ There are two rust bindings workspaces that have different MSRV policies. Crates ### Extended -Crates in the `extended` workspace currently have support an "extended" MSRV of [1.63.0](https://releases.rs/docs/1.63.0/). This is a temporary state. Customers must not rely on `s2n-tls` crates maintaining this level of stability. We expect to revert back to the mentioned standard policy shortly. +Crates in the `extended` workspace currently support an "extended" MSRV of [1.63.0](https://releases.rs/docs/1.63.0/). This is a temporary state. Customers must not rely on `s2n-tls` crates maintaining this level of stability. We expect to revert back to the mentioned standard policy shortly. ### Standard From bce62bf71e30ebe7f656a287feb070ff00c28c96 Mon Sep 17 00:00:00 2001 From: Doug Chapman <54039637+dougch@users.noreply.github.com> Date: Mon, 23 Dec 2024 09:47:08 -0800 Subject: [PATCH 30/30] Update bindings/rust/README.md Co-authored-by: Sam Clark <3758302+goatgoose@users.noreply.github.com> --- bindings/rust/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/bindings/rust/README.md b/bindings/rust/README.md index 83c495c2813..d4c223b5175 100644 --- a/bindings/rust/README.md +++ b/bindings/rust/README.md @@ -11,6 +11,7 @@ In order to generate rust bindings for s2n-tls, you need to have the following i * libclang - this is usually installed through your system's package manager * libssl-dev * pkg-config + ## Usage Generating rust bindings can be accomplished by running the `generate.sh` script: