From 450c9809ed9ec5ac0468f8809009b046936eb81e Mon Sep 17 00:00:00 2001 From: Sven-Hendrik Haase Date: Mon, 14 Oct 2019 19:21:13 +0200 Subject: [PATCH] Update webpki and rustls --- CHANGES.md | 4 ++++ Cargo.toml | 8 ++++---- actix-framed/Cargo.toml | 8 ++++---- actix-http/CHANGES.md | 4 ++++ actix-http/Cargo.toml | 16 ++++++++-------- awc/Cargo.toml | 8 ++++---- test-server/Cargo.toml | 2 +- 7 files changed, 29 insertions(+), 21 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 4ff7d1e6..8eee6ff2 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,6 +6,10 @@ * Add `Payload::into_inner` method and make stored `def::Payload` public. (#1110) +### Changed + +* Updated rustls to 0.16 and webpki to 0.21 + ## [1.0.8] - 2019-09-25 ### Added diff --git a/Cargo.toml b/Cargo.toml index 35ca28b2..37f0c97d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -79,9 +79,9 @@ actix-router = "0.1.5" actix-rt = "0.2.4" actix-web-codegen = "0.1.2" actix-http = "0.2.9" -actix-server = "0.6.1" -actix-server-config = "0.1.2" -actix-testing = "0.1.0" +actix-server = "0.7.0" +actix-server-config = "0.2.0" +actix-testing = "0.2.0" actix-threadpool = "0.1.1" awc = { version = "0.2.7", optional = true } @@ -103,7 +103,7 @@ url = "2.1" # ssl support openssl = { version="0.10", optional = true } -rustls = { version = "0.15", optional = true } +rustls = { version = "0.16", optional = true } [dev-dependencies] actix = "0.8.3" diff --git a/actix-framed/Cargo.toml b/actix-framed/Cargo.toml index 321041c7..8a8bf39b 100644 --- a/actix-framed/Cargo.toml +++ b/actix-framed/Cargo.toml @@ -25,14 +25,14 @@ actix-service = "0.4.1" actix-router = "0.1.2" actix-rt = "0.2.2" actix-http = "0.2.7" -actix-server-config = "0.1.2" +actix-server-config = "0.2.0" bytes = "0.4" futures = "0.1.25" log = "0.4" [dev-dependencies] -actix-server = { version = "0.6.0", features=["ssl"] } -actix-connect = { version = "0.2.0", features=["ssl"] } -actix-http-test = { version = "0.2.4", features=["ssl"] } +actix-server = { version = "0.7.0", features=["ssl"] } +actix-connect = { version = "0.3.0", features=["ssl"] } +actix-http-test = { version = "0.2.5", features=["ssl"] } actix-utils = "0.4.4" diff --git a/actix-http/CHANGES.md b/actix-http/CHANGES.md index 624aca5e..fb690afb 100644 --- a/actix-http/CHANGES.md +++ b/actix-http/CHANGES.md @@ -6,6 +6,10 @@ * Add support for serde_json::Value to be passed as argument to ResponseBuilder.body() +### Changed + +* Update `rustls` to 0.16 + ### Fixed * To be compatible with non-English error responses, `ResponseError` rendered with `text/plain; charset=utf-8` header #1118 diff --git a/actix-http/Cargo.toml b/actix-http/Cargo.toml index cc7c885e..243b88f3 100644 --- a/actix-http/Cargo.toml +++ b/actix-http/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "actix-http" -version = "0.2.10" +version = "0.2.11" authors = ["Nikolay Kim "] description = "Actix http primitives" readme = "README.md" @@ -49,9 +49,9 @@ secure-cookies = ["ring"] [dependencies] actix-service = "0.4.1" actix-codec = "0.1.2" -actix-connect = "0.2.4" +actix-connect = "0.3.0" actix-utils = "0.4.4" -actix-server-config = "0.1.2" +actix-server-config = "0.2.0" actix-threadpool = "0.1.1" base64 = "0.10" @@ -86,7 +86,7 @@ tokio-current-thread = "0.1" trust-dns-resolver = { version="0.11.1", default-features = false } # for secure cookie -ring = { version = "0.14.6", optional = true } +ring = { version = "0.16", optional = true } # compression brotli2 = { version="0.3.2", optional = true } @@ -95,14 +95,14 @@ flate2 = { version="1.0.7", optional = true, default-features = false } # optional deps failure = { version = "0.1.5", optional = true } openssl = { version="0.10", optional = true } -rustls = { version = "0.15.2", optional = true } -webpki-roots = { version = "0.16", optional = true } +rustls = { version = "0.16", optional = true } +webpki-roots = { version = "0.18", optional = true } chrono = "0.4.6" [dev-dependencies] actix-rt = "0.2.2" -actix-server = { version = "0.6.0", features=["ssl", "rust-tls"] } -actix-connect = { version = "0.2.0", features=["ssl"] } +actix-server = { version = "0.7.0", features=["ssl", "rust-tls"] } +actix-connect = { version = "0.3.0", features=["ssl"] } actix-http-test = { version = "0.2.4", features=["ssl"] } env_logger = "0.6" serde_derive = "1.0" diff --git a/awc/Cargo.toml b/awc/Cargo.toml index 6f0f63f9..c4b76b2c 100644 --- a/awc/Cargo.toml +++ b/awc/Cargo.toml @@ -58,7 +58,7 @@ serde_json = "1.0" serde_urlencoded = "0.6.1" tokio-timer = "0.2.8" openssl = { version="0.10", optional = true } -rustls = { version = "0.15.2", optional = true } +rustls = { version = "0.16", optional = true } [dev-dependencies] actix-rt = "0.2.2" @@ -66,11 +66,11 @@ actix-web = { version = "1.0.0", features=["ssl"] } actix-http = { version = "0.2.10", features=["ssl"] } actix-http-test = { version = "0.2.0", features=["ssl"] } actix-utils = "0.4.1" -actix-server = { version = "0.6.0", features=["ssl", "rust-tls"] } +actix-server = { version = "0.7.0", features=["ssl", "rust-tls"] } brotli2 = { version="0.3.2" } flate2 = { version="1.0.2" } env_logger = "0.6" rand = "0.7" tokio-tcp = "0.1" -webpki = "0.19" -rustls = { version = "0.15.2", features = ["dangerous_configuration"] } +webpki = "0.21" +rustls = { version = "0.16", features = ["dangerous_configuration"] } diff --git a/test-server/Cargo.toml b/test-server/Cargo.toml index 77301b0a..54af09f0 100644 --- a/test-server/Cargo.toml +++ b/test-server/Cargo.toml @@ -33,7 +33,7 @@ ssl = ["openssl", "actix-server/ssl", "awc/ssl"] actix-codec = "0.1.2" actix-rt = "0.2.2" actix-service = "0.4.1" -actix-server = "0.6.0" +actix-server = "0.7.0" actix-utils = "0.4.1" awc = "0.2.6" actix-connect = "0.2.2"