mempool/rust-electrum-client
mempool/rust-electrum-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge bitcoindevkit/rust-electrum-client#117: Remove webpki and bump webpki-roots to v0.25

Browse Source 
a331ae8059 Remove `webpki` and bump `webpki-roots` to `v0.25` (Yuki Kishimoto)

Pull request description:

  I noticed that `webpki` dependency is no longer maintained and that has a high severity vulnerability.
  This PR remove the `webpki` dependency and bump `webpki-roots` to v0.25

ACKs for top commit:
  notmandatory:
    ACK a331ae8059

Tree-SHA512: 63e9498dc0d56a07e7dd09dd43ca9a924d7e9ebb09934f2c762e64c9ce163cd58edb4d1563db4eba18a0fdf22642cb7d801940baeb97b6ce5473970b739278d4
This commit is contained in:
Steve Myers 2023-12-06 22:51:36 -06:00
commit dacd772d5e
No known key found for this signature in database
GPG Key ID: 8105A46B22C2D051
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Cargo.toml
View File

@ -26,8 +26,7 @@ serde_json = { version = "^1.0" }
# Optional dependencies
openssl = { version = "0.10", optional = true }
rustls = { version = "0.21", optional = true, features = ["dangerous_configuration"] }
webpki = { version = "0.22", optional = true }
webpki-roots = { version = "0.22", optional = true }
webpki-roots = { version = "0.25", optional = true }
byteorder = { version = "1.0", optional = true }
@ -42,5 +41,5 @@ default = ["proxy", "use-rustls"]
minimal = []
debug-calls = []
proxy = ["byteorder", "winapi", "libc"]
use-rustls = ["webpki", "webpki-roots", "rustls"]
use-rustls = ["webpki-roots", "rustls"]
use-openssl = ["openssl"]

2
src/lib.rs
View File

@ -33,8 +33,6 @@ extern crate rustls;
extern crate serde;
extern crate serde_json;
#[cfg(any(feature = "use-rustls", feature = "default"))]
extern crate webpki;
#[cfg(any(feature = "use-rustls", feature = "default"))]
extern crate webpki_roots;

2
src/raw_client.rs
View File

@ -365,7 +365,7 @@ impl RawClient<ElectrumSslStream> {
socket_addr.domain().ok_or(Error::MissingDomain)?;
let mut store = RootCertStore::empty();
store.add_server_trust_anchors(webpki_roots::TLS_SERVER_ROOTS.0.into_iter().map(|t| {
store.add_trust_anchors(webpki_roots::TLS_SERVER_ROOTS.into_iter().map(|t| {
OwnedTrustAnchor::from_subject_spki_name_constraints(
t.subject,
t.spki,