chore: separate rustls and rustls-no-provider features (#2903)

Author: seanmonstar

Cargo.toml

@@ -44,7 +44,7 @@ default-tls = ["rustls"]
 
 http2 = ["h2", "hyper/http2", "hyper-util/http2", "hyper-rustls?/http2"]
 
-rustls = ["rustls-no-provider", "__rustls-aws-lc-rs"]
+rustls = ["__rustls-aws-lc-rs", "dep:rustls-platform-verifier", "__rustls"]
 rustls-no-provider = ["dep:rustls-platform-verifier", "__rustls"]
 
 native-tls = ["dep:hyper-tls", "dep:native-tls-crate", "__tls", "dep:tokio-native-tls"]

tests/badssl.rs

@@ -53,10 +53,11 @@ async fn test_badssl_no_built_in_roots() {
     assert!(result.is_err());
 }
 
-#[cfg(any(feature = "native-tls", feature = "rustls"))]
+#[cfg(any(feature = "native-tls"))]
 #[tokio::test]
 async fn test_badssl_wrong_host() {
     let text = reqwest::Client::builder()
+        .tls_backend_native()
         .tls_danger_accept_invalid_hostnames(true)
         .no_proxy()
         .build()
@@ -72,6 +73,7 @@ async fn test_badssl_wrong_host() {
     assert!(text.contains("<title>wrong.host.badssl.com</title>"));
 
     let result = reqwest::Client::builder()
+        .tls_backend_native()
         .tls_danger_accept_invalid_hostnames(true)
         .build()
         .unwrap()

tests/client.rs

@@ -351,15 +351,19 @@ fn use_preconfigured_native_tls_default() {
         .expect("preconfigured default tls");
 }
 
-#[cfg(feature = "__rustls")]
+#[cfg(feature = "rustls")] // needs a TLS provider
 #[test]
 fn use_preconfigured_rustls_default() {
     extern crate rustls;
 
     let root_cert_store = rustls::RootCertStore::empty();
-    let tls = rustls::ClientConfig::builder()
-        .with_root_certificates(root_cert_store)
-        .with_no_client_auth();
+    let tls = rustls::ClientConfig::builder_with_provider(std::sync::Arc::new(
+        rustls::crypto::aws_lc_rs::default_provider(),
+    ))
+    .with_safe_default_protocol_versions()
+    .unwrap()
+    .with_root_certificates(root_cert_store)
+    .with_no_client_auth();
 
     reqwest::Client::builder()
         .use_preconfigured_tls(tls)