From 22c2473e3ea9bfae05316753d7bc00f744077828 Mon Sep 17 00:00:00 2001 From: "Dustin C. Hatch" Date: Wed, 31 Jan 2024 19:03:48 -0600 Subject: [PATCH] meta: Fix openidconnect TLS feature deps Since the *openidconnect* dependency was added before the `native-tls`/`rustls` features, it was hard coded to use native TLS. This needs to be conditional based on the application's selected TLS feature. --- Cargo.lock | 22 +++++++++++----------- Cargo.toml | 4 +++- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9a64c0b..edca50f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1705,7 +1705,7 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64", + "base64 0.21.5", ] [[package]] @@ -1742,6 +1742,16 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "sct" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "sec1" version = "0.7.3" @@ -1756,16 +1766,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "security-framework" version = "2.9.2" diff --git a/Cargo.toml b/Cargo.toml index 322258a..ff2862f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,7 +14,7 @@ form_urlencoded = "1.2.0" gethostname = "0.4.3" hyper = { version = "0.14", features = ["server"] } jsonwebtoken = { version = "9.1.0", default-features = false } -openidconnect = { version = "3.4.0", default-features = false, features = ["reqwest", "native-tls"] } +openidconnect = { version = "3.4.0", default-features = false, features = ["reqwest"] } reqwest = { version = "0.11.22", default-features = false, features = ["multipart"] } serde = { version = "1.0.190", features = ["derive"] } serde_json = "1.0.108" @@ -32,7 +32,9 @@ webbrowser = "0.8.12" default = ["native-tls"] native-tls = [ "reqwest/default-tls", + "openidconnect/native-tls", ] rustls = [ "reqwest/rustls-tls", + "openidconnect/rustls-tls" ]