Skip to content

Commit

Permalink
chore(deps): update webpki-roots and tls (#1068)
Browse files Browse the repository at this point in the history
  • Loading branch information
niklasad1 authored Apr 13, 2023
1 parent 191167a commit e3b00da
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 15 deletions.
2 changes: 1 addition & 1 deletion client/http-client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ documentation = "https://docs.rs/jsonrpsee-http-client"
[dependencies]
async-trait = "0.1"
hyper = { version = "0.14.10", features = ["client", "http1", "http2", "tcp"] }
hyper-rustls = { version = "0.23", optional = true, default-features = false, features = ["http1", "tls12", "logging"] }
hyper-rustls = { version = "0.24", optional = true, default-features = false, features = ["http1", "tls12", "logging"] }
jsonrpsee-types = { path = "../../types", version = "0.16.2" }
jsonrpsee-core = { path = "../../core", version = "0.16.2", features = ["client", "http-helpers"] }
serde = { version = "1.0", default-features = false, features = ["derive"] }
Expand Down
4 changes: 2 additions & 2 deletions client/transport/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ pin-project = { version = "1", optional = true }

# tls
rustls-native-certs = { version = "0.6", optional = true }
webpki-roots = { version = "0.22", optional = true }
tokio-rustls = { version = "0.23", optional = true }
webpki-roots = { version = "0.23", optional = true }
tokio-rustls = { version = "0.24", optional = true }

# ws
soketto = { version = "0.7.1", optional = true }
Expand Down
12 changes: 0 additions & 12 deletions client/transport/src/ws/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -182,11 +182,6 @@ pub enum WsHandshakeError {
#[error("Error in the WebSocket handshake: {0}")]
Transport(#[source] soketto::handshake::Error),

/// Invalid DNS name error for TLS
#[cfg(feature = "__tls")]
#[error("Invalid DNS name: {0}")]
InvalidDnsName(#[source] tokio_rustls::webpki::InvalidDnsNameError),

/// Server rejected the handshake.
#[error("Connection rejected with status code: {status_code}")]
Rejected {
Expand Down Expand Up @@ -466,13 +461,6 @@ impl From<io::Error> for WsHandshakeError {
}
}

#[cfg(feature = "__tls")]
impl From<tokio_rustls::webpki::InvalidDnsNameError> for WsHandshakeError {
fn from(err: tokio_rustls::webpki::InvalidDnsNameError) -> WsHandshakeError {
WsHandshakeError::InvalidDnsName(err)
}
}

impl From<soketto::handshake::Error> for WsHandshakeError {
fn from(err: soketto::handshake::Error) -> WsHandshakeError {
WsHandshakeError::Transport(err)
Expand Down

0 comments on commit e3b00da

Please sign in to comment.