Skip to content

Commit

Permalink
Bump rustls,hyper-rustls - for #1181 (#1182)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
clux committed Apr 3, 2023
1 parent b1cd5f2 commit 7e75fdc
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 4 deletions.
13 changes: 13 additions & 0 deletions deny.toml
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
4 changes: 2 additions & 2 deletions kube-client/Cargo.toml
Expand Up @@ -49,15 +49,15 @@ 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 }
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"] }
Expand Down
3 changes: 1 addition & 2 deletions kube-client/src/client/tls.rs
Expand Up @@ -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;

Expand Down

0 comments on commit 7e75fdc

Please sign in to comment.