add assert for curve check to stop API misuse.

Signed-off-by: Yang, Longlong <[email protected]>
intel · Dec 25, 2023 · 1a78c6f · 1a78c6f
1 parent 05c41c6
commit 1a78c6f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/spdmlib/src/crypto/spdm_ring/asym_verify_impl.rs b/spdmlib/src/crypto/spdm_ring/asym_verify_impl.rs
@@ -120,7 +120,11 @@ fn asym_verify(
 // add ASN.1 for the ECDSA binary signature
 fn ecc_signature_bin_to_der(signature: &[u8], der_signature: &mut [u8]) -> SpdmResult<usize> {
     let sign_size = signature.len();
-    assert_eq!(sign_size % 2, 0);
+    assert!(
+        // prevent API misuse
+        sign_size == crate::protocol::ECDSA_ECC_NIST_P256_KEY_SIZE
+            || sign_size == crate::protocol::ECDSA_ECC_NIST_P384_KEY_SIZE
+    );
     let half_size = sign_size / 2;
 
     let mut r_index = half_size;

diff --git a/spdmlib_crypto_mbedtls/src/asym_verify_impl.rs b/spdmlib_crypto_mbedtls/src/asym_verify_impl.rs
@@ -74,6 +74,10 @@ fn asym_verify(
 // add ASN.1 for the ECDSA binary signature
 fn ecc_signature_bin_to_der(signature: &[u8], der_signature: &mut [u8]) -> SpdmResult<usize> {
     let sign_size = signature.len();
+    assert!(
+        sign_size == spdmlib::protocol::ECDSA_ECC_NIST_P256_KEY_SIZE
+            || sign_size == spdmlib::protocol::ECDSA_ECC_NIST_P384_KEY_SIZE
+    );
     let half_size = sign_size / 2;
 
     let mut r_index = half_size;