diff options
author | Bartek IwaĆczuk <biwanczuk@gmail.com> | 2024-07-02 01:09:47 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-07-02 02:09:47 +0200 |
commit | 8db420d552bc1d480a21748d73b566b623a266c1 (patch) | |
tree | 4634447ec235f3d4f743a233c500425409236097 /tests/integration | |
parent | 9c1f741112f87ba97125e19efb3abf918205ad23 (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 'tests/integration')
-rw-r--r-- | tests/integration/run_tests.rs | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/tests/integration/run_tests.rs b/tests/integration/run_tests.rs index 5bd0de60c..b8263be29 100644 --- a/tests/integration/run_tests.rs +++ b/tests/integration/run_tests.rs @@ -5303,17 +5303,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 @@ -5355,17 +5357,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 |