summaryrefslogtreecommitdiff
path: root/cli
diff options
context:
space:
mode:
authorBartek Iwańczuk <biwanczuk@gmail.com>2024-06-13 21:41:26 +0100
committerGitHub <noreply@github.com>2024-06-13 22:41:26 +0200
commitfb31eaa9ca59f6daaee0210d5cd206185c7041b9 (patch)
tree0c4ebc81ed7b44b683f31281accc47d451d09718 /cli
parent518e4d3b3a93838e0f2dbcc4d3b79f8f395db563 (diff)
chore: upgrade to reqwest 0.12.4 and rustls 0.22 (#24056)
This commit updates Deno to use `reqwest` at 0.12.4 and `rustls` at 0.22. Other related crates were updated as well to match versions accepted by `reqwest` and `rustls`. Note: we are not using the latest available `rustls` yet, but this upgrade was non-trivial already, so a bump to 0.23 for `rustls` will be done in a separate commit. Closes #23370 --------- Signed-off-by: Ryan Dahl <ry@tinyclouds.org> Signed-off-by: Bartek Iwańczuk <biwanczuk@gmail.com> Co-authored-by: Ryan Dahl <ry@tinyclouds.org> Co-authored-by: Divy Srivastava <dj.srivastava23@gmail.com>
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 742249835..c0172e80b 100644
--- a/cli/args/mod.rs
+++ b/cli/args/mod.rs
@@ -696,21 +696,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");
}
}
@@ -734,17 +726,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;