From 8dee877e8ae05399f791cbd4edb6d87d24407ae9 Mon Sep 17 00:00:00 2001 From: Janos Follath Date: Tue, 30 Jul 2019 12:53:32 +0100 Subject: [PATCH] Update psa_crypto_generator_t to PSA 1.0 --- library/ssl_tls.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/library/ssl_tls.c b/library/ssl_tls.c index 3f9818cd2..465ca0605 100644 --- a/library/ssl_tls.c +++ b/library/ssl_tls.c @@ -632,7 +632,8 @@ static int tls_prf_generic( mbedtls_md_type_t md_type, psa_algorithm_t alg; psa_key_policy_t policy; psa_key_handle_t master_slot; - psa_crypto_generator_t generator = PSA_KEY_DERIVATION_OPERATION_INIT; + psa_key_derivation_operation_t generator = + PSA_KEY_DERIVATION_OPERATION_INIT; if( ( status = psa_allocate_key( &master_slot ) ) != PSA_SUCCESS ) return( MBEDTLS_ERR_SSL_HW_ACCEL_FAILED ); @@ -1108,8 +1109,9 @@ int mbedtls_ssl_derive_keys( mbedtls_ssl_context *ssl ) /* Perform PSK-to-MS expansion in a single step. */ psa_status_t status; psa_algorithm_t alg; - psa_crypto_generator_t generator = PSA_KEY_DERIVATION_OPERATION_INIT; psa_key_handle_t psk; + psa_key_derivation_operation_t generator = + PSA_KEY_DERIVATION_OPERATION_INIT; MBEDTLS_SSL_DEBUG_MSG( 2, ( "perform PSA-based PSK-to-MS expansion" ) );