do not set rustls default provider

only applications should be setting default from main: https://docs.rs/rustls/latest/rustls/crypto/struct.CryptoProvider.html#using-the-per-process-default-cryptoprovider
dermesser · Jun 17, 2024 · 8d7c2f8 · 8d7c2f8
1 parent e711b1b
commit 8d7c2f8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 14 deletions.
diff --git a/src/authenticator.rs b/src/authenticator.rs
@@ -579,7 +579,6 @@ impl<C, F> AuthenticatorBuilder<C, F> {
     }
 
     fn new(auth_flow: F, hyper_client_builder: C) -> AuthenticatorBuilder<C, F> {
-        install_crypto_provider_if_not_set();
         AuthenticatorBuilder {
             hyper_client_builder,
             storage_type: StorageType::Memory,
@@ -1004,7 +1003,7 @@ impl HyperClientBuilder for DefaultHyperClient {
     ) -> Result<hyper_util::client::legacy::Client<Self::Connector, String>, Error> {
         #[cfg(feature = "hyper-rustls")]
         let connector = hyper_rustls::HttpsConnectorBuilder::new()
-            .with_native_roots()?
+            .with_provider_and_native_roots(rustls::crypto::ring::default_provider())?
             .https_or_http()
             .enable_http1()
             .enable_http2()
@@ -1024,7 +1023,7 @@ impl HyperClientBuilder for DefaultHyperClient {
     ) -> hyper_util::client::legacy::Client<Self::Connector, String> {
         #[cfg(feature = "hyper-rustls")]
         let connector = hyper_rustls::HttpsConnectorBuilder::new()
-            .with_native_roots()
+            .with_provider_and_native_roots(rustls::crypto::ring::default_provider())
             .unwrap()
             .https_or_http()
             .enable_http1()
@@ -1066,16 +1065,6 @@ enum StorageType {
     Custom(Box<dyn TokenStorage>),
 }
 
-#[cfg(feature = "hyper-rustls")]
-fn install_crypto_provider_if_not_set() {
-    if rustls::crypto::CryptoProvider::get_default().is_none() {
-        let _ = rustls::crypto::ring::default_provider().install_default();
-    }
-}
-
-#[cfg(not(feature = "hyper-rustls"))]
-fn install_crypto_provider_if_not_set() {}
-
 #[cfg(test)]
 mod tests {
     #[test]

diff --git a/src/service_account.rs b/src/service_account.rs
@@ -243,7 +243,7 @@ mod tests {
             hyper_util::client::legacy::Client::builder(hyper_util::rt::TokioExecutor::new())
                 .build(
                     hyper_rustls::HttpsConnectorBuilder::new()
-                        .with_native_roots()
+                        .with_provider_and_native_roots(rustls::crypto::ring::default_provider())
                         .unwrap()
                         .https_only()
                         .enable_http1()