summaryrefslogtreecommitdiff
path: root/tests/integration/run_tests.rs
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 /tests/integration/run_tests.rs
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 'tests/integration/run_tests.rs')
-rw-r--r--tests/integration/run_tests.rs19
1 files changed, 11 insertions, 8 deletions
diff --git a/tests/integration/run_tests.rs b/tests/integration/run_tests.rs
index 0dadc0079..0d1804a28 100644
--- a/tests/integration/run_tests.rs
+++ b/tests/integration/run_tests.rs
@@ -5295,17 +5295,19 @@ 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).unwrap();
+ let certs = rustls_pemfile::certs(&mut reader)
+ .collect::<Result<Vec<_>, _>>()
+ .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::ServerName::try_from("localhost").unwrap();
+ let hostname =
+ rustls::pki_types::ServerName::try_from("localhost".to_string()).unwrap();
let tcp_stream = tokio::net::TcpStream::connect("localhost:4504")
.await
@@ -5347,17 +5349,18 @@ 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).unwrap();
+ let certs = rustls_pemfile::certs(&mut reader)
+ .collect::<Result<Vec<_>, _>>()
+ .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::ServerName::try_from("localhost").unwrap();
+ let hostname = rustls::pki_types::ServerName::try_from("localhost").unwrap();
let tcp_stream = tokio::net::TcpStream::connect("localhost:4505")
.await