Convert signature to ecdsa::Signature

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

Author: baloo

tss-esapi/Cargo.toml

@@ -28,6 +28,7 @@ regex = "1.3.9"
 zeroize = { version = "1.5.7", features = ["zeroize_derive"] }
 tss-esapi-sys = { path = "../tss-esapi-sys", version = "0.5.0" }
 x509-cert = { version = "0.2.0", optional = true }
+ecdsa = { version = "0.16.9", optional = true }
 elliptic-curve = { version = "0.13.8", optional = true, features = ["alloc", "pkcs8"] }
 p192 = { version = "0.13.0", optional = true }
 p224 = { version = "0.13.2", optional = true }
@@ -58,5 +59,5 @@ semver = "1.0.7"
 [features]
 default = ["abstraction"]
 generate-bindings = ["tss-esapi-sys/generate-bindings"]
-abstraction = ["elliptic-curve", "rsa", "x509-cert", "p192", "p224", "p256", "p384", "p521", "sha1", "sha2", "sha3", "sm2", "sm3"]
+abstraction = ["ecdsa", "elliptic-curve", "rsa", "x509-cert", "p192", "p224", "p256", "p384", "p521", "sha1", "sha2", "sha3", "sm2", "sm3"]
 integration-tests = ["strum", "strum_macros"]

tss-esapi/src/structures/signatures.rs

@@ -9,6 +9,15 @@ use crate::{
 use log::error;
 use std::convert::{TryFrom, TryInto};
 
+#[cfg(feature = "abstraction")]
+use {
+    ecdsa::SignatureSize,
+    elliptic_curve::{
+        generic_array::{typenum::Unsigned, ArrayLength},
+        FieldBytes, FieldBytesSize, PrimeCurve,
+    },
+};
+
 /// Type holding RSA signature information.
 ///
 /// For more information about the contents of `signature` see Annex B
@@ -143,3 +152,31 @@ impl TryFrom<TPMS_SIGNATURE_ECC> for EccSignature {
         })
     }
 }
+
+#[cfg(feature = "abstraction")]
+impl<C> TryFrom<EccSignature> for ecdsa::Signature<C>
+where
+    C: PrimeCurve,
+    SignatureSize<C>: ArrayLength<u8>,
+{
+    type Error = Error;
+
+    fn try_from(signature: EccSignature) -> Result<Self> {
+        let r = signature.signature_r().as_slice();
+        let s = signature.signature_s().as_slice();
+
+        if r.len() != FieldBytesSize::<C>::USIZE {
+            return Err(Error::local_error(WrapperErrorKind::InvalidParam));
+        }
+        if s.len() != FieldBytesSize::<C>::USIZE {
+            return Err(Error::local_error(WrapperErrorKind::InvalidParam));
+        }
+
+        let signature = ecdsa::Signature::from_scalars(
+            FieldBytes::<C>::from_slice(r).clone(),
+            FieldBytes::<C>::from_slice(s).clone(),
+        )
+        .map_err(|_| Error::local_error(WrapperErrorKind::InvalidParam))?;
+        Ok(signature)
+    }
+}