Updated rustls dependency

Author: ancwrd1

Cargo.lock

@@ -8,7 +8,7 @@ use std::{
 use clap::Parser;
 use rustls::{
     CertificateType, ClientConfig, ClientConnection, RootCertStore, Stream,
-    client::{CredentialRequest, ResolvesClientCert},
+    client::{ClientCredentialResolver, CredentialRequest},
     sign::{CertifiedKey, CertifiedSigner},
 };
 use rustls_pki_types::{CertificateDer, ServerName};
@@ -45,7 +45,7 @@ fn get_chain(
     Ok((chain, signing_key))
 }
 
-impl ResolvesClientCert for ClientCertResolver {
+impl ClientCredentialResolver for ClientCertResolver {
     fn resolve(&self, server_hello: &CredentialRequest) -> Option<CertifiedSigner> {
         println!("Server sig schemes: {:?}", server_hello.signature_schemes());
         let (chain, signing_key) = get_chain(&self.store, &self.cert_name).ok()?;
@@ -117,7 +117,7 @@ fn main() -> anyhow::Result<()> {
 
     let client_config = ClientConfig::builder()
         .with_root_certificates(root_store)
-        .with_client_cert_resolver(Arc::new(ClientCertResolver {
+        .with_client_credential_resolver(Arc::new(ClientCertResolver {
             store,
             cert_name: params.client_cert.clone(),
             pin: params.password.clone(),

examples/client.rs

@@ -8,7 +8,7 @@ use std::{
 use clap::Parser;
 use rustls::{
     RootCertStore, ServerConfig, ServerConnection, Stream,
-    server::{ClientHello, ResolvesServerCert, WebPkiClientVerifier},
+    server::{ClientHello, ServerCredentialResolver, WebPkiClientVerifier},
     sign::{CertifiedKey, CertifiedSigner},
 };
 use rustls_cng::{
@@ -52,7 +52,7 @@ pub struct ServerCertResolver {
     pin: Option<String>,
 }
 
-impl ResolvesServerCert for ServerCertResolver {
+impl ServerCredentialResolver for ServerCertResolver {
     fn resolve(&self, client_hello: &ClientHello) -> Result<CertifiedSigner, rustls::Error> {
         println!("Client hello server name: {:?}", client_hello.server_name());
         let name = client_hello
@@ -147,7 +147,7 @@ fn main() -> anyhow::Result<()> {
 
     let server_config = ServerConfig::builder()
         .with_client_cert_verifier(verifier)
-        .with_cert_resolver(Arc::new(ServerCertResolver {
+        .with_server_credential_resolver(Arc::new(ServerCertResolver {
             store,
             pin: params.password.clone(),
         }))?;

examples/server.rs

@@ -12,7 +12,7 @@ mod client {
 
     use rustls::{
         CertificateType, ClientConfig, ClientConnection, RootCertStore, Stream,
-        client::{CredentialRequest, ResolvesClientCert},
+        client::{ClientCredentialResolver, CredentialRequest},
         sign::{CertifiedKey, CertifiedSigner},
     };
     use rustls_pki_types::CertificateDer;
@@ -40,7 +40,7 @@ mod client {
         Ok((chain, signing_key))
     }
 
-    impl ResolvesClientCert for ClientCertResolver {
+    impl ClientCredentialResolver for ClientCertResolver {
         fn resolve(&self, server_hello: &CredentialRequest) -> Option<CertifiedSigner> {
             let (chain, signing_key) = get_chain(&self.0, &self.1).ok()?;
             CertifiedKey::new_unchecked(chain.into(), Box::new(signing_key))
@@ -63,7 +63,7 @@ mod client {
 
         let client_config = ClientConfig::builder()
             .with_root_certificates(root_store)
-            .with_client_cert_resolver(Arc::new(ClientCertResolver(
+            .with_client_credential_resolver(Arc::new(ClientCertResolver(
                 store,
                 "rustls-client".to_string(),
             )))?;
@@ -96,15 +96,15 @@ mod server {
 
     use rustls::{
         RootCertStore, ServerConfig, ServerConnection, Stream,
-        server::{ClientHello, ResolvesServerCert, WebPkiClientVerifier},
+        server::{ClientHello, ServerCredentialResolver, WebPkiClientVerifier},
         sign::{CertifiedKey, CertifiedSigner},
     };
     use rustls_cng::{signer::CngSigningKey, store::CertStore};
 
     #[derive(Debug)]
     pub struct ServerCertResolver(CertStore);
 
-    impl ResolvesServerCert for ServerCertResolver {
+    impl ServerCredentialResolver for ServerCertResolver {
         fn resolve(&self, client_hello: &ClientHello) -> Result<CertifiedSigner, rustls::Error> {
             let name = client_hello
                 .server_name()
@@ -161,7 +161,7 @@ mod server {
 
         let server_config = ServerConfig::builder()
             .with_client_cert_verifier(verifier)
-            .with_cert_resolver(Arc::new(ServerCertResolver(store)))?;
+            .with_server_credential_resolver(Arc::new(ServerCertResolver(store)))?;
 
         let server = TcpListener::bind("127.0.0.1:0")?;