Skip to content

Commit e86d545

Browse files
prestwichniklasad1
andauthored
chore: fix subdep issue (#1537)
* chore: fix subdep issue * chore: more verbose dep spec * Update client/transport/Cargo.toml --------- Co-authored-by: Niklas Adolfsson <niklasadolfsson1@gmail.com>
1 parent 9845db8 commit e86d545

File tree

5 files changed

+26
-18
lines changed

5 files changed

+26
-18
lines changed

Cargo.toml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ resolver = "2"
2020

2121
[workspace.package]
2222
authors = ["Parity Technologies <admin@parity.io>", "Pierre Krieger <pierre.krieger1708@gmail.com>"]
23-
version = "0.24.8"
23+
version = "0.24.9"
2424
edition = "2021"
2525
rust-version = "1.74.0"
2626
license = "MIT"
@@ -31,14 +31,14 @@ keywords = ["jsonrpc", "json", "http", "websocket", "WASM"]
3131
readme = "README.md"
3232

3333
[workspace.dependencies]
34-
jsonrpsee-types = { path = "types", version = "0.24.7" }
35-
jsonrpsee-core = { path = "core", version = "0.24.7" }
36-
jsonrpsee-server = { path = "server", version = "0.24.7" }
37-
jsonrpsee-ws-client = { path = "client/ws-client", version = "0.24.7" }
38-
jsonrpsee-http-client = { path = "client/http-client", version = "0.24.7" }
39-
jsonrpsee-wasm-client = { path = "client/wasm-client", version = "0.24.7" }
40-
jsonrpsee-client-transport = { path = "client/transport", version = "0.24.7" }
41-
jsonrpsee-proc-macros = { path = "proc-macros", version = "0.24.7" }
34+
jsonrpsee-types = { path = "types", version = "0.24.9" }
35+
jsonrpsee-core = { path = "core", version = "0.24.9" }
36+
jsonrpsee-server = { path = "server", version = "0.24.9" }
37+
jsonrpsee-ws-client = { path = "client/ws-client", version = "0.24.9" }
38+
jsonrpsee-http-client = { path = "client/http-client", version = "0.24.9" }
39+
jsonrpsee-wasm-client = { path = "client/wasm-client", version = "0.24.9" }
40+
jsonrpsee-client-transport = { path = "client/transport", version = "0.24.9" }
41+
jsonrpsee-proc-macros = { path = "proc-macros", version = "0.24.9" }
4242

4343
tower = "0.4"
4444
tower-http = "0.5"

client/http-client/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ http-body = "1"
2323
jsonrpsee-types = { workspace = true }
2424
jsonrpsee-core = { workspace = true, features = ["client", "http-helpers"] }
2525
rustls = { version = "0.23.7", default-features = false, optional = true, features = ["logging", "std", "tls12", "ring"] }
26-
rustls-platform-verifier = { version = "0.3", optional = true }
26+
rustls-platform-verifier = { version = ">0.5.1", optional = true }
2727
serde = { version = "1.0", default-features = false, features = ["derive"] }
2828
serde_json = "1"
2929
thiserror = "1"

client/http-client/src/transport.rs

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -230,11 +230,15 @@ impl<L> HttpTransportClientBuilder<L> {
230230
http_conn.enforce_http(false);
231231

232232
let https_conn = match certificate_store {
233-
CertificateStore::Native => hyper_rustls::HttpsConnectorBuilder::new()
234-
.with_tls_config(rustls_platform_verifier::tls_config())
235-
.https_or_http()
236-
.enable_all_versions()
237-
.wrap_connector(http_conn),
233+
CertificateStore::Native => {
234+
use rustls_platform_verifier::ConfigVerifierExt;
235+
236+
hyper_rustls::HttpsConnectorBuilder::new()
237+
.with_tls_config(rustls::ClientConfig::with_platform_verifier())
238+
.https_or_http()
239+
.enable_all_versions()
240+
.wrap_connector(http_conn)
241+
}
238242

239243
CertificateStore::Custom(tls_config) => hyper_rustls::HttpsConnectorBuilder::new()
240244
.with_tls_config(tls_config)

client/transport/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ base64 = { version = "0.22", default-features = false, features = ["alloc"], opt
3030
# tls
3131
tokio-rustls = { version = "0.26", default-features = false, optional = true, features = ["logging", "tls12", "ring"] }
3232
rustls-pki-types = { version = "1", optional = true }
33-
rustls-platform-verifier = { version = "0.3.1", optional = true }
33+
rustls-platform-verifier = { version = "0.5.1", optional = true }
3434
rustls = { version = "0.23", default-features = false, optional = true }
3535

3636
# ws

client/transport/src/ws/mod.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -633,13 +633,17 @@ impl TryFrom<url::Url> for Target {
633633
fn build_tls_config(cert_store: &CertificateStore) -> Result<tokio_rustls::TlsConnector, WsHandshakeError> {
634634
let config = match cert_store {
635635
#[cfg(feature = "tls-rustls-platform-verifier")]
636-
CertificateStore::Native => rustls_platform_verifier::tls_config(),
636+
CertificateStore::Native => {
637+
use rustls_platform_verifier::ConfigVerifierExt;
638+
639+
rustls::ClientConfig::with_platform_verifier()
640+
}
637641
#[cfg(not(feature = "tls-rustls-platform-verifier"))]
638642
CertificateStore::Native => {
639643
return Err(WsHandshakeError::CertificateStore(io::Error::new(
640644
io::ErrorKind::Other,
641645
"Native certificate store not supported, either call `Builder::with_custom_cert_store` or enable the `tls-rustls-platform-verifier` feature.",
642-
)))
646+
)));
643647
}
644648
CertificateStore::Custom(cfg) => cfg.clone(),
645649
};

0 commit comments

Comments
 (0)