From 24be36b18d0a649867de0a7a9740cc7599e4bf13 Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Sat, 18 May 2024 18:14:26 +0100 Subject: [PATCH] chore: prepare actix-tls release v3.4.0 --- .cargo/config.toml | 6 ------ actix-tls/CHANGES.md | 2 ++ actix-tls/Cargo.toml | 20 +++++++++++++------- actix-tls/README.md | 4 ++-- 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index 33cf3dc1..dd92a9d4 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -13,9 +13,3 @@ ci-check-linux = "hack --workspace --feature-powerset --depth=2 check --tests -- # tests avoiding io-uring feature ci-test = "hack --feature-powerset --depth=2 --exclude-features=io-uring test --lib --tests --no-fail-fast -- --nocapture" -ci-test-rustls-020 = "hack --feature-powerset --depth=2 --exclude-features=io-uring,rustls-0_21,rustls-0_22 test --lib --tests --no-fail-fast -- --nocapture" -ci-test-rustls-021 = "hack --feature-powerset --depth=2 --exclude-features=io-uring,rustls-0_20,rustls-0_22 test --lib --tests --no-fail-fast -- --nocapture" -ci-test-rustls-022 = "hack --feature-powerset --depth=2 --exclude-features=io-uring,rustls-0_20,rustls-0_21 test --lib --tests --no-fail-fast -- --nocapture" - -# test with io-uring feature -ci-test-linux = "hack --feature-powerset --depth=2 --exclude-features=rustls-0_20,rustls-0_21 test --lib --tests --no-fail-fast -- --nocapture" diff --git a/actix-tls/CHANGES.md b/actix-tls/CHANGES.md index cc8c6137..5b7ffb04 100644 --- a/actix-tls/CHANGES.md +++ b/actix-tls/CHANGES.md @@ -2,6 +2,8 @@ ## Unreleased +## 3.4.0 + - Add `rustls-0_23`, `rustls-0_23-webpki-roots`, and `rustls-0_23-native-roots` crate features. - Minimum supported Rust version (MSRV) is now 1.70. diff --git a/actix-tls/Cargo.toml b/actix-tls/Cargo.toml index 8fce2836..eb23cb6d 100644 --- a/actix-tls/Cargo.toml +++ b/actix-tls/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "actix-tls" -version = "3.3.0" +version = "3.4.0" authors = [ "Nikolay Kim ", "Rob Ede ", @@ -92,24 +92,26 @@ http-1 = { package = "http", version = "1", optional = true } tls-openssl = { package = "openssl", version = "0.10.55", optional = true } tokio-openssl = { version = "0.6", optional = true } +# rustls PKI types +rustls-pki-types-1 = { package = "rustls-pki-types", version = "1", optional = true } + # rustls v0.20 tokio-rustls-023 = { package = "tokio-rustls", version = "0.23", optional = true } -webpki-roots-022 = { package = "webpki-roots", version = "0.22", optional = true } # rustls v0.21 -rustls-021 = { package = "rustls", version = "0.21.6", optional = true } -rustls-webpki-0101 = { package = "rustls-webpki", version = "0.101.4", optional = true } tokio-rustls-024 = { package = "tokio-rustls", version = "0.24", optional = true } -webpki-roots-025 = { package = "webpki-roots", version = "0.25", optional = true } # rustls v0.22 -rustls-pki-types-1 = { package = "rustls-pki-types", version = "1", optional = true } # Also used for rustls v0.23 tokio-rustls-025 = { package = "tokio-rustls", version = "0.25", optional = true } -webpki-roots-026 = { package = "webpki-roots", version = "0.26", optional = true } # Also used for rustls v0.23 # rustls v0.23 tokio-rustls-026 = { package = "tokio-rustls", version = "0.26", default-features = false, optional = true } +# webpki-roots used with rustls features +webpki-roots-022 = { package = "webpki-roots", version = "0.22", optional = true } +webpki-roots-025 = { package = "webpki-roots", version = "0.25", optional = true } +webpki-roots-026 = { package = "webpki-roots", version = "0.26", optional = true } + # native root certificates for rustls impls rustls-native-certs-06 = { package = "rustls-native-certs", version = "0.6", optional = true } rustls-native-certs-07 = { package = "rustls-native-certs", version = "0.7", optional = true } @@ -117,6 +119,10 @@ rustls-native-certs-07 = { package = "rustls-native-certs", version = "0.7", opt # native-tls tokio-native-tls = { version = "0.3", optional = true } +[target.'cfg(any())'.dependencies] +rustls-021 = { package = "rustls", version = "0.21.6", optional = true } # force version with add_trust_anchors method +rustls-webpki-0101 = { package = "rustls-webpki", version = "0.101.4", optional = true } # force secure version + [dev-dependencies] actix-codec = "0.5" actix-rt = "2.2" diff --git a/actix-tls/README.md b/actix-tls/README.md index 555a601b..554f2615 100644 --- a/actix-tls/README.md +++ b/actix-tls/README.md @@ -5,11 +5,11 @@ [![crates.io](https://img.shields.io/crates/v/actix-tls?label=latest)](https://crates.io/crates/actix-tls) -[![Documentation](https://docs.rs/actix-tls/badge.svg?version=3.3.0)](https://docs.rs/actix-tls/3.3.0) +[![Documentation](https://docs.rs/actix-tls/badge.svg?version=3.4.0)](https://docs.rs/actix-tls/3.4.0) [![Version](https://img.shields.io/badge/rustc-1.52+-ab6000.svg)](https://blog.rust-lang.org/2021/05/06/Rust-1.52.0.html) ![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/actix-tls.svg)
-[![Dependency Status](https://deps.rs/crate/actix-tls/3.3.0/status.svg)](https://deps.rs/crate/actix-tls/3.3.0) +[![Dependency Status](https://deps.rs/crate/actix-tls/3.4.0/status.svg)](https://deps.rs/crate/actix-tls/3.4.0) ![Download](https://img.shields.io/crates/d/actix-tls.svg) [![Chat on Discord](https://img.shields.io/discord/771444961383153695?label=chat&logo=discord)](https://discord.gg/NWpN5mmg3x)