1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
|
From: Dirkjan Ochtman <dirkjan@ochtman.nl>
From: Maytham Alsudany <maytha8thedev@gmail.com>
Origin: upstream, https://github.com/hickory-dns/hickory-dns/commit/f9646f9494ec7d801fdef63024f2acc684b00f29
Forwarded: not-needed
Subject: [PATCH] Upgrade to rustls-native-certs 0.8
--- a/src/quic/quic_client_stream.rs
+++ b/src/quic/quic_client_stream.rs
@@ -276,8 +276,13 @@
{
use crate::error::ProtoErrorKind;
+ let mut result = rustls_native_certs::load_native_certs();
+ if let Some(err) = result.errors.pop() {
+ return Err(err.into());
+ }
+
let (added, ignored) =
- root_store.add_parsable_certificates(rustls_native_certs::load_native_certs()?.into_iter().map(|cert| rustls::pki_types::CertificateDer::from(cert.0)));
+ root_store.add_parsable_certificates(result.certs);
if ignored > 0 {
tracing::warn!(
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -184,7 +184,7 @@
optional = true
[dependencies.rustls-native-certs]
-version = "0.6.3"
+version = "0.8"
optional = true
[dependencies.rustls-pemfile]
--- a/src/error.rs
+++ b/src/error.rs
@@ -410,6 +410,16 @@
}
}
+#[cfg(all(feature = "native-certs", not(feature = "webpki-roots")))]
+impl From<rustls_native_certs::Error> for ProtoErrorKind {
+ fn from(e: rustls_native_certs::Error) -> Self {
+ match e.kind {
+ rustls_native_certs::ErrorKind::Io { inner, path: _ } => ProtoErrorKind::Io(inner),
+ _ => ProtoErrorKind::NativeCerts,
+ }
+ }
+}
+
impl<T> From<sync::PoisonError<T>> for ProtoError {
fn from(_e: sync::PoisonError<T>) -> Self {
ProtoErrorKind::Poisoned.into()
--- a/src/h2/h2_client_stream.rs
+++ b/src/h2/h2_client_stream.rs
@@ -749,7 +749,7 @@
#[cfg(all(feature = "native-certs", not(feature = "webpki-roots")))]
{
let (added, ignored) = root_store
- .add_parsable_certificates(rustls_native_certs::load_native_certs().unwrap().into_iter().map(|cert| rustls::pki_types::CertificateDer::from(cert.0)));
+ .add_parsable_certificates(rustls_native_certs::load_native_certs().unwrap());
if ignored > 0 {
warn!(
|
