Updated dependency

Author: ancwrd1

Cargo.lock

@@ -7,9 +7,10 @@ use std::{
 
 use clap::Parser;
 use rustls::{
-    CertificateType, ClientConfig, ClientConnection, PeerIdentity, RootCertStore, Stream,
+    ClientConfig, ClientConnection, RootCertStore, Stream,
     client::{ClientCredentialResolver, CredentialRequest},
-    sign::{CertifiedKey, CertifiedSigner},
+    crypto::{Credentials, Identity, SelectedCredential},
+    enums::CertificateType,
 };
 use rustls_pki_types::{CertificateDer, ServerName};
 
@@ -46,14 +47,14 @@ fn get_chain(
 }
 
 impl ClientCredentialResolver for ClientCertResolver {
-    fn resolve(&self, server_hello: &CredentialRequest) -> Option<CertifiedSigner> {
+    fn resolve(&self, server_hello: &CredentialRequest) -> Option<SelectedCredential> {
         println!("Server sig schemes: {:?}", server_hello.signature_schemes());
         let (chain, signing_key) = get_chain(&self.store, &self.cert_name).ok()?;
         if let Some(ref pin) = self.pin {
             signing_key.key().set_pin(pin).ok()?;
         }
-        CertifiedKey::new_unchecked(
-            Arc::new(PeerIdentity::from_cert_chain(chain).ok()?),
+        Credentials::new_unchecked(
+            Arc::new(Identity::from_cert_chain(chain).ok()?),
             Box::new(signing_key),
         )
         .signer(server_hello.signature_schemes())

examples/client.rs

@@ -7,9 +7,9 @@ use std::{
 
 use clap::Parser;
 use rustls::{
-    PeerIdentity, RootCertStore, ServerConfig, ServerConnection, Stream,
+    RootCertStore, ServerConfig, ServerConnection, Stream,
+    crypto::{Credentials, Identity, SelectedCredential},
     server::{ClientHello, ServerCredentialResolver, WebPkiClientVerifier},
-    sign::{CertifiedKey, CertifiedSigner},
 };
 use rustls_cng::{
     signer::CngSigningKey,
@@ -53,7 +53,7 @@ pub struct ServerCertResolver {
 }
 
 impl ServerCredentialResolver for ServerCertResolver {
-    fn resolve(&self, client_hello: &ClientHello) -> Result<CertifiedSigner, rustls::Error> {
+    fn resolve(&self, client_hello: &ClientHello) -> Result<SelectedCredential, rustls::Error> {
         println!("Client hello server name: {:?}", client_hello.server_name());
         let name = client_hello
             .server_name()
@@ -83,12 +83,9 @@ impl ServerCredentialResolver for ServerCertResolver {
             .map_err(|_| rustls::Error::NoSuitableCertificate)?;
         let certs = chain.into_iter().map(Into::into).collect();
 
-        CertifiedKey::new_unchecked(
-            Arc::new(PeerIdentity::from_cert_chain(certs)?),
-            Box::new(key),
-        )
-        .signer(client_hello.signature_schemes())
-        .ok_or_else(|| rustls::Error::General("No common schemes".to_owned()))
+        Credentials::new_unchecked(Arc::new(Identity::from_cert_chain(certs)?), Box::new(key))
+            .signer(client_hello.signature_schemes())
+            .ok_or_else(|| rustls::Error::General("No common schemes".to_owned()))
     }
 }
 

examples/server.rs

@@ -3,8 +3,9 @@
 use std::sync::Arc;
 
 use rustls::{
-    Error, OtherError, SignatureAlgorithm, SignatureScheme,
-    sign::{Signer, SigningKey},
+    crypto::{Signer, SigningKey},
+    enums::{SignatureAlgorithm, SignatureScheme},
+    error::{Error, OtherError},
 };
 use rustls_pki_types::SubjectPublicKeyInfoDer;
 use windows_sys::Win32::Security::Cryptography::{

src/signer.rs

@@ -11,9 +11,10 @@ mod client {
     };
 
     use rustls::{
-        CertificateType, ClientConfig, ClientConnection, PeerIdentity, RootCertStore, Stream,
+        ClientConfig, ClientConnection, RootCertStore, Stream,
         client::{ClientCredentialResolver, CredentialRequest},
-        sign::{CertifiedKey, CertifiedSigner},
+        crypto::{Credentials, Identity, SelectedCredential},
+        enums::CertificateType,
     };
     use rustls_pki_types::CertificateDer;
 
@@ -41,10 +42,10 @@ mod client {
     }
 
     impl ClientCredentialResolver for ClientCertResolver {
-        fn resolve(&self, server_hello: &CredentialRequest) -> Option<CertifiedSigner> {
+        fn resolve(&self, server_hello: &CredentialRequest) -> Option<SelectedCredential> {
             let (chain, signing_key) = get_chain(&self.0, &self.1).ok()?;
-            CertifiedKey::new_unchecked(
-                Arc::new(PeerIdentity::from_cert_chain(chain).ok()?),
+            Credentials::new_unchecked(
+                Arc::new(Identity::from_cert_chain(chain).ok()?),
                 Box::new(signing_key),
             )
             .signer(server_hello.signature_schemes())
@@ -98,17 +99,17 @@ mod server {
     };
 
     use rustls::{
-        PeerIdentity, RootCertStore, ServerConfig, ServerConnection, Stream,
+        RootCertStore, ServerConfig, ServerConnection, Stream,
+        crypto::{Credentials, Identity, SelectedCredential},
         server::{ClientHello, ServerCredentialResolver, WebPkiClientVerifier},
-        sign::{CertifiedKey, CertifiedSigner},
     };
     use rustls_cng::{signer::CngSigningKey, store::CertStore};
 
     #[derive(Debug)]
     pub struct ServerCertResolver(CertStore);
 
     impl ServerCredentialResolver for ServerCertResolver {
-        fn resolve(&self, client_hello: &ClientHello) -> Result<CertifiedSigner, rustls::Error> {
+        fn resolve(&self, client_hello: &ClientHello) -> Result<SelectedCredential, rustls::Error> {
             let name = client_hello
                 .server_name()
                 .ok_or_else(|| rustls::Error::NoSuitableCertificate)?;
@@ -131,12 +132,9 @@ mod server {
                 .map_err(|_| rustls::Error::NoSuitableCertificate)?;
             let certs = chain.into_iter().map(Into::into).collect();
 
-            CertifiedKey::new_unchecked(
-                Arc::new(PeerIdentity::from_cert_chain(certs)?),
-                Box::new(key),
-            )
-            .signer(client_hello.signature_schemes())
-            .ok_or_else(|| rustls::Error::General("No common schemes".to_owned()))
+            Credentials::new_unchecked(Arc::new(Identity::from_cert_chain(certs)?), Box::new(key))
+                .signer(client_hello.signature_schemes())
+                .ok_or_else(|| rustls::Error::General("No common schemes".to_owned()))
         }
     }
 

tests/test_client_server.rs

@@ -1,5 +1,7 @@
-use rustls::{SignatureAlgorithm, SignatureScheme, sign::SigningKey};
-
+use rustls::{
+    crypto::SigningKey,
+    enums::{SignatureAlgorithm, SignatureScheme},
+};
 use rustls_cng::{signer::CngSigningKey, store::CertStore};
 
 const PFX: &[u8] = include_bytes!("assets/rustls-ec.p12");