Openssl didnt work, switching to rustls.

This commit is contained in:
Dessalines 2020-09-19 16:43:05 -05:00
parent 58428b057f
commit 7d7fdda37f
4 changed files with 60 additions and 13 deletions

67
Cargo.lock generated
View file

@ -81,10 +81,11 @@ dependencies = [
"futures-util", "futures-util",
"http", "http",
"log", "log",
"openssl", "rustls",
"tokio-openssl", "tokio-rustls",
"trust-dns-proto", "trust-dns-proto",
"trust-dns-resolver", "trust-dns-resolver",
"webpki",
] ]
[[package]] [[package]]
@ -263,8 +264,10 @@ dependencies = [
"actix-service", "actix-service",
"actix-utils", "actix-utils",
"futures-util", "futures-util",
"openssl", "rustls",
"tokio-openssl", "tokio-rustls",
"webpki",
"webpki-roots",
] ]
[[package]] [[package]]
@ -315,9 +318,9 @@ dependencies = [
"fxhash", "fxhash",
"log", "log",
"mime", "mime",
"openssl",
"pin-project", "pin-project",
"regex", "regex",
"rustls",
"serde 1.0.116", "serde 1.0.116",
"serde_json", "serde_json",
"serde_urlencoded", "serde_urlencoded",
@ -487,9 +490,9 @@ dependencies = [
"futures-core", "futures-core",
"log", "log",
"mime", "mime",
"openssl",
"percent-encoding", "percent-encoding",
"rand 0.7.3", "rand 0.7.3",
"rustls",
"serde 1.0.116", "serde 1.0.116",
"serde_json", "serde_json",
"serde_urlencoded", "serde_urlencoded",
@ -2884,6 +2887,19 @@ dependencies = [
"semver", "semver",
] ]
[[package]]
name = "rustls"
version = "0.18.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5d1126dcf58e93cee7d098dbda643b5f92ed724f1f6a63007c1116eed6700c81"
dependencies = [
"base64 0.12.3",
"log",
"ring",
"sct",
"webpki",
]
[[package]] [[package]]
name = "ryu" name = "ryu"
version = "1.0.5" version = "1.0.5"
@ -2927,6 +2943,16 @@ 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.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e3042af939fca8c3453b7af0f1c66e533a15a86169e39de2657310ade8f98d3c"
dependencies = [
"ring",
"untrusted",
]
[[package]] [[package]]
name = "security-framework" name = "security-framework"
version = "0.4.4" version = "0.4.4"
@ -3390,13 +3416,15 @@ dependencies = [
] ]
[[package]] [[package]]
name = "tokio-openssl" name = "tokio-rustls"
version = "0.4.0" version = "0.14.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c4b08c5f4208e699ede3df2520aca2e82401b2de33f45e96696a074480be594" checksum = "e12831b255bcfa39dc0436b01e19fea231a37db570686c06ee72c423479f889a"
dependencies = [ dependencies = [
"openssl", "futures-core",
"rustls",
"tokio", "tokio",
"webpki",
] ]
[[package]] [[package]]
@ -3774,6 +3802,25 @@ dependencies = [
"wasm-bindgen", "wasm-bindgen",
] ]
[[package]]
name = "webpki"
version = "0.21.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ab146130f5f790d45f82aeeb09e55a256573373ec64409fc19a6fb82fb1032ae"
dependencies = [
"ring",
"untrusted",
]
[[package]]
name = "webpki-roots"
version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f20dea7535251981a9670857150d571846545088359b28e4951d350bdaf179f"
dependencies = [
"webpki",
]
[[package]] [[package]]
name = "widestring" name = "widestring"
version = "0.4.2" version = "0.4.2"

View file

@ -29,7 +29,7 @@ chrono = { version = "0.4", features = ["serde"] }
serde_json = { version = "1.0", features = ["preserve_order"]} serde_json = { version = "1.0", features = ["preserve_order"]}
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
actix = "0.10" actix = "0.10"
actix-web = { version = "3.0", default-features = false, features = ["openssl"] } actix-web = { version = "3.0", default-features = false, features = ["rustls"] }
actix-files = { version = "0.3", default-features = false } actix-files = { version = "0.3", default-features = false }
actix-web-actors = { version = "3.0", default-features = false } actix-web-actors = { version = "3.0", default-features = false }
actix-rt = { version = "1.1", default-features = false } actix-rt = { version = "1.1", default-features = false }

View file

@ -14,5 +14,5 @@ tokio = "0.2"
strum = "0.19" strum = "0.19"
strum_macros = "0.19" strum_macros = "0.19"
futures = "0.3.5" futures = "0.3.5"
actix-web = { version = "3.0", default-features = false, features = ["openssl"] } actix-web = { version = "3.0", default-features = false, features = ["rustls"] }
log = "0.4" log = "0.4"

View file

@ -25,5 +25,5 @@ comrak = "0.8"
lazy_static = "1.3" lazy_static = "1.3"
openssl = "0.10" openssl = "0.10"
url = { version = "2.1", features = ["serde"] } url = { version = "2.1", features = ["serde"] }
actix-web = { version = "3.0", default-features = false, features = ["openssl"] } actix-web = { version = "3.0", default-features = false, features = ["rustls"] }
anyhow = "1.0" anyhow = "1.0"