summaryrefslogtreecommitdiff
path: root/cli
diff options
context:
space:
mode:
authorBartek IwaƄczuk <biwanczuk@gmail.com>2024-07-02 01:09:47 +0100
committerGitHub <noreply@github.com>2024-07-02 02:09:47 +0200
commit8db420d552bc1d480a21748d73b566b623a266c1 (patch)
tree4634447ec235f3d4f743a233c500425409236097 /cli
parent9c1f741112f87ba97125e19efb3abf918205ad23 (diff)
chore: upgrade to reqwest 0.12.4 and rustls 0.22 (#24388)
Reland of https://github.com/denoland/deno/pull/24056 that doesn't suffer from the problem that was discovered in https://github.com/denoland/deno/pull/24261. It uses upgraded `hyper` and `hyper-util` that fixed the previous problem in https://github.com/hyperium/hyper/pull/3691.
Diffstat (limited to 'cli')
-rw-r--r--cli/args/mod.rs18
-rw-r--r--cli/http_util.rs2
2 files changed, 6 insertions, 14 deletions
diff --git a/cli/args/mod.rs b/cli/args/mod.rs
index 187304d5d..e1e6f9510 100644
--- a/cli/args/mod.rs
+++ b/cli/args/mod.rs
@@ -705,21 +705,13 @@ pub fn get_root_cert_store(
for store in ca_stores.iter() {
match store.as_str() {
"mozilla" => {
- root_cert_store.add_trust_anchors(
- webpki_roots::TLS_SERVER_ROOTS.iter().map(|ta| {
- rustls::OwnedTrustAnchor::from_subject_spki_name_constraints(
- ta.subject,
- ta.spki,
- ta.name_constraints,
- )
- }),
- );
+ root_cert_store.extend(webpki_roots::TLS_SERVER_ROOTS.to_vec());
}
"system" => {
let roots = load_native_certs().expect("could not load platform certs");
for root in roots {
root_cert_store
- .add(&rustls::Certificate(root.0))
+ .add(rustls::pki_types::CertificateDer::from(root.0))
.expect("Failed to add platform cert to root cert store");
}
}
@@ -743,17 +735,17 @@ pub fn get_root_cert_store(
RootCertStoreLoadError::CaFileOpenError(err.to_string())
})?;
let mut reader = BufReader::new(certfile);
- rustls_pemfile::certs(&mut reader)
+ rustls_pemfile::certs(&mut reader).collect::<Result<Vec<_>, _>>()
}
CaData::Bytes(data) => {
let mut reader = BufReader::new(Cursor::new(data));
- rustls_pemfile::certs(&mut reader)
+ rustls_pemfile::certs(&mut reader).collect::<Result<Vec<_>, _>>()
}
};
match result {
Ok(certs) => {
- root_cert_store.add_parsable_certificates(&certs);
+ root_cert_store.add_parsable_certificates(certs);
}
Err(e) => {
return Err(RootCertStoreLoadError::FailedAddPemFile(e.to_string()));
diff --git a/cli/http_util.rs b/cli/http_util.rs
index 7fcce616b..18c0687bd 100644
--- a/cli/http_util.rs
+++ b/cli/http_util.rs
@@ -587,7 +587,7 @@ mod test {
use std::collections::HashSet;
use std::hash::RandomState;
- use deno_runtime::deno_tls::RootCertStore;
+ use deno_runtime::deno_tls::rustls::RootCertStore;
use crate::version;