ARMmbed/mbedtls
1
0
Fork 0
mirror of https://github.com/ARMmbed/mbedtls.git synced 2025-06-12 17:42:35 +08:00
Code Issues Releases Wiki Activity

Setup MAC PSA keys in build_transforms() to pass ssl_crypt_record() with PSA crypto

Browse Source 
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
This commit is contained in:
Neil Armstrong 2022-02-23 16:21:01 +01:00
parent 26e6d6764e
commit f4cc062935
1 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
tests/suites/test_suite_ssl.function
View File

@ -1349,6 +1349,41 @@ static int build_transforms( mbedtls_ssl_transform *t_in,
memset( md0, 0x5, maclen ); memset( md0, 0x5, maclen );
memset( md1, 0x6, maclen ); memset( md1, 0x6, maclen );
#if defined(MBEDTLS_USE_PSA_CRYPTO)
alg = mbedtls_psa_translate_md( mbedtls_md_get_type( md_info ) );
CHK( alg != 0 );
t_out->psa_mac_alg = PSA_ALG_HMAC( alg );
t_in->psa_mac_alg = PSA_ALG_HMAC( alg );
t_in->psa_mac_enc = MBEDTLS_SVC_KEY_ID_INIT;
t_out->psa_mac_enc = MBEDTLS_SVC_KEY_ID_INIT;
t_in->psa_mac_dec = MBEDTLS_SVC_KEY_ID_INIT;
t_out->psa_mac_dec = MBEDTLS_SVC_KEY_ID_INIT;
psa_reset_key_attributes( &attributes );
psa_set_key_usage_flags( &attributes, PSA_KEY_USAGE_SIGN_MESSAGE );
psa_set_key_algorithm( &attributes, PSA_ALG_HMAC( alg ) );
psa_set_key_type( &attributes, PSA_KEY_TYPE_HMAC );
CHK( psa_import_key( &attributes,
md0, maclen,
&t_in->psa_mac_enc ) == PSA_SUCCESS );
CHK( psa_import_key( &attributes,
md1, maclen,
&t_out->psa_mac_enc ) == PSA_SUCCESS );
psa_set_key_usage_flags( &attributes, PSA_KEY_USAGE_VERIFY_HASH );
CHK( psa_import_key( &attributes,
md1, maclen,
&t_in->psa_mac_dec ) == PSA_SUCCESS );
CHK( psa_import_key( &attributes,
md0, maclen,
&t_out->psa_mac_dec ) == PSA_SUCCESS );
#endif
CHK( mbedtls_md_setup( &t_out->md_ctx_enc, md_info, 1 ) == 0 ); CHK( mbedtls_md_setup( &t_out->md_ctx_enc, md_info, 1 ) == 0 );
CHK( mbedtls_md_setup( &t_out->md_ctx_dec, md_info, 1 ) == 0 ); CHK( mbedtls_md_setup( &t_out->md_ctx_dec, md_info, 1 ) == 0 );
CHK( mbedtls_md_setup( &t_in->md_ctx_enc, md_info, 1 ) == 0 ); CHK( mbedtls_md_setup( &t_in->md_ctx_enc, md_info, 1 ) == 0 );
@ -1510,6 +1545,7 @@ static int build_transforms( mbedtls_ssl_transform *t_in,
if ( alg != MBEDTLS_SSL_NULL_CIPHER ) if ( alg != MBEDTLS_SSL_NULL_CIPHER )
{ {
psa_reset_key_attributes( &attributes );
psa_set_key_usage_flags( &attributes, PSA_KEY_USAGE_ENCRYPT ); psa_set_key_usage_flags( &attributes, PSA_KEY_USAGE_ENCRYPT );
psa_set_key_algorithm( &attributes, alg ); psa_set_key_algorithm( &attributes, alg );
psa_set_key_type( &attributes, key_type ); psa_set_key_type( &attributes, key_type );