From 7374ee6139cda1e820d9279a311f56d4ea822333 Mon Sep 17 00:00:00 2001 From: Janos Follath Date: Tue, 30 Jul 2019 12:43:12 +0100 Subject: [PATCH] Update GENERATOR_INIT macro to PSA 1.0 --- library/ssl_cli.c | 3 ++- library/ssl_tls.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/library/ssl_cli.c b/library/ssl_cli.c index 41e19ebf5..36153a977 100644 --- a/library/ssl_cli.c +++ b/library/ssl_cli.c @@ -3238,7 +3238,8 @@ static int ssl_write_client_key_exchange( mbedtls_ssl_context *ssl ) unsigned char *own_pubkey_ecpoint; size_t own_pubkey_ecpoint_len; - psa_crypto_generator_t generator = PSA_CRYPTO_GENERATOR_INIT; + psa_key_derivation_operation_t generator = + PSA_KEY_DERIVATION_OPERATION_INIT; header_len = 4; diff --git a/library/ssl_tls.c b/library/ssl_tls.c index d04fa9bd7..3f9818cd2 100644 --- a/library/ssl_tls.c +++ b/library/ssl_tls.c @@ -632,7 +632,7 @@ 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_CRYPTO_GENERATOR_INIT; + psa_crypto_generator_t generator = PSA_KEY_DERIVATION_OPERATION_INIT; if( ( status = psa_allocate_key( &master_slot ) ) != PSA_SUCCESS ) return( MBEDTLS_ERR_SSL_HW_ACCEL_FAILED ); @@ -1108,7 +1108,7 @@ 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_CRYPTO_GENERATOR_INIT; + psa_crypto_generator_t generator = PSA_KEY_DERIVATION_OPERATION_INIT; psa_key_handle_t psk; MBEDTLS_SSL_DEBUG_MSG( 2, ( "perform PSA-based PSK-to-MS expansion" ) );