From cda7e59afa5ea3d92fe47f3e61ec3f5c310bc7fe Mon Sep 17 00:00:00 2001 From: Wesley Rosenblum Date: Thu, 1 Aug 2024 12:09:07 -0700 Subject: [PATCH] chore(s2n-quic): release 1.440 and pin bytes dependency --- common/s2n-codec/Cargo.toml | 2 +- dc/s2n-quic-dc/Cargo.toml | 8 ++++---- quic/s2n-quic-core/Cargo.toml | 7 ++++--- 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 | 8 ++++---- 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 +++--- 11 files changed, 43 insertions(+), 42 deletions(-) diff --git a/common/s2n-codec/Cargo.toml b/common/s2n-codec/Cargo.toml index 2827fde683..1dd982d6b6 100644 --- a/common/s2n-codec/Cargo.toml +++ b/common/s2n-codec/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "s2n-codec" -version = "0.43.0" +version = "0.44.0" description = "Internal crate used by s2n-quic" repository = "https://github.com/aws/s2n-quic" authors = ["AWS s2n"] diff --git a/dc/s2n-quic-dc/Cargo.toml b/dc/s2n-quic-dc/Cargo.toml index f4ce80974a..64d1aaa5fa 100644 --- a/dc/s2n-quic-dc/Cargo.toml +++ b/dc/s2n-quic-dc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "s2n-quic-dc" -version = "0.43.0" +version = "0.44.0" description = "Internal crate used by s2n-quic" repository = "https://github.com/aws/s2n-quic" authors = ["AWS s2n"] @@ -32,9 +32,9 @@ once_cell = "1" pin-project-lite = "0.2" rand = { version = "0.8", features = ["small_rng"] } rand_chacha = "0.3" -s2n-codec = { version = "=0.43.0", path = "../../common/s2n-codec", default-features = false } -s2n-quic-core = { version = "=0.43.0", path = "../../quic/s2n-quic-core", default-features = false } -s2n-quic-platform = { version = "=0.43.0", path = "../../quic/s2n-quic-platform" } +s2n-codec = { version = "=0.44.0", path = "../../common/s2n-codec", default-features = false } +s2n-quic-core = { version = "=0.44.0", path = "../../quic/s2n-quic-core", default-features = false } +s2n-quic-platform = { version = "=0.44.0", path = "../../quic/s2n-quic-platform" } slotmap = "1" thiserror = "1" tokio = { version = "1", default-features = false, features = ["sync"] } diff --git a/quic/s2n-quic-core/Cargo.toml b/quic/s2n-quic-core/Cargo.toml index 0c2e3bbde3..b498fbdb30 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.43.0" +version = "0.44.0" description = "Internal crate used by s2n-quic" repository = "https://github.com/aws/s2n-quic" authors = ["AWS s2n"] @@ -31,7 +31,8 @@ usdt = ["dep:probe"] atomic-waker = { version = "1", optional = true } bolero-generator = { version = "0.11", optional = true } byteorder = { version = "1", default-features = false } -bytes = { version = "1", optional = true, default-features = false } +# TODO: Unpin when https://github.com/aws/s2n-quic/issues/2289 is resolved +bytes = { version = "=1.6.1", optional = true, default-features = false } crossbeam-utils = { version = "0.8", optional = true } cfg-if = "1" hex-literal = "0.4" @@ -41,7 +42,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.43.0", path = "../../common/s2n-codec", default-features = false } +s2n-codec = { version = "=0.44.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 b4eb4eaae9..81fe36b07c 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.43.0" +version = "0.44.0" description = "Internal crate used by s2n-quic" repository = "https://github.com/aws/s2n-quic" authors = ["AWS s2n"] @@ -19,8 +19,8 @@ testing = [] [dependencies] cfg-if = "1" lazy_static = "1" -s2n-codec = { version = "=0.43.0", path = "../../common/s2n-codec", default-features = false } -s2n-quic-core = { version = "=0.43.0", path = "../s2n-quic-core", default-features = false } +s2n-codec = { version = "=0.44.0", path = "../../common/s2n-codec", default-features = false } +s2n-quic-core = { version = "=0.44.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 46e71c8e8d..4d884bce7c 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.43.0" +version = "0.44.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.11", 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.43.0", path = "../s2n-quic-core", default-features = false } -s2n-quic-xdp = { version = "=0.43.0", path = "../../tools/xdp/s2n-quic-xdp", optional = true } +s2n-quic-core = { version = "=0.44.0", path = "../s2n-quic-core", default-features = false } +s2n-quic-xdp = { version = "=0.44.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 65479770f1..649d5e6b87 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.43.0" +version = "0.44.0" description = "Internal crate used by s2n-quic" repository = "https://github.com/aws/s2n-quic" authors = ["AWS s2n"] @@ -18,9 +18,9 @@ bytes = { version = "1", default-features = false } # By [default](https://docs.rs/crate/rustls/latest/features) rustls includes the `tls12` feature. rustls = { version = "0.23", default-features = false, features=["std", "aws-lc-rs", "logging"] } rustls-pemfile = "2" -s2n-codec = { version = "=0.43.0", path = "../../common/s2n-codec", default-features = false, features = ["alloc"] } -s2n-quic-core = { version = "=0.43.0", path = "../s2n-quic-core", default-features = false, features = ["alloc"] } -s2n-quic-crypto = { version = "=0.43.0", path = "../s2n-quic-crypto", default-features = false } +s2n-codec = { version = "=0.44.0", path = "../../common/s2n-codec", default-features = false, features = ["alloc"] } +s2n-quic-core = { version = "=0.44.0", path = "../s2n-quic-core", default-features = false, features = ["alloc"] } +s2n-quic-crypto = { version = "=0.44.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 2f2f39e908..d4c591cf2f 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.43.0" +version = "0.44.0" description = "Internal crate used by s2n-quic" repository = "https://github.com/aws/s2n-quic" authors = ["AWS s2n"] @@ -24,10 +24,10 @@ fips = ["s2n-quic-tls?/fips"] # order to support the `?` syntax, we declare s2n-quic-tls as an optional dependency. # `s2n-quic-tls` only gets enabled based on the target. [dependencies] -s2n-quic-tls = { version = "=0.43.0", path = "../s2n-quic-tls", optional = true } +s2n-quic-tls = { version = "=0.44.0", path = "../s2n-quic-tls", optional = true } [target.'cfg(unix)'.dependencies] -s2n-quic-tls = { version = "=0.43.0", path = "../s2n-quic-tls" } +s2n-quic-tls = { version = "=0.44.0", path = "../s2n-quic-tls" } [target.'cfg(not(unix))'.dependencies] -s2n-quic-rustls = { version = "=0.43.0", path = "../s2n-quic-rustls" } +s2n-quic-rustls = { version = "=0.44.0", path = "../s2n-quic-rustls" } diff --git a/quic/s2n-quic-tls/Cargo.toml b/quic/s2n-quic-tls/Cargo.toml index 8d0c21fb48..db32cc9007 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.43.0" +version = "0.44.0" description = "Internal crate used by s2n-quic" repository = "https://github.com/aws/s2n-quic" authors = ["AWS s2n"] @@ -19,9 +19,9 @@ unstable_private_key = [] bytes = { version = "1", default-features = false } errno = "0.3" libc = "0.2" -s2n-codec = { version = "=0.43.0", path = "../../common/s2n-codec", default-features = false } -s2n-quic-core = { version = "=0.43.0", path = "../s2n-quic-core", default-features = false, features = ["alloc"] } -s2n-quic-crypto = { version = "=0.43.0", path = "../s2n-quic-crypto", default-features = false } +s2n-codec = { version = "=0.44.0", path = "../../common/s2n-codec", default-features = false } +s2n-quic-core = { version = "=0.44.0", path = "../s2n-quic-core", default-features = false, features = ["alloc"] } +s2n-quic-crypto = { version = "=0.44.0", path = "../s2n-quic-crypto", default-features = false } s2n-tls = { version = "0.2", features = ["quic"] } [dev-dependencies] diff --git a/quic/s2n-quic-transport/Cargo.toml b/quic/s2n-quic-transport/Cargo.toml index d656701dc2..447496dd3f 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.43.0" +version = "0.44.0" description = "Internal crate used by s2n-quic" repository = "https://github.com/aws/s2n-quic" authors = ["AWS s2n"] @@ -23,8 +23,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.43.0", path = "../../common/s2n-codec", features = ["bytes"], default-features = false } -s2n-quic-core = { version = "=0.43.0", path = "../s2n-quic-core", features = ["alloc"], default-features = false } +s2n-codec = { version = "=0.44.0", path = "../../common/s2n-codec", features = ["bytes"], default-features = false } +s2n-quic-core = { version = "=0.44.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 cb855f7e2d..88c2e0a836 100644 --- a/quic/s2n-quic/Cargo.toml +++ b/quic/s2n-quic/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "s2n-quic" -version = "1.43.0" +version = "1.44.0" description = "A Rust implementation of the IETF QUIC protocol" repository = "https://github.com/aws/s2n-quic" authors = ["AWS s2n"] @@ -69,14 +69,14 @@ hash_hasher = { version = "2", optional = true } humansize = { version = "2", optional = true } rand = "0.8" rand_chacha = "0.3" -s2n-codec = { version = "=0.43.0", path = "../../common/s2n-codec" } -s2n-quic-core = { version = "=0.43.0", path = "../s2n-quic-core" } -s2n-quic-crypto = { version = "=0.43.0", path = "../s2n-quic-crypto", optional = true } -s2n-quic-platform = { version = "=0.43.0", path = "../s2n-quic-platform", features = ["tokio-runtime"] } -s2n-quic-rustls = { version = "=0.43.0", path = "../s2n-quic-rustls", optional = true } -s2n-quic-tls = { version = "=0.43.0", path = "../s2n-quic-tls", optional = true } -s2n-quic-tls-default = { version = "=0.43.0", path = "../s2n-quic-tls-default", optional = true } -s2n-quic-transport = { version = "=0.43.0", path = "../s2n-quic-transport" } +s2n-codec = { version = "=0.44.0", path = "../../common/s2n-codec" } +s2n-quic-core = { version = "=0.44.0", path = "../s2n-quic-core" } +s2n-quic-crypto = { version = "=0.44.0", path = "../s2n-quic-crypto", optional = true } +s2n-quic-platform = { version = "=0.44.0", path = "../s2n-quic-platform", features = ["tokio-runtime"] } +s2n-quic-rustls = { version = "=0.44.0", path = "../s2n-quic-rustls", optional = true } +s2n-quic-tls = { version = "=0.44.0", path = "../s2n-quic-tls", optional = true } +s2n-quic-tls-default = { version = "=0.44.0", path = "../s2n-quic-tls-default", optional = true } +s2n-quic-transport = { version = "=0.44.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 } @@ -85,7 +85,7 @@ zeroize = { version = "1", optional = true, default-features = false } bolero = { version = "0.11" } 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.43.0", path = "../s2n-quic-transport", features = ["unstable_resumption", "unstable-provider-dc"] } +s2n-quic-transport = { version = "=0.44.0", path = "../s2n-quic-transport", features = ["unstable_resumption", "unstable-provider-dc"] } 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 4da8966845..a117ecaf73 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.43.0" +version = "0.44.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.12", default-features = false } bitflags = "2" errno = "0.3" libc = "0.2" -s2n-codec = { version = "=0.43.0", path = "../../../common/s2n-codec" } -s2n-quic-core = { version = "=0.43.0", path = "../../../quic/s2n-quic-core" } +s2n-codec = { version = "=0.44.0", path = "../../../common/s2n-codec" } +s2n-quic-core = { version = "=0.44.0", path = "../../../quic/s2n-quic-core" } tokio = { version = "1", features = ["net"], optional = true } [dev-dependencies]