use spki independently

Author: stevefan1999-personal

Cargo.lock

@@ -68,6 +68,7 @@ rsa = { version = "0.9.7", default-features = false, features = [
 ] }
 rustls = { version = "0.23.19", default-features = false, features = ["std"] }
 sha2 = { version = "0.10.8", default-features = false, features = ["oid"] }
+spki = { version = "0.7.3", features = ["alloc"] }
 x509-cert = { version = "0.2.5", default-features = false, features = [
     "builder",
     "pem"
@@ -129,7 +130,7 @@ kx-p521 = ["p521", "p521/ecdh", "kx"]
 kx-full = ["kx-x25519", "kx-p256", "kx-p384", "kx-p521"]
 
 rsa = ["dep:rsa", "rsa/sha2", "verify", "signature", "pkcs1"]
-rsa-pkcs1 = ["rsa"]
+rsa-pkcs1 = ["rsa", "pkcs1"]
 rsa-pss = ["rsa"]
 rsa-full = ["rsa-pkcs1", "rsa-pss"]
 

Cargo.toml

@@ -5,11 +5,9 @@ use std::sync::Arc;
 use der::asn1::{GeneralizedTime, Ia5String};
 use der::Encode;
 use itertools::iproduct;
-use pkcs8::spki::{SignatureAlgorithmIdentifier, SubjectPublicKeyInfoOwned};
 use pkcs8::{EncodePrivateKey, EncodePublicKey};
 use pki_types::{CertificateDer, PrivateKeyDer};
 use rand_core::{OsRng, RngCore};
-use rsa::signature::Keypair;
 use rustls::server::{ClientHello, ResolvesServerCert};
 use rustls::sign::CertifiedKey;
 use rustls::CipherSuite::{
@@ -18,6 +16,8 @@ use rustls::CipherSuite::{
 };
 use rustls_rustcrypto::sign::any_supported_type;
 use sha2::Sha256;
+use signature::{Keypair, Signer};
+use spki::{SignatureAlgorithmIdentifier, SignatureBitStringEncoding, SubjectPublicKeyInfoOwned};
 use x509_cert::builder::{Builder, CertificateBuilder, Profile, RequestBuilder};
 use x509_cert::ext::pkix::name::GeneralName;
 use x509_cert::ext::pkix::SubjectAltName;
@@ -82,11 +82,8 @@ impl FakeServerCertResolver {
         key_fn: impl Fn() -> Key,
     ) -> (CertificateDer<'static>, Key)
     where
-        Key: signature::Signer<Signature>
-            + Keypair
-            + SignatureAlgorithmIdentifier
-            + EncodePrivateKey,
-        Signature: pkcs8::spki::SignatureBitStringEncoding,
+        Key: Signer<Signature> + Keypair + SignatureAlgorithmIdentifier + EncodePrivateKey,
+        Signature: SignatureBitStringEncoding,
         <Key as Keypair>::VerifyingKey: EncodePublicKey,
     {
         let signing_key = key_fn();
@@ -118,16 +115,9 @@ impl FakeServerCertResolver {
         ca_key: CaKey,
     ) -> (CertificateDer<'static>, PrivateKeyDer<'static>)
     where
-        Key: signature::Signer<Signature>
-            + Keypair
-            + SignatureAlgorithmIdentifier
-            + EncodePrivateKey,
-
-        CaKey: signature::Signer<Signature>
-            + Keypair
-            + SignatureAlgorithmIdentifier
-            + EncodePrivateKey,
-        Signature: pkcs8::spki::SignatureBitStringEncoding,
+        Key: Signer<Signature> + Keypair + SignatureAlgorithmIdentifier + EncodePrivateKey,
+        CaKey: Signer<Signature> + Keypair + SignatureAlgorithmIdentifier + EncodePrivateKey,
+        Signature: SignatureBitStringEncoding,
         <Key as Keypair>::VerifyingKey: EncodePublicKey,
         <CaKey as Keypair>::VerifyingKey: EncodePublicKey,
     {