commit 472c20b4f2c8bde9ef8aa8d6d64c254fd14a5f87
author Jaeden Amero <jaeden.amero@arm.com> Tue Jan 29 10:01:50 2019 +0000
committer GitHub <noreply@github.com> Tue Jan 29 10:01:50 2019 +0000
tree 2d0d3187ab120296ac88b3d9bbaeb65b18bd92fd
parent fa6f146bba0ca6e86f773e1188cd7b125c6cb7dd
parent d288494c3a7472e27b0df73e36992b0d4d28cd1a

Merge pull request #28 from hanno-arm/ec_pubkey_fmt_adapt_ecdsa_verify_wrap

Adapt ECDSA wrapper to new EC public key format

library/pk_wrap.c

diff --git a/library/pk_wrap.c b/library/pk_wrap.c
index 7f8abd4..57a3925 100644
--- a/library/pk_wrap.c
+++ b/library/pk_wrap.c
@@ -553,7 +553,7 @@
     int key_len;
     /* see ECP_PUB_DER_MAX_BYTES in pkwrite.c */
     unsigned char buf[30 + 2 * MBEDTLS_ECP_MAX_BYTES];
-    unsigned char *p = (unsigned char*) sig;
+    unsigned char *p;
     mbedtls_pk_info_t pk_info = mbedtls_eckey_info;
     psa_algorithm_t psa_sig_md, psa_md;
     psa_ecc_curve_t curve = mbedtls_psa_translate_ecc_group(
@@ -563,11 +563,12 @@
     if( curve == 0 )
         return( MBEDTLS_ERR_PK_BAD_INPUT_DATA );
 
-    /* mbedlts_pk_write_pubkey_der() expects a full PK context,
-     * re-construct one to make it happy */
+    /* mbedtls_pk_write_pubkey() expects a full PK context;
+     * re-construct one to make it happy. */
     key.pk_info = &pk_info;
     key.pk_ctx = ctx;
-    key_len = mbedtls_pk_write_pubkey_der( &key, buf, sizeof( buf ) );
+    p = buf + sizeof( buf );
+    key_len = mbedtls_pk_write_pubkey( &p, buf, &key );
     if( key_len <= 0 )
         return( MBEDTLS_ERR_PK_BAD_INPUT_DATA );
 
@@ -603,6 +604,7 @@
         goto cleanup;
     }
 
+    p = (unsigned char*) sig;
     if( ( ret = extract_ecdsa_sig( &p, sig + sig_len, buf,
                                    signature_part_size ) ) != 0 )
     {