colin/hickory-dns
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use new version of webpki

Browse Source
This commit is contained in:
Zhang Jingqiang 2023-08-02 09:22:56 +08:00 committed by Dirkjan Ochtman
parent 578ce5a497
commit 3f9a68c15e
10 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Cargo.lock generated
View File

@ -1325,9 +1325,9 @@ dependencies = [
[[package]]
name = "rustls"
version = "0.21.1"
version = "0.21.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c911ba11bc8433e811ce56fde130ccf32f5127cab0e0194e9c68c5a5b671791e"
checksum = "79ea77c539259495ce8ca47f53e66ae0330a8819f67e23ac96ca02f50e7b7d36"
dependencies = [
"log",
"ring",
@ -1346,9 +1346,9 @@ dependencies = [
[[package]]
name = "rustls-webpki"
version = "0.100.1"
version = "0.101.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b"
checksum = "513722fd73ad80a71f72b61009ea1b584bcfa1483ca93949c8f290298837fa59"
dependencies = [
"ring",
"untrusted",
@ -2174,12 +2174,9 @@ dependencies = [
[[package]]
name = "webpki-roots"
version = "0.23.0"
version = "0.25.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aa54963694b65584e170cf5dc46aeb4dcaa5584e652ff5f3952e56d66aff0125"
dependencies = [
"rustls-webpki",
]
checksum = "c9c6eda1c830a36f361e7721c87fd79ea84293b54f8c48c959f85ec636f0f196"
[[package]]
name = "widestring"

4
Cargo.toml
View File

@ -62,8 +62,8 @@ native-tls = "0.2"
openssl = "0.10.55"
rustls = "0.21.0"
rustls-pemfile = "1.0.0"
webpki = { version = "0.100.1", package = "rustls-webpki" }
webpki-roots = "0.23.0"
webpki = { version = "0.101.0", package = "rustls-webpki" }
webpki-roots = "0.25.0"
ring = "0.16"

2
bin/tests/named_https_tests.rs
View File

@ -54,7 +54,7 @@ fn test_example_https_toml_startup() {
// using the mozilla default root store
let mut root_store = RootCertStore::empty();
root_store.add_server_trust_anchors(webpki_roots::TLS_SERVER_ROOTS.0.iter().map(|ta| {
root_store.add_server_trust_anchors(webpki_roots::TLS_SERVER_ROOTS.iter().map(|ta| {
OwnedTrustAnchor::from_subject_spki_name_constraints(
ta.subject,
ta.spki,

2
bin/tests/named_quic_tests.rs
View File

@ -46,7 +46,7 @@ fn test_example_quic_toml_startup() {
// using the mozilla default root store
let mut root_store = RootCertStore::empty();
root_store.add_server_trust_anchors(webpki_roots::TLS_SERVER_ROOTS.0.iter().map(|ta| {
root_store.add_server_trust_anchors(webpki_roots::TLS_SERVER_ROOTS.iter().map(|ta| {
OwnedTrustAnchor::from_subject_spki_name_constraints(
ta.subject,
ta.spki,

2
crates/proto/src/https/https_client_stream.rs
View File

@ -736,7 +736,7 @@ mod tests {
fn client_config_tls12_webpki_roots() -> ClientConfig {
use rustls::{OwnedTrustAnchor, RootCertStore};
let mut root_store = RootCertStore::empty();
root_store.add_server_trust_anchors(webpki_roots::TLS_SERVER_ROOTS.0.iter().map(|ta| {
root_store.add_server_trust_anchors(webpki_roots::TLS_SERVER_ROOTS.iter().map(|ta| {
OwnedTrustAnchor::from_subject_spki_name_constraints(
ta.subject,
ta.spki,

2
crates/proto/src/quic/quic_client_stream.rs
View File

@ -273,7 +273,7 @@ impl QuicClientStreamBuilder {
pub fn client_config_tls13_webpki_roots() -> TlsClientConfig {
use rustls::{OwnedTrustAnchor, RootCertStore};
let mut root_store = RootCertStore::empty();
root_store.add_server_trust_anchors(webpki_roots::TLS_SERVER_ROOTS.0.iter().map(|ta| {
root_store.add_server_trust_anchors(webpki_roots::TLS_SERVER_ROOTS.iter().map(|ta| {
OwnedTrustAnchor::from_subject_spki_name_constraints(
ta.subject,
ta.spki,

2
crates/resolver/src/config.rs
View File

@ -262,7 +262,7 @@ impl ResolverConfig {
/// use webpki_roots;
///
/// let mut root_store = RootCertStore::empty();
/// root_store.add_server_trust_anchors(webpki_roots::TLS_SERVER_ROOTS.0.iter().map(|ta| {
/// root_store.add_server_trust_anchors(webpki_roots::TLS_SERVER_ROOTS.iter().map(|ta| {
/// OwnedTrustAnchor::from_subject_spki_name_constraints(
/// ta.subject,
/// ta.spki,

2
crates/resolver/src/tls/dns_over_rustls.rs
View File

@ -30,7 +30,7 @@ const ALPN_H2: &[u8] = b"h2";
// using the mozilla default root store
pub(crate) static CLIENT_CONFIG: Lazy<Arc<ClientConfig>> = Lazy::new(|| {
let mut root_store = RootCertStore::empty();
root_store.add_server_trust_anchors(webpki_roots::TLS_SERVER_ROOTS.0.iter().map(|ta| {
root_store.add_server_trust_anchors(webpki_roots::TLS_SERVER_ROOTS.iter().map(|ta| {
OwnedTrustAnchor::from_subject_spki_name_constraints(
ta.subject,
ta.spki,

2
tests/integration-tests/tests/client_future_tests.rs
View File

@ -141,7 +141,7 @@ fn test_query_https() {
// using the mozilla default root store
let mut root_store = RootCertStore::empty();
root_store.add_server_trust_anchors(webpki_roots::TLS_SERVER_ROOTS.0.iter().map(|ta| {
root_store.add_server_trust_anchors(webpki_roots::TLS_SERVER_ROOTS.iter().map(|ta| {
OwnedTrustAnchor::from_subject_spki_name_constraints(
ta.subject,
ta.spki,

2
util/src/dns.rs
View File

@ -479,7 +479,7 @@ fn record_set_from(
#[cfg(feature = "dns-over-rustls")]
fn tls_config() -> ClientConfig {
let mut root_store = RootCertStore::empty();
root_store.add_server_trust_anchors(webpki_roots::TLS_SERVER_ROOTS.0.iter().map(|ta| {
root_store.add_server_trust_anchors(webpki_roots::TLS_SERVER_ROOTS.iter().map(|ta| {
OwnedTrustAnchor::from_subject_spki_name_constraints(
ta.subject,
ta.spki,