Merge branch 'dev' into eddsa-fix2

laurencelundblade · Aug 8, 2023 · 4cf2789 · 4cf2789
2 parents 06c0164 + 59002f9
commit 4cf2789
Show file tree

Hide file tree

Showing 30 changed files with 1,466 additions and 570 deletions.
diff --git a/crypto_adapters/t_cose_openssl_crypto.c b/crypto_adapters/t_cose_openssl_crypto.c
@@ -2527,3 +2527,10 @@ t_cose_crypto_export_ec2_key(struct t_cose_key      key_handle,
 
     return T_COSE_SUCCESS;
 }
+
+
+void
+t_cose_crypto_free_ec_key(struct t_cose_key key_handle)
+{
+    EVP_PKEY_free(key_handle.key.ptr);
+}
diff --git a/crypto_adapters/t_cose_psa_crypto.c b/crypto_adapters/t_cose_psa_crypto.c
@@ -301,6 +301,7 @@ t_cose_crypto_sign_restart(bool                   started,
 
     if(!crypto_context) {
         return_value = T_COSE_ERR_FAIL;
+        goto Done;
     }
     psa_crypto_context = (struct t_cose_psa_crypto_context *)crypto_context;
 
@@ -1573,3 +1574,10 @@ t_cose_crypto_export_ec2_key(struct t_cose_key      key_handle,
 
     return T_COSE_SUCCESS;
 }
+
+
+void
+t_cose_crypto_free_ec_key(struct t_cose_key key_handle)
+{
+    psa_destroy_key((psa_key_id_t)key_handle.key.handle);
+}
diff --git a/crypto_adapters/t_cose_test_crypto.c b/crypto_adapters/t_cose_test_crypto.c
@@ -706,3 +706,10 @@ t_cose_crypto_ecdh(struct t_cose_key      private_key,
     return T_COSE_ERR_FAIL;
 
 }
+
+
+void
+t_cose_crypto_free_ec_key(struct t_cose_key key_handle)
+{
+    (void)key_handle;
+}