From d493bcce23dcc057ab6a3d68ec9af33d688d5e22 Mon Sep 17 00:00:00 2001 From: fef Date: Thu, 27 Jul 2023 01:04:57 +0200 Subject: [PATCH] get rid of openssl (i think) --- Cargo.lock | 43 +++++++++++++++++++++++++++++++++++++++++-- Cargo.toml | 3 +-- 2 files changed, 42 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3a48a10..c558fc4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -28,6 +28,7 @@ dependencies = [ "actix-codec", "actix-rt", "actix-service", + "actix-tls", "actix-utils", "ahash 0.7.6", "base64 0.13.1", @@ -119,6 +120,24 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "actix-tls" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fde0cf292f7cdc7f070803cb9a0d45c018441321a78b1042ffbbb81ec333297" +dependencies = [ + "actix-codec", + "actix-rt", + "actix-service", + "actix-utils", + "futures-core", + "log", + "pin-project-lite", + "tokio-rustls", + "tokio-util", + "webpki-roots 0.22.6", +] + [[package]] name = "actix-utils" version = "3.0.1" @@ -142,6 +161,7 @@ dependencies = [ "actix-rt", "actix-server", "actix-service", + "actix-tls", "actix-utils", "actix-web-codegen", "ahash 0.7.6", @@ -1721,7 +1741,6 @@ dependencies = [ "locspan", "log", "mime", - "openssl", "pretty_env_logger", "rand", "rdf-types", @@ -2497,7 +2516,7 @@ dependencies = [ "tracing", "url", "uuid", - "webpki-roots", + "webpki-roots 0.24.0", ] [[package]] @@ -2825,6 +2844,17 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-rustls" +version = "0.23.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" +dependencies = [ + "rustls 0.20.7", + "tokio", + "webpki", +] + [[package]] name = "tokio-stream" version = "0.1.11" @@ -3086,6 +3116,15 @@ dependencies = [ "untrusted", ] +[[package]] +name = "webpki-roots" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" +dependencies = [ + "webpki", +] + [[package]] name = "webpki-roots" version = "0.24.0" diff --git a/Cargo.toml b/Cargo.toml index 89192ed..b5a3eac 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] actix-rt = "2.7" -actix-web = "4" +actix-web = { version = "4", features = ["rustls"] } argon2 = "0.5.1" async-trait = "0.1.59" base64 = "0.21" @@ -20,7 +20,6 @@ jsonwebtoken = { version = "8", default-features = false } locspan = "0.7" log = "0.4" mime = "0.3" -openssl = "0.10" pretty_env_logger = "0.5.0" rand = "0.8" rdf-types = "0.15.4"