From 7e75fdc20ac2e2860f9ecd26a9bfe56637324e16 Mon Sep 17 00:00:00 2001
From: Eirik A <sszynrae@gmail.com>
Date: Mon, 3 Apr 2023 19:55:22 +0100
Subject: [PATCH] Bump rustls,hyper-rustls - for #1181 (#1182)

* Bump pem,rustls,hyper-rustls - for #1181

Leftover dependabot PRs that needed to go together.

Signed-off-by: clux <sszynrae@gmail.com>

* Fix deny for rustls webpki license

Signed-off-by: clux <sszynrae@gmail.com>

* skip windows tree in deny

we don't need to be as strict with versions on this platform

Signed-off-by: clux <sszynrae@gmail.com>

* fix moved import

Signed-off-by: clux <sszynrae@gmail.com>

* downgrade pem, for now

Signed-off-by: clux <sszynrae@gmail.com>

---------

Signed-off-by: clux <sszynrae@gmail.com>
---
 deny.toml                     | 13 +++++++++++++
 kube-client/Cargo.toml        |  4 ++--
 kube-client/src/client/tls.rs |  3 +--
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/deny.toml b/deny.toml
index 01689d056..c81e6ec63 100644
--- a/deny.toml
+++ b/deny.toml
@@ -69,6 +69,14 @@ license-files = [
     { path = "LICENSE", hash = 0x001c7e6c },
 ]
 
+# rustls' webpki fork uses same license https://github.com/rustls/webpki
+[[licenses.clarify]]
+name = "rustls-webpki"
+expression = "LicenseRef-webpki"
+license-files = [
+    { path = "LICENSE", hash = 0x001c7e6c },
+]
+
 [sources]
 unknown-registry = "deny"
 unknown-git = "deny"
@@ -103,3 +111,8 @@ name = "base64"
 [[bans.skip]]
 # deep in dependency tree, only dual use via dev dependency
 name = "redox_syscall"
+
+[[bans.skip-tree]]
+name = "windows-sys"
+[[bans.skip-tree]]
+name = "windows"
diff --git a/kube-client/Cargo.toml b/kube-client/Cargo.toml
index 567050be3..7e18c2de2 100644
--- a/kube-client/Cargo.toml
+++ b/kube-client/Cargo.toml
@@ -49,7 +49,7 @@ thiserror = "1.0.29"
 futures = { version = "0.3.17", optional = true }
 pem = { version = "1.1.0", optional = true }
 openssl = { version = "0.10.36", optional = true }
-rustls = { version = "0.20.3", features = ["dangerous_configuration"], optional = true }
+rustls = { version = "0.21.0", features = ["dangerous_configuration"], optional = true }
 rustls-pemfile = { version = "1.0.0", optional = true }
 bytes = { version = "1.1.0", optional = true }
 tokio = { version = "1.14.0", features = ["time", "signal", "sync"], optional = true }
@@ -57,7 +57,7 @@ kube-core = { path = "../kube-core", version = "=0.80.0" }
 jsonpath_lib = { version = "0.3.0", optional = true }
 tokio-util = { version = "0.7.0", optional = true, features = ["io", "codec"] }
 hyper = { version = "0.14.13", optional = true, features = ["client", "http1", "stream", "tcp"] }
-hyper-rustls = { version = "0.23.2", optional = true }
+hyper-rustls = { version = "0.24.0", optional = true }
 tokio-tungstenite = { version = "0.18.0", optional = true }
 tower = { version = "0.4.6", optional = true, features = ["buffer", "filter", "util"] }
 tower-http = { version = "0.4.0", optional = true, features = ["auth", "map-response-body", "trace"] }
diff --git a/kube-client/src/client/tls.rs b/kube-client/src/client/tls.rs
index 1408847af..3c84477f9 100644
--- a/kube-client/src/client/tls.rs
+++ b/kube-client/src/client/tls.rs
@@ -4,8 +4,7 @@ pub mod rustls_tls {
     use rustls::{
         self,
         client::{HandshakeSignatureValid, ServerCertVerified, ServerCertVerifier},
-        internal::msgs::handshake::DigitallySignedStruct,
-        Certificate, ClientConfig, PrivateKey,
+        Certificate, ClientConfig, DigitallySignedStruct, PrivateKey,
     };
     use thiserror::Error;