From 428163cc6bf1bbffdb2d189803b4c0aaad38c268 Mon Sep 17 00:00:00 2001 From: Wesley Rosenblum Date: Mon, 12 Feb 2024 15:05:38 -0800 Subject: [PATCH 1/3] chore(s2n-quic): release 1.33.0 --- common/s2n-codec/Cargo.toml | 2 +- quic/s2n-quic-core/Cargo.toml | 4 ++-- quic/s2n-quic-crypto/Cargo.toml | 6 +++--- quic/s2n-quic-platform/Cargo.toml | 6 +++--- quic/s2n-quic-rustls/Cargo.toml | 8 ++++---- quic/s2n-quic-tls-default/Cargo.toml | 6 +++--- quic/s2n-quic-tls/Cargo.toml | 8 ++++---- quic/s2n-quic-transport/Cargo.toml | 6 +++--- quic/s2n-quic/Cargo.toml | 20 ++++++++++---------- tools/xdp/s2n-quic-xdp/Cargo.toml | 6 +++--- 10 files changed, 36 insertions(+), 36 deletions(-) diff --git a/common/s2n-codec/Cargo.toml b/common/s2n-codec/Cargo.toml index 3333078213..ba63f10be3 100644 --- a/common/s2n-codec/Cargo.toml +++ b/common/s2n-codec/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "s2n-codec" -version = "0.32.0" +version = "0.33.0" description = "Internal crate used by s2n-quic" repository = "https://github.com/aws/s2n-quic" authors = ["AWS s2n"] diff --git a/quic/s2n-quic-core/Cargo.toml b/quic/s2n-quic-core/Cargo.toml index 6141d0e734..623add7483 100644 --- a/quic/s2n-quic-core/Cargo.toml +++ b/quic/s2n-quic-core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "s2n-quic-core" -version = "0.32.0" +version = "0.33.0" description = "Internal crate used by s2n-quic" repository = "https://github.com/aws/s2n-quic" authors = ["AWS s2n"] @@ -38,7 +38,7 @@ num-rational = { version = "0.4", default-features = false } num-traits = { version = "0.2", default-features = false, features = ["libm"] } pin-project-lite = { version = "0.2" } probe = { version = "0.5", optional = true } -s2n-codec = { version = "=0.32.0", path = "../../common/s2n-codec", default-features = false } +s2n-codec = { version = "=0.33.0", path = "../../common/s2n-codec", default-features = false } subtle = { version = "2", default-features = false } tracing = { version = "0.1", default-features = false, optional = true } zerocopy = { version = "0.7", features = ["derive"] } diff --git a/quic/s2n-quic-crypto/Cargo.toml b/quic/s2n-quic-crypto/Cargo.toml index 98b58ced32..2397487d58 100644 --- a/quic/s2n-quic-crypto/Cargo.toml +++ b/quic/s2n-quic-crypto/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "s2n-quic-crypto" -version = "0.32.0" +version = "0.33.0" description = "Internal crate used by s2n-quic" repository = "https://github.com/aws/s2n-quic" authors = ["AWS s2n"] @@ -17,8 +17,8 @@ testing = [] [dependencies] cfg-if = "1" lazy_static = "1" -s2n-codec = { version = "=0.32.0", path = "../../common/s2n-codec", default-features = false } -s2n-quic-core = { version = "=0.32.0", path = "../s2n-quic-core", default-features = false } +s2n-codec = { version = "=0.33.0", path = "../../common/s2n-codec", default-features = false } +s2n-quic-core = { version = "=0.33.0", path = "../s2n-quic-core", default-features = false } zeroize = { version = "1", default-features = false, features = ["derive"] } [target.'cfg(not(target_os = "windows"))'.dependencies] diff --git a/quic/s2n-quic-platform/Cargo.toml b/quic/s2n-quic-platform/Cargo.toml index 16bf91a831..97809d4f35 100644 --- a/quic/s2n-quic-platform/Cargo.toml +++ b/quic/s2n-quic-platform/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "s2n-quic-platform" -version = "0.32.0" +version = "0.33.0" description = "Internal crate used by s2n-quic" repository = "https://github.com/aws/s2n-quic" authors = ["AWS s2n"] @@ -25,8 +25,8 @@ bolero-generator = { version = "0.10", optional = true } cfg-if = "1" futures = { version = "0.3", default-features = false, features = ["async-await"], optional = true } lazy_static = { version = "1", optional = true } -s2n-quic-core = { version = "=0.32.0", path = "../s2n-quic-core", default-features = false } -s2n-quic-xdp = { version = "=0.32.0", path = "../../tools/xdp/s2n-quic-xdp", optional = true } +s2n-quic-core = { version = "=0.33.0", path = "../s2n-quic-core", default-features = false } +s2n-quic-xdp = { version = "=0.33.0", path = "../../tools/xdp/s2n-quic-xdp", optional = true } socket2 = { version = "0.5", features = ["all"], optional = true } tokio = { version = "1", default-features = false, features = ["macros", "net", "rt", "time"], optional = true } tracing = { version = "0.1", optional = true } diff --git a/quic/s2n-quic-rustls/Cargo.toml b/quic/s2n-quic-rustls/Cargo.toml index 780fae048f..fe4e94de9f 100644 --- a/quic/s2n-quic-rustls/Cargo.toml +++ b/quic/s2n-quic-rustls/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "s2n-quic-rustls" -version = "0.32.0" +version = "0.33.0" description = "Internal crate used by s2n-quic" repository = "https://github.com/aws/s2n-quic" authors = ["AWS s2n"] @@ -14,9 +14,9 @@ exclude = ["corpus.tar.gz"] bytes = { version = "1", default-features = false } rustls = { version = "0.21", features = ["quic"] } rustls-pemfile = "1" -s2n-codec = { version = "=0.32.0", path = "../../common/s2n-codec", default-features = false, features = ["alloc"] } -s2n-quic-core = { version = "=0.32.0", path = "../s2n-quic-core", default-features = false, features = ["alloc"] } -s2n-quic-crypto = { version = "=0.32.0", path = "../s2n-quic-crypto", default-features = false } +s2n-codec = { version = "=0.33.0", path = "../../common/s2n-codec", default-features = false, features = ["alloc"] } +s2n-quic-core = { version = "=0.33.0", path = "../s2n-quic-core", default-features = false, features = ["alloc"] } +s2n-quic-crypto = { version = "=0.33.0", path = "../s2n-quic-crypto", default-features = false } [dev-dependencies] insta = { version = "1", features = ["json"] } diff --git a/quic/s2n-quic-tls-default/Cargo.toml b/quic/s2n-quic-tls-default/Cargo.toml index 0e48284fd9..e7168d30e8 100644 --- a/quic/s2n-quic-tls-default/Cargo.toml +++ b/quic/s2n-quic-tls-default/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "s2n-quic-tls-default" -version = "0.32.0" +version = "0.33.0" description = "Internal crate used by s2n-quic" repository = "https://github.com/aws/s2n-quic" authors = ["AWS s2n"] @@ -11,7 +11,7 @@ license = "Apache-2.0" exclude = ["corpus.tar.gz"] [target.'cfg(unix)'.dependencies] -s2n-quic-tls = { version = "=0.32.0", path = "../s2n-quic-tls" } +s2n-quic-tls = { version = "=0.33.0", path = "../s2n-quic-tls" } [target.'cfg(not(unix))'.dependencies] -s2n-quic-rustls = { version = "=0.32.0", path = "../s2n-quic-rustls" } +s2n-quic-rustls = { version = "=0.33.0", path = "../s2n-quic-rustls" } diff --git a/quic/s2n-quic-tls/Cargo.toml b/quic/s2n-quic-tls/Cargo.toml index ee74aa2cc0..881cac174e 100644 --- a/quic/s2n-quic-tls/Cargo.toml +++ b/quic/s2n-quic-tls/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "s2n-quic-tls" -version = "0.32.0" +version = "0.33.0" description = "Internal crate used by s2n-quic" repository = "https://github.com/aws/s2n-quic" authors = ["AWS s2n"] @@ -18,9 +18,9 @@ unstable_private_key = [] bytes = { version = "1", default-features = false } errno = "0.3" libc = "0.2" -s2n-codec = { version = "=0.32.0", path = "../../common/s2n-codec", default-features = false } -s2n-quic-core = { version = "=0.32.0", path = "../s2n-quic-core", default-features = false, features = ["alloc"] } -s2n-quic-crypto = { version = "=0.32.0", path = "../s2n-quic-crypto", default-features = false } +s2n-codec = { version = "=0.33.0", path = "../../common/s2n-codec", default-features = false } +s2n-quic-core = { version = "=0.33.0", path = "../s2n-quic-core", default-features = false, features = ["alloc"] } +s2n-quic-crypto = { version = "=0.33.0", path = "../s2n-quic-crypto", default-features = false } s2n-tls = { version = "0.1", features = ["quic"] } [dev-dependencies] diff --git a/quic/s2n-quic-transport/Cargo.toml b/quic/s2n-quic-transport/Cargo.toml index aa0a9b4a36..0f57726020 100644 --- a/quic/s2n-quic-transport/Cargo.toml +++ b/quic/s2n-quic-transport/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "s2n-quic-transport" -version = "0.32.0" +version = "0.33.0" description = "Internal crate used by s2n-quic" repository = "https://github.com/aws/s2n-quic" authors = ["AWS s2n"] @@ -22,8 +22,8 @@ futures-core = { version = "0.3", default-features = false, features = ["alloc"] hashbrown = "0.14" intrusive-collections = "0.9" once_cell = "1" -s2n-codec = { version = "=0.32.0", path = "../../common/s2n-codec", features = ["bytes"], default-features = false } -s2n-quic-core = { version = "=0.32.0", path = "../s2n-quic-core", features = ["alloc"], default-features = false } +s2n-codec = { version = "=0.33.0", path = "../../common/s2n-codec", features = ["bytes"], default-features = false } +s2n-quic-core = { version = "=0.33.0", path = "../s2n-quic-core", features = ["alloc"], default-features = false } siphasher = "1.0" smallvec = { version = "1", default-features = false } diff --git a/quic/s2n-quic/Cargo.toml b/quic/s2n-quic/Cargo.toml index 150949bccc..8c654f955b 100644 --- a/quic/s2n-quic/Cargo.toml +++ b/quic/s2n-quic/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "s2n-quic" -version = "1.32.0" +version = "1.33.0" description = "A Rust implementation of the IETF QUIC protocol" repository = "https://github.com/aws/s2n-quic" authors = ["AWS s2n"] @@ -61,14 +61,14 @@ hash_hasher = { version = "2", optional = true } humansize = { version = "2", optional = true } rand = "0.8" rand_chacha = "0.3" -s2n-codec = { version = "=0.32.0", path = "../../common/s2n-codec" } -s2n-quic-core = { version = "=0.32.0", path = "../s2n-quic-core" } -s2n-quic-crypto = { version = "=0.32.0", path = "../s2n-quic-crypto", optional = true } -s2n-quic-platform = { version = "=0.32.0", path = "../s2n-quic-platform", features = ["tokio-runtime"] } -s2n-quic-rustls = { version = "=0.32.0", path = "../s2n-quic-rustls", optional = true } -s2n-quic-tls = { version = "=0.32.0", path = "../s2n-quic-tls", optional = true } -s2n-quic-tls-default = { version = "=0.32.0", path = "../s2n-quic-tls-default", optional = true } -s2n-quic-transport = { version = "=0.32.0", path = "../s2n-quic-transport" } +s2n-codec = { version = "=0.33.0", path = "../../common/s2n-codec" } +s2n-quic-core = { version = "=0.33.0", path = "../s2n-quic-core" } +s2n-quic-crypto = { version = "=0.33.0", path = "../s2n-quic-crypto", optional = true } +s2n-quic-platform = { version = "=0.33.0", path = "../s2n-quic-platform", features = ["tokio-runtime"] } +s2n-quic-rustls = { version = "=0.33.0", path = "../s2n-quic-rustls", optional = true } +s2n-quic-tls = { version = "=0.33.0", path = "../s2n-quic-tls", optional = true } +s2n-quic-tls-default = { version = "=0.33.0", path = "../s2n-quic-tls-default", optional = true } +s2n-quic-transport = { version = "=0.33.0", path = "../s2n-quic-transport" } tokio = { version = "1", default-features = false } zerocopy = { version = "0.7", optional = true, features = ["derive"] } zeroize = { version = "1", optional = true, default-features = false } @@ -77,7 +77,7 @@ zeroize = { version = "1", optional = true, default-features = false } bolero = { version = "0.10" } s2n-quic-core = { path = "../s2n-quic-core", features = ["branch-tracing", "event-tracing", "probe-tracing", "testing"] } s2n-quic-platform = { path = "../s2n-quic-platform", features = ["testing"] } -s2n-quic-transport = { version = "=0.32.0", path = "../s2n-quic-transport", features = ["unstable_resumption"] } +s2n-quic-transport = { version = "=0.33.0", path = "../s2n-quic-transport", features = ["unstable_resumption"] } tokio = { version = "1", features = ["full"] } tracing = { version = "0.1" } tracing-subscriber = { version = "0.3", features = ["env-filter"] } diff --git a/tools/xdp/s2n-quic-xdp/Cargo.toml b/tools/xdp/s2n-quic-xdp/Cargo.toml index 8ee4e0c73c..c461df296f 100644 --- a/tools/xdp/s2n-quic-xdp/Cargo.toml +++ b/tools/xdp/s2n-quic-xdp/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "s2n-quic-xdp" -version = "0.32.0" +version = "0.33.0" description = "Internal crate used by s2n-quic" repository = "https://github.com/aws/s2n-quic" authors = ["AWS s2n"] @@ -18,8 +18,8 @@ aya = { version = "0.11", default-features = false } bitflags = "2" errno = "0.3" libc = "0.2" -s2n-codec = { version = "=0.32.0", path = "../../../common/s2n-codec" } -s2n-quic-core = { version = "=0.32.0", path = "../../../quic/s2n-quic-core" } +s2n-codec = { version = "=0.33.0", path = "../../../common/s2n-codec" } +s2n-quic-core = { version = "=0.33.0", path = "../../../quic/s2n-quic-core" } tokio = { version = "1", features = ["net"], optional = true } [dev-dependencies] From f1d3135086f49e31a3fce9ea78975dd99265d919 Mon Sep 17 00:00:00 2001 From: Wesley Rosenblum Date: Tue, 13 Feb 2024 10:20:50 -0800 Subject: [PATCH 2/3] move ahash pin to dev-dependencies --- quic/s2n-quic-transport/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quic/s2n-quic-transport/Cargo.toml b/quic/s2n-quic-transport/Cargo.toml index 2c2029a0fc..d089f4308a 100644 --- a/quic/s2n-quic-transport/Cargo.toml +++ b/quic/s2n-quic-transport/Cargo.toml @@ -16,7 +16,6 @@ std = ["futures-channel/std"] unstable_resumption = [] [dependencies] -ahash = { version = "=0.8.7" } # ahash 0.8.8 requires rust 1.72, see https://github.com/aws/s2n-quic/issues/2118 bytes = { version = "1", default-features = false } futures-channel = { version = "0.3", default-features = false, features = ["alloc"] } futures-core = { version = "0.3", default-features = false, features = ["alloc"] } @@ -29,6 +28,7 @@ siphasher = "1.0" smallvec = { version = "1", default-features = false } [dev-dependencies] +ahash = { version = "=0.8.7" } # ahash 0.8.8 requires rust 1.72, see https://github.com/aws/s2n-quic/issues/2118 bolero = "0.10" futures-test = "0.3" # For testing Waker interactions insta = { version = "1", features = ["json"] } From 15d9fd2c5a4f6b7c17dec2a75ae499d60b5d9d92 Mon Sep 17 00:00:00 2001 From: Wesley Rosenblum Date: Tue, 13 Feb 2024 10:29:17 -0800 Subject: [PATCH 3/3] allow examples to use stable toolchain --- examples/rustls-mtls/rust-toolchain | 3 --- examples/s2n-mtls/rust-toolchain | 3 --- examples/turmoil-provider/rust-toolchain | 3 --- 3 files changed, 9 deletions(-) delete mode 100644 examples/rustls-mtls/rust-toolchain delete mode 100644 examples/s2n-mtls/rust-toolchain delete mode 100644 examples/turmoil-provider/rust-toolchain diff --git a/examples/rustls-mtls/rust-toolchain b/examples/rustls-mtls/rust-toolchain deleted file mode 100644 index a8c550885a..0000000000 --- a/examples/rustls-mtls/rust-toolchain +++ /dev/null @@ -1,3 +0,0 @@ -[toolchain] -channel = "1.71.1" -components = [ "rustc", "clippy", "rustfmt" ] diff --git a/examples/s2n-mtls/rust-toolchain b/examples/s2n-mtls/rust-toolchain deleted file mode 100644 index a8c550885a..0000000000 --- a/examples/s2n-mtls/rust-toolchain +++ /dev/null @@ -1,3 +0,0 @@ -[toolchain] -channel = "1.71.1" -components = [ "rustc", "clippy", "rustfmt" ] diff --git a/examples/turmoil-provider/rust-toolchain b/examples/turmoil-provider/rust-toolchain deleted file mode 100644 index a8c550885a..0000000000 --- a/examples/turmoil-provider/rust-toolchain +++ /dev/null @@ -1,3 +0,0 @@ -[toolchain] -channel = "1.71.1" -components = [ "rustc", "clippy", "rustfmt" ]