rework feature set

This allows to bring the rustcrypto "base" and then limit the support to
only the type of keys or hash you need


Signed-off-by: Arthur Gautier <[email protected]>

Author: baloo

tss-esapi/Cargo.toml

@@ -72,5 +72,7 @@ semver = "1.0.7"
 [features]
 default = ["abstraction"]
 generate-bindings = ["tss-esapi-sys/generate-bindings"]
-abstraction = ["ecdsa", "elliptic-curve", "signature", "rsa", "x509-cert", "p192", "p224", "p256", "p384", "p521", "sha1", "sha2", "sha3", "sm2", "sm3"]
+abstraction = ["rustcrypto"]
 integration-tests = ["strum", "strum_macros"]
+rustcrypto = ["ecdsa", "elliptic-curve", "signature", "x509-cert"]
+rustcrypto-full = ["rustcrypto", "p192", "p224", "p256", "p384", "p521", "rsa", "sha1", "sha2", "sha3", "sm2", "sm3"]

tss-esapi/src/abstraction/hashing.rs

@@ -9,42 +9,42 @@ pub trait AssociatedHashingAlgorithm {
     const TPM_DIGEST: HashingAlgorithm;
 }
 
-#[cfg(feature = "sha1")]
+#[cfg(all(feature = "rustcrypto", feature = "sha1"))]
 impl AssociatedHashingAlgorithm for sha1::Sha1 {
     const TPM_DIGEST: HashingAlgorithm = HashingAlgorithm::Sha1;
 }
 
-#[cfg(feature = "sha2")]
+#[cfg(all(feature = "rustcrypto", feature = "sha2"))]
 impl AssociatedHashingAlgorithm for sha2::Sha256 {
     const TPM_DIGEST: HashingAlgorithm = HashingAlgorithm::Sha256;
 }
 
-#[cfg(feature = "sha2")]
+#[cfg(all(feature = "rustcrypto", feature = "sha2"))]
 impl AssociatedHashingAlgorithm for sha2::Sha384 {
     const TPM_DIGEST: HashingAlgorithm = HashingAlgorithm::Sha384;
 }
 
-#[cfg(feature = "sha2")]
+#[cfg(all(feature = "rustcrypto", feature = "sha2"))]
 impl AssociatedHashingAlgorithm for sha2::Sha512 {
     const TPM_DIGEST: HashingAlgorithm = HashingAlgorithm::Sha512;
 }
 
-#[cfg(feature = "sm3")]
+#[cfg(all(feature = "rustcrypto", feature = "sm3"))]
 impl AssociatedHashingAlgorithm for sm3::Sm3 {
     const TPM_DIGEST: HashingAlgorithm = HashingAlgorithm::Sm3_256;
 }
 
-#[cfg(feature = "sha3")]
+#[cfg(all(feature = "rustcrypto", feature = "sha3"))]
 impl AssociatedHashingAlgorithm for sha3::Sha3_256 {
     const TPM_DIGEST: HashingAlgorithm = HashingAlgorithm::Sha3_256;
 }
 
-#[cfg(feature = "sha3")]
+#[cfg(all(feature = "rustcrypto", feature = "sha3"))]
 impl AssociatedHashingAlgorithm for sha3::Sha3_384 {
     const TPM_DIGEST: HashingAlgorithm = HashingAlgorithm::Sha3_384;
 }
 
-#[cfg(feature = "sha3")]
+#[cfg(all(feature = "rustcrypto", feature = "sha3"))]
 impl AssociatedHashingAlgorithm for sha3::Sha3_512 {
     const TPM_DIGEST: HashingAlgorithm = HashingAlgorithm::Sha3_512;
 }

tss-esapi/src/abstraction/public.rs

@@ -127,17 +127,17 @@ impl TryFrom<&Public> for SubjectPublicKeyInfoOwned {
                     };
                 }
 
-                #[cfg(feature = "p192")]
+                #[cfg(all(feature = "rustcrypto", feature = "p192"))]
                 read_key!(EccCurve::NistP192, p192::NistP192);
-                #[cfg(feature = "p224")]
+                #[cfg(all(feature = "rustcrypto", feature = "p224"))]
                 read_key!(EccCurve::NistP224, p224::NistP224);
-                #[cfg(feature = "p256")]
+                #[cfg(all(feature = "rustcrypto", feature = "p256"))]
                 read_key!(EccCurve::NistP256, p256::NistP256);
-                #[cfg(feature = "p384")]
+                #[cfg(all(feature = "rustcrypto", feature = "p384"))]
                 read_key!(EccCurve::NistP384, p384::NistP384);
-                #[cfg(feature = "p521")]
+                #[cfg(all(feature = "rustcrypto", feature = "p521"))]
                 read_key!(EccCurve::NistP521, p521::NistP521);
-                #[cfg(feature = "sm2")]
+                #[cfg(all(feature = "rustcrypto", feature = "sm2"))]
                 read_key!(EccCurve::Sm2P256, sm2::Sm2);
 
                 Err(Error::local_error(WrapperErrorKind::UnsupportedParam))
@@ -207,32 +207,32 @@ pub trait AssociatedTpmCurve {
     const TPM_CURVE: EccCurve;
 }
 
-#[cfg(feature = "p192")]
+#[cfg(all(feature = "rustcrypto", feature = "p192"))]
 impl AssociatedTpmCurve for p192::NistP192 {
     const TPM_CURVE: EccCurve = EccCurve::NistP192;
 }
 
-#[cfg(feature = "p224")]
+#[cfg(all(feature = "rustcrypto", feature = "p224"))]
 impl AssociatedTpmCurve for p224::NistP224 {
     const TPM_CURVE: EccCurve = EccCurve::NistP224;
 }
 
-#[cfg(feature = "p256")]
+#[cfg(all(feature = "rustcrypto", feature = "p256"))]
 impl AssociatedTpmCurve for p256::NistP256 {
     const TPM_CURVE: EccCurve = EccCurve::NistP256;
 }
 
-#[cfg(feature = "p384")]
+#[cfg(all(feature = "rustcrypto", feature = "p384"))]
 impl AssociatedTpmCurve for p384::NistP384 {
     const TPM_CURVE: EccCurve = EccCurve::NistP384;
 }
 
-#[cfg(feature = "p521")]
+#[cfg(all(feature = "rustcrypto", feature = "p521"))]
 impl AssociatedTpmCurve for p521::NistP521 {
     const TPM_CURVE: EccCurve = EccCurve::NistP521;
 }
 
-#[cfg(feature = "sm2")]
+#[cfg(all(feature = "rustcrypto", feature = "sm2"))]
 impl AssociatedTpmCurve for sm2::Sm2 {
     const TPM_CURVE: EccCurve = EccCurve::Sm2P256;
 }