mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-01-30 15:32:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

change mbedtls_cipher_info_from_psa to provide cipher_id also

Browse Source
This commit is contained in:
mohammad1603 2018-06-03 15:04:51 +03:00 committed by itayzafrir
parent 22898ba0bd
commit f4f0d612ba
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
library/psa_crypto.c
View File

@ -888,10 +888,11 @@ psa_status_t psa_hash_verify(psa_hash_operation_t *operation,
static const mbedtls_cipher_info_t *mbedtls_cipher_info_from_psa( static const mbedtls_cipher_info_t *mbedtls_cipher_info_from_psa(
psa_algorithm_t alg, psa_algorithm_t alg,
psa_key_type_t key_type, psa_key_type_t key_type,
size_t key_bits ) size_t key_bits,
mbedtls_cipher_id_t* cipher_id )
{ {
mbedtls_cipher_id_t cipher_id;
mbedtls_cipher_mode_t mode; mbedtls_cipher_mode_t mode;
mbedtls_cipher_id_t cipher_id_tmp;
if( PSA_ALG_IS_CIPHER( alg ) || PSA_ALG_IS_AEAD( alg ) ) if( PSA_ALG_IS_CIPHER( alg ) || PSA_ALG_IS_AEAD( alg ) )
{ {
@ -934,25 +935,27 @@ static const mbedtls_cipher_info_t *mbedtls_cipher_info_from_psa(
switch( key_type ) switch( key_type )
{ {
case PSA_KEY_TYPE_AES: case PSA_KEY_TYPE_AES:
cipher_id = MBEDTLS_CIPHER_ID_AES; cipher_id_tmp = MBEDTLS_CIPHER_ID_AES;
break; break;
case PSA_KEY_TYPE_DES: case PSA_KEY_TYPE_DES:
if( key_bits == 64 ) if( key_bits == 64 )
cipher_id = MBEDTLS_CIPHER_ID_DES; cipher_id_tmp = MBEDTLS_CIPHER_ID_DES;
else else
cipher_id = MBEDTLS_CIPHER_ID_3DES; cipher_id_tmp = MBEDTLS_CIPHER_ID_3DES;
break; break;
case PSA_KEY_TYPE_CAMELLIA: case PSA_KEY_TYPE_CAMELLIA:
cipher_id = MBEDTLS_CIPHER_ID_CAMELLIA; cipher_id_tmp = MBEDTLS_CIPHER_ID_CAMELLIA;
break; break;
case PSA_KEY_TYPE_ARC4: case PSA_KEY_TYPE_ARC4:
cipher_id = MBEDTLS_CIPHER_ID_ARC4; cipher_id_tmp = MBEDTLS_CIPHER_ID_ARC4;
break; break;
default: default:
return( NULL ); return( NULL );
} }
if( cipher_id != NULL )
*cipher_id == cipher_id_tmp;
return( mbedtls_cipher_info_from_values( cipher_id, key_bits, mode ) ); return( mbedtls_cipher_info_from_values( cipher_id_tmp, key_bits, mode ) );
} }
psa_status_t psa_mac_abort( psa_mac_operation_t *operation ) psa_status_t psa_mac_abort( psa_mac_operation_t *operation )
@ -1010,7 +1013,7 @@ psa_status_t psa_mac_start( psa_mac_operation_t *operation,
if( ! PSA_ALG_IS_HMAC( alg ) ) if( ! PSA_ALG_IS_HMAC( alg ) )
{ {
cipher_info = mbedtls_cipher_info_from_psa( alg, key_type, key_bits ); cipher_info = mbedtls_cipher_info_from_psa( alg, key_type, key_bits, NULL );
if( cipher_info == NULL ) if( cipher_info == NULL )
return( PSA_ERROR_NOT_SUPPORTED ); return( PSA_ERROR_NOT_SUPPORTED );
operation->mac_size = cipher_info->block_size; operation->mac_size = cipher_info->block_size;