diff --git a/Cargo.lock b/Cargo.lock index 564ef97..66bedff 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -154,6 +154,7 @@ dependencies = [ "actix-codec 0.4.2", "actix-rt 2.6.0", "actix-service 2.0.2", + "actix-tls 3.0.2", "actix-utils 3.0.0", "ahash", "base64", @@ -355,6 +356,24 @@ dependencies = [ "futures-util", ] +[[package]] +name = "actix-tls" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31ab31563b611fa822480b4255e8750cf0af9ce1b8b7bde298afe8447ef9333" +dependencies = [ + "actix-codec 0.4.2", + "actix-rt 2.6.0", + "actix-service 2.0.2", + "actix-utils 3.0.0", + "futures-core", + "log", + "pin-project-lite 0.2.8", + "tokio-rustls 0.23.2", + "tokio-util 0.6.9", + "webpki-roots 0.22.2", +] + [[package]] name = "actix-utils" version = "2.0.0" @@ -400,7 +419,7 @@ dependencies = [ "actix-service 1.0.6", "actix-testing", "actix-threadpool", - "actix-tls", + "actix-tls 2.0.0", "actix-utils 2.0.0", "actix-web-codegen 0.4.0", "awc", @@ -437,6 +456,7 @@ dependencies = [ "actix-rt 2.6.0", "actix-server 2.0.0", "actix-service 2.0.2", + "actix-tls 3.0.2", "actix-utils 3.0.0", "actix-web-codegen 0.5.0-rc.2", "ahash", @@ -2406,8 +2426,20 @@ dependencies = [ "base64", "log", "ring", - "sct", - "webpki", + "sct 0.6.1", + "webpki 0.21.4", +] + +[[package]] +name = "rustls" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d37e5e2290f3e040b594b1a9e04377c2c671f1a1cfd9bfdef82106ac1c113f84" +dependencies = [ + "log", + "ring", + "sct 0.7.0", + "webpki 0.22.0", ] [[package]] @@ -2457,6 +2489,16 @@ dependencies = [ "untrusted", ] +[[package]] +name = "sct" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "sea-orm" version = "0.5.0" @@ -2818,7 +2860,7 @@ dependencies = [ "parking_lot", "percent-encoding", "rust_decimal", - "rustls", + "rustls 0.19.1", "serde", "serde_json", "sha2", @@ -2830,8 +2872,8 @@ dependencies = [ "tokio-stream", "url", "uuid", - "webpki", - "webpki-roots", + "webpki 0.21.4", + "webpki-roots 0.21.1", ] [[package]] @@ -2863,7 +2905,7 @@ dependencies = [ "actix-rt 2.6.0", "once_cell", "tokio 1.16.1", - "tokio-rustls", + "tokio-rustls 0.22.0", ] [[package]] @@ -3151,9 +3193,20 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" dependencies = [ - "rustls", + "rustls 0.19.1", "tokio 1.16.1", - "webpki", + "webpki 0.21.4", +] + +[[package]] +name = "tokio-rustls" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a27d5f2b839802bd8267fa19b0530f5a08b9c08cd417976be2a65d130fe1c11b" +dependencies = [ + "rustls 0.20.2", + "tokio 1.16.1", + "webpki 0.22.0", ] [[package]] @@ -3608,13 +3661,32 @@ dependencies = [ "untrusted", ] +[[package]] +name = "webpki" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "webpki-roots" version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aabe153544e473b775453675851ecc86863d2a81d786d741f6b76778f2a48940" dependencies = [ - "webpki", + "webpki 0.21.4", +] + +[[package]] +name = "webpki-roots" +version = "0.22.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "552ceb903e957524388c4d3475725ff2c8b7960922063af6ce53c9a43da07449" +dependencies = [ + "webpki 0.22.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index eca8023..e420d16 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ actix-web-actors = "4.0.0-beta.6" chrono = { version = "0.4.19", features = ["serde"] } serde = { version = "1.0.136", features= [ "derive" ] } serde_json = "1.0.78" -actix-web = "4.0.0-rc.2" +actix-web = { version = "4.0.0-rc.2", features = ["rustls"] } actix-rt = "2.6.0" tracing-test = "0.2.1" tracing-actix-web = "0.5.0-rc.1"