From 2169a5e54ded734f7844af1a16c39b993c2a992c Mon Sep 17 00:00:00 2001 From: Hanno Becker Date: Fri, 25 Jan 2019 14:29:33 +0000 Subject: [PATCH] PSA: Adapt pk.c, pk_wrap.c, cipher.c to new key policy init API --- library/cipher.c | 2 +- library/pk.c | 2 +- library/pk_wrap.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/library/cipher.c b/library/cipher.c index b2cffcd38..16037fb05 100644 --- a/library/cipher.c +++ b/library/cipher.c @@ -322,7 +322,7 @@ int mbedtls_cipher_setkey( mbedtls_cipher_context_t *ctx, * mbedtls_cipher_free() needs to be called in any case. */ /* Setup policy for the new key slot. */ - psa_key_policy_init( &key_policy ); + key_policy = psa_key_policy_init(); /* Mbed TLS' cipher layer doesn't enforce the mode of operation * (encrypt vs. decrypt): it is possible to setup a key for encryption diff --git a/library/pk.c b/library/pk.c index e25a5f21f..72f09ac2f 100644 --- a/library/pk.c +++ b/library/pk.c @@ -580,7 +580,7 @@ int mbedtls_pk_wrap_as_opaque( mbedtls_pk_context *pk, return( MBEDTLS_ERR_PK_HW_ACCEL_FAILED ); /* set policy */ - psa_key_policy_init( &policy ); + policy = psa_key_policy_init(); psa_key_policy_set_usage( &policy, PSA_KEY_USAGE_SIGN, PSA_ALG_ECDSA(hash_alg) ); if( PSA_SUCCESS != psa_set_key_policy( key, &policy ) ) diff --git a/library/pk_wrap.c b/library/pk_wrap.c index ea678a667..7f8abd488 100644 --- a/library/pk_wrap.c +++ b/library/pk_wrap.c @@ -580,7 +580,7 @@ static int ecdsa_verify_wrap( void *ctx, mbedtls_md_type_t md_alg, if( ( ret = psa_allocate_key( &key_slot ) ) != PSA_SUCCESS ) return( mbedtls_psa_err_translate_pk( ret ) ); - psa_key_policy_init( &policy ); + policy = psa_key_policy_init(); psa_key_policy_set_usage( &policy, PSA_KEY_USAGE_VERIFY, psa_sig_md ); if( ( ret = psa_set_key_policy( key_slot, &policy ) ) != PSA_SUCCESS ) {