From 0c1ad4e5fedebfc6871ce4c2c2bf2f291537e5a5 Mon Sep 17 00:00:00 2001
From: Firstyear <william@blackhats.net.au>
Date: Sun, 29 Aug 2021 12:34:55 +1000
Subject: [PATCH] Swap to tide-openssl (#575)

---
 Cargo.lock                        | 98 +++++++------------------------
 kanidmd/Cargo.toml                |  2 +-
 kanidmd/src/lib/core/https/mod.rs |  2 +-
 3 files changed, 23 insertions(+), 79 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 59bf3fd71..772c8bfdb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -239,17 +239,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "async-rustls"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c86f33abd5a4f3e2d6d9251a9e0c6a7e52eb1113caf893dae8429bf4a53f378"
-dependencies = [
- "futures-lite",
- "rustls",
- "webpki",
-]
-
 [[package]]
 name = "async-session"
 version = "2.0.1"
@@ -313,6 +302,19 @@ dependencies = [
  "wasm-bindgen-futures",
 ]
 
+[[package]]
+name = "async-std-openssl"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "408a76b00fc49b11fe78f1f7a90557a3c887af1d4570fb33e15a70eb7e6b95ee"
+dependencies = [
+ "async-dup",
+ "async-std",
+ "futures-util",
+ "openssl",
+ "openssl-sys",
+]
+
 [[package]]
 name = "async-task"
 version = "4.0.3"
@@ -1839,7 +1841,7 @@ dependencies = [
  "sshkeys",
  "structopt",
  "tide",
- "tide-rustls",
+ "tide-openssl",
  "time 0.2.27",
  "tokio",
  "tokio-openssl",
@@ -2861,21 +2863,6 @@ dependencies = [
  "winreg",
 ]
 
-[[package]]
-name = "ring"
-version = "0.16.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
-dependencies = [
- "cc",
- "libc",
- "once_cell",
- "spin",
- "untrusted",
- "web-sys",
- "winapi",
-]
-
 [[package]]
 name = "route-recognizer"
 version = "0.2.0"
@@ -2937,19 +2924,6 @@ dependencies = [
  "semver 1.0.3",
 ]
 
-[[package]]
-name = "rustls"
-version = "0.19.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7"
-dependencies = [
- "base64 0.13.0",
- "log",
- "ring",
- "sct",
- "webpki",
-]
-
 [[package]]
 name = "ryu"
 version = "1.0.5"
@@ -3000,16 +2974,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
-[[package]]
-name = "sct"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce"
-dependencies = [
- "ring",
- "untrusted",
-]
-
 [[package]]
 name = "security-framework"
 version = "2.3.1"
@@ -3249,12 +3213,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "spin"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
-
 [[package]]
 name = "sshkeys"
 version = "0.3.1"
@@ -3511,16 +3469,18 @@ dependencies = [
 ]
 
 [[package]]
-name = "tide-rustls"
-version = "0.3.0"
+name = "tide-openssl"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a85b568b611840ba794ae749d4fa8b345b9f71a9c02b82cf0c28ff076fde6b7"
+checksum = "5ca37203863763d3faf05b22d32a0c2da7a2d429b8fb22345e19e45ec2ad1071"
 dependencies = [
  "async-dup",
  "async-h1",
- "async-rustls",
  "async-std",
- "rustls",
+ "async-std-openssl",
+ "futures-util",
+ "openssl",
+ "openssl-sys",
  "tide",
 ]
 
@@ -3822,12 +3782,6 @@ dependencies = [
  "subtle",
 ]
 
-[[package]]
-name = "untrusted"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
-
 [[package]]
 name = "url"
 version = "2.2.2"
@@ -4093,16 +4047,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "webpki"
-version = "0.21.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea"
-dependencies = [
- "ring",
- "untrusted",
-]
-
 [[package]]
 name = "wepoll-ffi"
 version = "0.1.2"
diff --git a/kanidmd/Cargo.toml b/kanidmd/Cargo.toml
index ed351f665..fcef5c28c 100644
--- a/kanidmd/Cargo.toml
+++ b/kanidmd/Cargo.toml
@@ -24,7 +24,7 @@ jemallocator = { version = "0.3.0", optional = true }
 
 url = { version = "2", features = ["serde"] }
 tide = "0.16"
-tide-rustls = "0.3"
+tide-openssl = "^0.1.1"
 async-trait = "0.1"
 async-h1 = "2.0"
 fernet = { version = "^0.1.4", features = ["fernet_danger_timestamps"] }
diff --git a/kanidmd/src/lib/core/https/mod.rs b/kanidmd/src/lib/core/https/mod.rs
index 8dc7f8505..732baac44 100644
--- a/kanidmd/src/lib/core/https/mod.rs
+++ b/kanidmd/src/lib/core/https/mod.rs
@@ -15,7 +15,7 @@ use std::path::PathBuf;
 use std::str::FromStr;
 use uuid::Uuid;
 
-use tide_rustls::TlsListener;
+use tide_openssl::TlsListener;
 
 use crate::tracing_tree::TreeMiddleware;
 use tracing::{error, info};