lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-29 11:41:15 +03:00
Code Activity

test: pake: check psa key validity before destroying it

Browse Source 
Signed-off-by: Valerio Setti <vsetti@baylibre.com>
This commit is contained in:
Valerio Setti
2022-12-07 15:27:08 +01:00
parent c689ed8633
commit d5fa0bfb85
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
programs/ssl/ssl_client2.c
View File

@ -3331,7 +3331,16 @@ exit:
defined(MBEDTLS_USE_PSA_CRYPTO) defined(MBEDTLS_USE_PSA_CRYPTO)
if( opt.ecjpake_pw_opaque != DFL_ECJPAKE_PW_OPAQUE ) if( opt.ecjpake_pw_opaque != DFL_ECJPAKE_PW_OPAQUE )
{ {
psa_destroy_key( ecjpake_pw_slot ); psa_key_attributes_t key_attr = PSA_KEY_ATTRIBUTES_INIT;
/* Ensure the key is still valid before destroying it */
status = psa_get_key_attributes( ecjpake_pw_slot, &key_attr );
if( status == PSA_SUCCESS &&
PSA_ALG_IS_PAKE( psa_get_key_algorithm( &key_attr ) ) )
{
psa_destroy_key( ecjpake_pw_slot );
}
psa_reset_key_attributes( &key_attr );
} }
#endif /* MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED && MBEDTLS_USE_PSA_CRYPTO */ #endif /* MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED && MBEDTLS_USE_PSA_CRYPTO */

11
programs/ssl/ssl_server2.c
View File

@ -4441,7 +4441,16 @@ exit:
defined(MBEDTLS_USE_PSA_CRYPTO) defined(MBEDTLS_USE_PSA_CRYPTO)
if( opt.ecjpake_pw_opaque != DFL_ECJPAKE_PW_OPAQUE ) if( opt.ecjpake_pw_opaque != DFL_ECJPAKE_PW_OPAQUE )
{ {
psa_destroy_key( ecjpake_pw_slot ); psa_key_attributes_t key_attr = PSA_KEY_ATTRIBUTES_INIT;
/* Ensure the key is still valid before destroying it */
status = psa_get_key_attributes( ecjpake_pw_slot, &key_attr );
if( status == PSA_SUCCESS &&
PSA_ALG_IS_PAKE( psa_get_key_algorithm( &key_attr ) ) )
{
psa_destroy_key( ecjpake_pw_slot );
}
psa_reset_key_attributes( &key_attr );
} }
#endif /* MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED && MBEDTLS_USE_PSA_CRYPTO */ #endif /* MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED && MBEDTLS_USE_PSA_CRYPTO */