From b94707af7df757db13f24b7b70dbd7956d1e1e1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= <biwanczuk@gmail.com>
Date: Wed, 19 Jun 2024 15:09:17 +0100
Subject: Revert "chore: upgrade to reqwest 0.12.4 and rustls 0.22 (#24056)"
 (#24262)

This reverts commit fb31eaa9ca59f6daaee0210d5cd206185c7041b9.

Reverting because users reported spurious errors when downloading
dependencies - https://github.com/denoland/deno/issues/24260.

Closes https://github.com/denoland/deno/issues/24260
---
 cli/args/mod.rs | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'cli/args/mod.rs')

diff --git a/cli/args/mod.rs b/cli/args/mod.rs
index c0172e80b..742249835 100644
--- a/cli/args/mod.rs
+++ b/cli/args/mod.rs
@@ -696,13 +696,21 @@ pub fn get_root_cert_store(
   for store in ca_stores.iter() {
     match store.as_str() {
       "mozilla" => {
-        root_cert_store.extend(webpki_roots::TLS_SERVER_ROOTS.to_vec());
+        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,
+            )
+          }),
+        );
       }
       "system" => {
         let roots = load_native_certs().expect("could not load platform certs");
         for root in roots {
           root_cert_store
-            .add(rustls::pki_types::CertificateDer::from(root.0))
+            .add(&rustls::Certificate(root.0))
             .expect("Failed to add platform cert to root cert store");
         }
       }
@@ -726,17 +734,17 @@ pub fn get_root_cert_store(
           RootCertStoreLoadError::CaFileOpenError(err.to_string())
         })?;
         let mut reader = BufReader::new(certfile);
-        rustls_pemfile::certs(&mut reader).collect::<Result<Vec<_>, _>>()
+        rustls_pemfile::certs(&mut reader)
       }
       CaData::Bytes(data) => {
         let mut reader = BufReader::new(Cursor::new(data));
-        rustls_pemfile::certs(&mut reader).collect::<Result<Vec<_>, _>>()
+        rustls_pemfile::certs(&mut reader)
       }
     };
 
     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()));
-- 
cgit v1.2.3