simplify and reinforce feature selection

Author: stevefan1999-personal

Cargo.toml

@@ -202,7 +202,7 @@ hash-full = ["hash-sha224", "hash-sha256", "hash-sha384", "hash-sha512"]
 
 # Formats
 der = ["dep:der"]
-sec1 = ["dep:sec1", "elliptic-curve?/sec1"]
+sec1 = ["dep:sec1", "elliptic-curve?/sec1", "sec1/pkcs8"]
 pem = ["elliptic-curve?/pem", "ecdsa?/pem"]
 pkcs1 = ["dep:pkcs1"]
 pkcs8 = [

src/sign/eddsa/ed25519.rs

@@ -26,7 +26,7 @@ impl TryFrom<&PrivateKeyDer<'_>> for Ed25519SigningKey {
                 SigningKey::from_pkcs8_der(der.secret_pkcs8_der())
                     .map_err(|e| format!("failed to decrypt private key: {e}"))
             }
-            #[cfg(all(feature = "pkcs8", feature = "sec1"))]
+            #[cfg(feature = "sec1")]
             PrivateKeyDer::Sec1(sec1) => {
                 use sec1::DecodeEcPrivateKey;
                 SigningKey::from_sec1_der(sec1.secret_sec1_der())

src/tls12/suites/ecdsa.rs

@@ -9,13 +9,16 @@ use rustls::crypto::{tls12::PrfUsingHmac, CipherSuiteCommon, KeyExchangeAlgorith
 #[cfg(feature = "aead")]
 use rustls::{CipherSuite, Tls12CipherSuite};
 
-#[cfg(feature = "aes-gcm")]
-use crate::aead::gcm::{Aes128Gcm, Aes256Gcm};
+#[cfg(all(feature = "aes-gcm", feature = "hash-sha256"))]
+use crate::aead::gcm::Aes128Gcm;
+
+#[cfg(all(feature = "aes-gcm", feature = "hash-sha384"))]
+use crate::aead::gcm::Aes256Gcm;
 
-#[cfg(feature = "aes-ccm")]
+#[cfg(all(feature = "aes-ccm", feature = "hash-sha256"))]
 use crate::aead::ccm::{Aes128Ccm, Aes128Ccm8, Aes256Ccm, Aes256Ccm8};
 
-#[cfg(feature = "chacha20poly1305")]
+#[cfg(all(feature = "chacha20poly1305", feature = "hash-sha256"))]
 use crate::aead::ChaCha20Poly1305;
 
 #[cfg(all(feature = "aes-gcm", feature = "hash-sha256"))]

src/tls12/suites/rsa.rs

@@ -9,8 +9,11 @@ use rustls::crypto::{tls12::PrfUsingHmac, CipherSuiteCommon, KeyExchangeAlgorith
 #[cfg(feature = "aead")]
 use rustls::{CipherSuite, Tls12CipherSuite};
 
-#[cfg(feature = "aes-gcm")]
-use crate::aead::gcm::{Aes128Gcm, Aes256Gcm};
+#[cfg(all(feature = "gcm", feature = "hash-sha256"))]
+use crate::aead::gcm::Aes128Gcm;
+
+#[cfg(all(feature = "gcm", feature = "hash-sha384"))]
+use crate::aead::gcm::Aes256Gcm;
 
 #[cfg(feature = "chacha20poly1305")]
 use crate::aead::ChaCha20Poly1305;

src/tls13/suites/aes.rs

@@ -1,7 +1,9 @@
-#[cfg(feature = "ccm")]
+#[cfg(all(feature = "ccm", feature = "hash-sha256"))]
 use crate::aead::ccm::{Aes128Ccm, Aes128Ccm8};
-#[cfg(feature = "gcm")]
-use crate::aead::gcm::{Aes128Gcm, Aes256Gcm};
+#[cfg(all(feature = "gcm", feature = "hash-sha256"))]
+use crate::aead::gcm::Aes128Gcm;
+#[cfg(all(feature = "gcm", feature = "hash-sha384"))]
+use crate::aead::gcm::Aes256Gcm;
 use crate::const_concat_slices;
 use crate::{hash, hmac};
 use rustls::crypto::{tls13::HkdfUsingHmac, CipherSuiteCommon};