mart-w/kanidm
1
0
Fork 0
mirror of https://github.com/kanidm/kanidm.git synced 2025-02-23 20:47:01 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Swap to tide-openssl (#575)

Browse source
This commit is contained in:
Firstyear 2021-08-29 12:34:55 +10:00 committed by GitHub
parent 1080e5d0b4
commit 0c1ad4e5fe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

98
Cargo.lock generated
View file

@ -239,17 +239,6 @@ dependencies = [
"winapi", "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]] [[package]]
name = "async-session" name = "async-session"
version = "2.0.1" version = "2.0.1"
@ -313,6 +302,19 @@ dependencies = [
"wasm-bindgen-futures", "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]] [[package]]
name = "async-task" name = "async-task"
version = "4.0.3" version = "4.0.3"
@ -1839,7 +1841,7 @@ dependencies = [
"sshkeys", "sshkeys",
"structopt", "structopt",
"tide", "tide",
"tide-rustls", "tide-openssl",
"time 0.2.27", "time 0.2.27",
"tokio", "tokio",
"tokio-openssl", "tokio-openssl",
@ -2861,21 +2863,6 @@ dependencies = [
"winreg", "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]] [[package]]
name = "route-recognizer" name = "route-recognizer"
version = "0.2.0" version = "0.2.0"
@ -2937,19 +2924,6 @@ dependencies = [
"semver 1.0.3", "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]] [[package]]
name = "ryu" name = "ryu"
version = "1.0.5" version = "1.0.5"
@ -3000,16 +2974,6 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" 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]] [[package]]
name = "security-framework" name = "security-framework"
version = "2.3.1" version = "2.3.1"
@ -3249,12 +3213,6 @@ dependencies = [
"winapi", "winapi",
] ]
[[package]]
name = "spin"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
[[package]] [[package]]
name = "sshkeys" name = "sshkeys"
version = "0.3.1" version = "0.3.1"
@ -3511,16 +3469,18 @@ dependencies = [
] ]
[[package]] [[package]]
name = "tide-rustls" name = "tide-openssl"
version = "0.3.0" version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a85b568b611840ba794ae749d4fa8b345b9f71a9c02b82cf0c28ff076fde6b7" checksum = "5ca37203863763d3faf05b22d32a0c2da7a2d429b8fb22345e19e45ec2ad1071"
dependencies = [ dependencies = [
"async-dup", "async-dup",
"async-h1", "async-h1",
"async-rustls",
"async-std", "async-std",
"rustls", "async-std-openssl",
"futures-util",
"openssl",
"openssl-sys",
"tide", "tide",
] ]
@ -3822,12 +3782,6 @@ dependencies = [
"subtle", "subtle",
] ]
[[package]]
name = "untrusted"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
[[package]] [[package]]
name = "url" name = "url"
version = "2.2.2" version = "2.2.2"
@ -4093,16 +4047,6 @@ dependencies = [
"syn", "syn",
] ]
[[package]]
name = "webpki"
version = "0.21.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea"
dependencies = [
"ring",
"untrusted",
]
[[package]] [[package]]
name = "wepoll-ffi" name = "wepoll-ffi"
version = "0.1.2" version = "0.1.2"

2
kanidmd/Cargo.toml
View file

@ -24,7 +24,7 @@ jemallocator = { version = "0.3.0", optional = true }
url = { version = "2", features = ["serde"] } url = { version = "2", features = ["serde"] }
tide = "0.16" tide = "0.16"
tide-rustls = "0.3" tide-openssl = "^0.1.1"
async-trait = "0.1" async-trait = "0.1"
async-h1 = "2.0" async-h1 = "2.0"
fernet = { version = "^0.1.4", features = ["fernet_danger_timestamps"] } fernet = { version = "^0.1.4", features = ["fernet_danger_timestamps"] }

2
kanidmd/src/lib/core/https/mod.rs
View file

@ -15,7 +15,7 @@ use std::path::PathBuf;
use std::str::FromStr; use std::str::FromStr;
use uuid::Uuid; use uuid::Uuid;
use tide_rustls::TlsListener; use tide_openssl::TlsListener;
use crate::tracing_tree::TreeMiddleware; use crate::tracing_tree::TreeMiddleware;
use tracing::{error, info}; use tracing::{error, info};