commit c93b80c350eaff9dc6e754db2617c0b8a58fad40
author Gilles Peskine <Gilles.Peskine@arm.com> Thu May 16 19:39:54 2019 +0200
committer Gilles Peskine <Gilles.Peskine@arm.com> Fri May 17 10:56:57 2019 +0200
tree 4c7936d529e10ca1e1eab419963ceaf7835b1dda
parent 683898c0790b430b5e0a5f6df365642522e84b94

Rename *KEYPAIR* to *KEY_PAIR*

Be consistent with PUBLIC_KEY.

perl -i -pe 's/KEYPAIR/KEY_PAIR/g' $(git ls-files)

library/pk.c

diff --git a/library/pk.c b/library/pk.c
index 6bbfdd1..bcf7e0a 100644
--- a/library/pk.c
+++ b/library/pk.c
@@ -168,7 +168,7 @@
         return( MBEDTLS_ERR_PK_BAD_INPUT_DATA );
 
     /* Current implementation of can_do() relies on this. */
-    if( ! PSA_KEY_TYPE_IS_ECC_KEYPAIR( type ) )
+    if( ! PSA_KEY_TYPE_IS_ECC_KEY_PAIR( type ) )
         return( MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE) ;
 
     if( ( ctx->pk_ctx = info->ctx_alloc_func() ) == NULL )
@@ -614,7 +614,7 @@
         return( ret );
 
     curve_id = mbedtls_ecp_curve_info_from_grp_id( ec->grp.id )->tls_id;
-    key_type = PSA_KEY_TYPE_ECC_KEYPAIR(
+    key_type = PSA_KEY_TYPE_ECC_KEY_PAIR(
                                  mbedtls_psa_parse_tls_ecc_group ( curve_id ) );
 
     /* allocate a key slot */