Updated dependencies

Author: ancwrd1

Cargo.lock

@@ -9,7 +9,7 @@ use clap::Parser;
 use rustls::{
     ClientConfig, ClientConnection, RootCertStore, Stream,
     client::{ClientCredentialResolver, CredentialRequest},
-    crypto::{Credentials, Identity, SelectedCredential},
+    crypto::{Credentials, CryptoProvider, Identity, SelectedCredential},
     enums::CertificateType,
 };
 use rustls_pki_types::{CertificateDer, ServerName};
@@ -119,13 +119,14 @@ fn main() -> anyhow::Result<()> {
     let mut root_store = RootCertStore::empty();
     root_store.add(ca_cert.as_der().into())?;
 
-    let client_config = ClientConfig::builder()
-        .with_root_certificates(root_store)
-        .with_client_credential_resolver(Arc::new(ClientCertResolver {
-            store,
-            cert_name: params.client_cert.clone(),
-            pin: params.password.clone(),
-        }))?;
+    let client_config =
+        ClientConfig::builder(Arc::new(CryptoProvider::from_crate_features().unwrap()))
+            .with_root_certificates(root_store)
+            .with_client_credential_resolver(Arc::new(ClientCertResolver {
+                store,
+                cert_name: params.client_cert.clone(),
+                pin: params.password.clone(),
+            }))?;
 
     let server_name = ServerName::try_from(params.server_name.as_str())?.to_owned();
     let mut connection = ClientConnection::new(Arc::new(client_config), server_name)?;

examples/client.rs

@@ -6,6 +6,7 @@ use std::{
 };
 
 use clap::Parser;
+use rustls::crypto::CryptoProvider;
 use rustls::{
     RootCertStore, ServerConfig, ServerConnection, Stream,
     crypto::{Credentials, Identity, SelectedCredential},
@@ -143,14 +144,19 @@ fn main() -> anyhow::Result<()> {
     let mut root_store = RootCertStore::empty();
     root_store.add(ca_cert.as_der().into())?;
 
-    let verifier = WebPkiClientVerifier::builder(Arc::new(root_store)).build()?;
-
-    let server_config = ServerConfig::builder()
-        .with_client_cert_verifier(verifier)
-        .with_server_credential_resolver(Arc::new(ServerCertResolver {
-            store,
-            pin: params.password.clone(),
-        }))?;
+    let verifier = WebPkiClientVerifier::builder(
+        Arc::new(root_store),
+        &CryptoProvider::from_crate_features().unwrap(),
+    )
+    .build()?;
+
+    let server_config =
+        ServerConfig::builder(Arc::new(CryptoProvider::from_crate_features().unwrap()))
+            .with_client_cert_verifier(verifier)
+            .with_server_credential_resolver(Arc::new(ServerCertResolver {
+                store,
+                pin: params.password.clone(),
+            }))?;
 
     let server = TcpListener::bind(format!("0.0.0.0:{PORT}"))?;
 

examples/server.rs

@@ -10,6 +10,7 @@ mod client {
         sync::Arc,
     };
 
+    use rustls::crypto::CryptoProvider;
     use rustls::{
         ClientConfig, ClientConnection, RootCertStore, Stream,
         client::{ClientCredentialResolver, CredentialRequest},
@@ -65,12 +66,13 @@ mod client {
         let mut root_store = RootCertStore::empty();
         root_store.add(ca_cert.as_der().into())?;
 
-        let client_config = ClientConfig::builder()
-            .with_root_certificates(root_store)
-            .with_client_credential_resolver(Arc::new(ClientCertResolver(
-                store,
-                "rustls-client".to_string(),
-            )))?;
+        let client_config =
+            ClientConfig::builder(Arc::new(CryptoProvider::from_crate_features().unwrap()))
+                .with_root_certificates(root_store)
+                .with_client_credential_resolver(Arc::new(ClientCertResolver(
+                    store,
+                    "rustls-client".to_string(),
+                )))?;
 
         let mut connection =
             ClientConnection::new(Arc::new(client_config), "rustls-server".try_into()?)?;
@@ -98,6 +100,7 @@ mod server {
         sync::{Arc, mpsc::Sender},
     };
 
+    use rustls::crypto::CryptoProvider;
     use rustls::{
         RootCertStore, ServerConfig, ServerConnection, Stream,
         crypto::{Credentials, Identity, SelectedCredential},
@@ -161,11 +164,16 @@ mod server {
         let mut root_store = RootCertStore::empty();
         root_store.add(ca_cert.as_der().into())?;
 
-        let verifier = WebPkiClientVerifier::builder(Arc::new(root_store)).build()?;
+        let verifier = WebPkiClientVerifier::builder(
+            Arc::new(root_store),
+            &CryptoProvider::from_crate_features().unwrap(),
+        )
+        .build()?;
 
-        let server_config = ServerConfig::builder()
-            .with_client_cert_verifier(verifier)
-            .with_server_credential_resolver(Arc::new(ServerCertResolver(store)))?;
+        let server_config =
+            ServerConfig::builder(Arc::new(CryptoProvider::from_crate_features().unwrap()))
+                .with_client_cert_verifier(verifier)
+                .with_server_credential_resolver(Arc::new(ServerCertResolver(store)))?;
 
         let server = TcpListener::bind("127.0.0.1:0")?;