diff options
author | Bartek IwaĆczuk <biwanczuk@gmail.com> | 2024-06-19 15:09:17 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-06-19 16:09:17 +0200 |
commit | b94707af7df757db13f24b7b70dbd7956d1e1e1c (patch) | |
tree | 5e2ce944f66f4fda8b0982b68e7e422c2960753a /tests/integration/run_tests.rs | |
parent | f4eead61ebd0af203784134c0a8b6339874531b5 (diff) |
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
Diffstat (limited to 'tests/integration/run_tests.rs')
-rw-r--r-- | tests/integration/run_tests.rs | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/tests/integration/run_tests.rs b/tests/integration/run_tests.rs index b8263be29..5bd0de60c 100644 --- a/tests/integration/run_tests.rs +++ b/tests/integration/run_tests.rs @@ -5303,19 +5303,17 @@ async fn listen_tls_alpn() { let mut reader = &mut BufReader::new(Cursor::new(include_bytes!( "../testdata/tls/RootCA.crt" ))); - let certs = rustls_pemfile::certs(&mut reader) - .collect::<Result<Vec<_>, _>>() - .unwrap(); + let certs = rustls_pemfile::certs(&mut reader).unwrap(); let mut root_store = rustls::RootCertStore::empty(); - root_store.add_parsable_certificates(certs); + root_store.add_parsable_certificates(&certs); let mut cfg = rustls::ClientConfig::builder() + .with_safe_defaults() .with_root_certificates(root_store) .with_no_client_auth(); cfg.alpn_protocols.push(b"foobar".to_vec()); let cfg = Arc::new(cfg); - let hostname = - rustls::pki_types::ServerName::try_from("localhost".to_string()).unwrap(); + let hostname = rustls::ServerName::try_from("localhost").unwrap(); let tcp_stream = tokio::net::TcpStream::connect("localhost:4504") .await @@ -5357,18 +5355,17 @@ async fn listen_tls_alpn_fail() { let mut reader = &mut BufReader::new(Cursor::new(include_bytes!( "../testdata/tls/RootCA.crt" ))); - let certs = rustls_pemfile::certs(&mut reader) - .collect::<Result<Vec<_>, _>>() - .unwrap(); + let certs = rustls_pemfile::certs(&mut reader).unwrap(); let mut root_store = rustls::RootCertStore::empty(); - root_store.add_parsable_certificates(certs); + root_store.add_parsable_certificates(&certs); let mut cfg = rustls::ClientConfig::builder() + .with_safe_defaults() .with_root_certificates(root_store) .with_no_client_auth(); cfg.alpn_protocols.push(b"boofar".to_vec()); let cfg = Arc::new(cfg); - let hostname = rustls::pki_types::ServerName::try_from("localhost").unwrap(); + let hostname = rustls::ServerName::try_from("localhost").unwrap(); let tcp_stream = tokio::net::TcpStream::connect("localhost:4505") .await |