From 242da1e2c29eb209dcf75d7219031b4386f5328f Mon Sep 17 00:00:00 2001 From: Hanno Becker Date: Fri, 25 Jan 2019 14:29:12 +0000 Subject: [PATCH] PSA: Adapt cipher.c, pk.c, pk_wrap.c to new key slot allocation API --- library/cipher.c | 2 +- library/pk.c | 2 +- library/pk_wrap.c | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/library/cipher.c b/library/cipher.c index 03c0e0667..b2cffcd38 100644 --- a/library/cipher.c +++ b/library/cipher.c @@ -308,7 +308,7 @@ int mbedtls_cipher_setkey( mbedtls_cipher_context_t *ctx, return( MBEDTLS_ERR_CIPHER_FEATURE_UNAVAILABLE ); /* Allocate a key slot to use. */ - status = psa_allocate_key( key_type, key_bitlen, &cipher_psa->slot ); + status = psa_allocate_key( &cipher_psa->slot ); if( status != PSA_SUCCESS ) return( MBEDTLS_ERR_CIPHER_HW_ACCEL_FAILED ); diff --git a/library/pk.c b/library/pk.c index 024dcdcb1..e25a5f21f 100644 --- a/library/pk.c +++ b/library/pk.c @@ -576,7 +576,7 @@ int mbedtls_pk_wrap_as_opaque( mbedtls_pk_context *pk, mbedtls_psa_parse_tls_ecc_group ( curve_id ) ); /* allocate a key slot */ - if( PSA_SUCCESS != psa_allocate_key( key_type, d_len * 8, &key ) ) + if( PSA_SUCCESS != psa_allocate_key( &key ) ) return( MBEDTLS_ERR_PK_HW_ACCEL_FAILED ); /* set policy */ diff --git a/library/pk_wrap.c b/library/pk_wrap.c index 08550d4c4..ea678a667 100644 --- a/library/pk_wrap.c +++ b/library/pk_wrap.c @@ -577,9 +577,7 @@ static int ecdsa_verify_wrap( void *ctx, mbedtls_md_type_t md_alg, psa_sig_md = PSA_ALG_ECDSA( psa_md ); psa_type = PSA_KEY_TYPE_ECC_PUBLIC_KEY( curve ); - if( ( ret = psa_allocate_key( psa_type, - MBEDTLS_PSA_ECC_KEY_BITS_OF_CURVE(curve), - &key_slot ) ) != PSA_SUCCESS ) + if( ( ret = psa_allocate_key( &key_slot ) ) != PSA_SUCCESS ) return( mbedtls_psa_err_translate_pk( ret ) ); psa_key_policy_init( &policy );