yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-12-24 01:05:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Optimize TLS PRF PSK key calculation

Browse source
This commit is contained in:
Janos Follath 2019-06-26 13:22:29 +01:00
parent 76c3984477
commit 40e1393816
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
library/psa_crypto.c
View file

@ -4939,6 +4939,7 @@ static psa_status_t psa_tls12_prf_psk_to_ms_set_key(
{ {
psa_status_t status; psa_status_t status;
unsigned char pms[ 4 + 2 * PSA_ALG_TLS12_PSK_TO_MS_MAX_PSK_LEN ]; unsigned char pms[ 4 + 2 * PSA_ALG_TLS12_PSK_TO_MS_MAX_PSK_LEN ];
unsigned char* cur = pms;
if( data_length > PSA_ALG_TLS12_PSK_TO_MS_MAX_PSK_LEN ) if( data_length > PSA_ALG_TLS12_PSK_TO_MS_MAX_PSK_LEN )
return( PSA_ERROR_INVALID_ARGUMENT ); return( PSA_ERROR_INVALID_ARGUMENT );
@ -4950,14 +4951,16 @@ static psa_status_t psa_tls12_prf_psk_to_ms_set_key(
* uint16 with the value N, and the PSK itself. * uint16 with the value N, and the PSK itself.
*/ */
pms[0] = ( data_length >> 8 ) & 0xff; *cur++ = ( data_length >> 8 ) & 0xff;
pms[1] = ( data_length >> 0 ) & 0xff; *cur++ = ( data_length >> 0 ) & 0xff;
memset( pms + 2, 0, data_length ); memset( cur, 0, data_length );
pms[2 + data_length + 0] = pms[0]; cur += data_length;
pms[2 + data_length + 1] = pms[1]; *cur++ = pms[0];
memcpy( pms + 4 + data_length, data, data_length ); *cur++ = pms[1];
memcpy( cur, data, data_length );
cur += data_length;
status = psa_tls12_prf_set_key( prf, hash_alg, pms, 4 + 2 * data_length ); status = psa_tls12_prf_set_key( prf, hash_alg, pms, cur - pms );
mbedtls_platform_zeroize( pms, sizeof( pms ) ); mbedtls_platform_zeroize( pms, sizeof( pms ) );
return( status ); return( status );