lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-11-03 20:33:16 +03:00
Code Activity

Skip psa encryption/decryption for null cipher

Browse Source 
Signed-off-by: Przemyslaw Stekiel <przemyslaw.stekiel@mobica.com>
This commit is contained in:
Przemyslaw Stekiel
2022-01-17 16:20:10 +01:00
parent ce09e7d868
commit d4eab57933
1 changed files with 50 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
library/ssl_msg.c
View File

@@ -724,32 +724,38 @@ int mbedtls_ssl_encrypt_buf( mbedtls_ssl_context *ssl,
rec->data_len, 0 ) ); rec->data_len, 0 ) );
#if defined(MBEDTLS_USE_PSA_CRYPTO) #if defined(MBEDTLS_USE_PSA_CRYPTO)
status = psa_cipher_encrypt_setup( &cipher_op, /* Skip psa encryption for null cipher */
transform->psa_key_enc, transform->psa_alg ); if ( transform->psa_alg != MBEDTLS_SSL_NULL_CIPHER )
{
status = psa_cipher_encrypt_setup( &cipher_op,
transform->psa_key_enc, transform->psa_alg );
if( status != PSA_SUCCESS ) if( status != PSA_SUCCESS )
return( psa_status_to_mbedtls( status ) ); return( psa_status_to_mbedtls( status ) );
status = psa_cipher_set_iv( &cipher_op, transform->iv_enc, transform->ivlen ); status = psa_cipher_set_iv( &cipher_op, transform->iv_enc, transform->ivlen );
if( status != PSA_SUCCESS ) if( status != PSA_SUCCESS )
return( psa_status_to_mbedtls( status ) ); return( psa_status_to_mbedtls( status ) );
status = psa_cipher_update( &cipher_op, status = psa_cipher_update( &cipher_op,
data, rec->data_len, data, rec->data_len,
data, rec->data_len, &olen ); data, rec->data_len, &olen );
if( status != PSA_SUCCESS ) if( status != PSA_SUCCESS )
return( psa_status_to_mbedtls( status ) ); return( psa_status_to_mbedtls( status ) );
status = psa_cipher_finish( &cipher_op, status = psa_cipher_finish( &cipher_op,
data + olen, rec->data_len - olen, data + olen, rec->data_len - olen,
&part_len ); &part_len );
if( status != PSA_SUCCESS ) if( status != PSA_SUCCESS )
return( psa_status_to_mbedtls( status ) ); return( psa_status_to_mbedtls( status ) );
olen += part_len; olen += part_len;
} else {
olen = rec->data_len;
}
#else #else
if( ( ret = mbedtls_cipher_crypt( &transform->cipher_ctx_enc, if( ( ret = mbedtls_cipher_crypt( &transform->cipher_ctx_enc,
transform->iv_enc, transform->ivlen, transform->iv_enc, transform->ivlen,
@@ -956,7 +962,7 @@ int mbedtls_ssl_encrypt_buf( mbedtls_ssl_context *ssl,
#if defined(MBEDTLS_USE_PSA_CRYPTO) #if defined(MBEDTLS_USE_PSA_CRYPTO)
status = psa_cipher_encrypt_setup( &cipher_op, status = psa_cipher_encrypt_setup( &cipher_op,
transform->psa_key_enc, transform->psa_alg ); transform->psa_key_enc, transform->psa_alg );
if( status != PSA_SUCCESS ) if( status != PSA_SUCCESS )
return( psa_status_to_mbedtls( status ) ); return( psa_status_to_mbedtls( status ) );
@@ -1135,32 +1141,38 @@ int mbedtls_ssl_decrypt_buf( mbedtls_ssl_context const *ssl,
#endif /* MBEDTLS_USE_PSA_CRYPTO */ #endif /* MBEDTLS_USE_PSA_CRYPTO */
#if defined(MBEDTLS_USE_PSA_CRYPTO) #if defined(MBEDTLS_USE_PSA_CRYPTO)
status = psa_cipher_decrypt_setup( &cipher_op, /* Skip psa decryption for null cipher */
transform->psa_key_dec, transform->psa_alg ); if ( transform->psa_alg != MBEDTLS_SSL_NULL_CIPHER )
{
status = psa_cipher_decrypt_setup( &cipher_op,
transform->psa_key_dec, transform->psa_alg );
if( status != PSA_SUCCESS ) if( status != PSA_SUCCESS )
return( psa_status_to_mbedtls( status ) ); return( psa_status_to_mbedtls( status ) );
status = psa_cipher_set_iv( &cipher_op, transform->iv_dec, transform->ivlen ); status = psa_cipher_set_iv( &cipher_op, transform->iv_dec, transform->ivlen );
if( status != PSA_SUCCESS ) if( status != PSA_SUCCESS )
return( psa_status_to_mbedtls( status ) ); return( psa_status_to_mbedtls( status ) );
status = psa_cipher_update( &cipher_op, status = psa_cipher_update( &cipher_op,
data, rec->data_len, data, rec->data_len,
data, rec->data_len, &olen ); data, rec->data_len, &olen );
if( status != PSA_SUCCESS ) if( status != PSA_SUCCESS )
return( psa_status_to_mbedtls( status ) ); return( psa_status_to_mbedtls( status ) );
status = psa_cipher_finish( &cipher_op, status = psa_cipher_finish( &cipher_op,
data + olen, rec->data_len - olen, data + olen, rec->data_len - olen,
&part_len ); &part_len );
if( status != PSA_SUCCESS ) if( status != PSA_SUCCESS )
return( psa_status_to_mbedtls( status ) ); return( psa_status_to_mbedtls( status ) );
olen += part_len; olen += part_len;
} else {
olen = rec->data_len;
}
#else #else
if( ( ret = mbedtls_cipher_crypt( &transform->cipher_ctx_dec, if( ( ret = mbedtls_cipher_crypt( &transform->cipher_ctx_dec,
@@ -1460,7 +1472,7 @@ int mbedtls_ssl_decrypt_buf( mbedtls_ssl_context const *ssl,
#if defined(MBEDTLS_USE_PSA_CRYPTO) #if defined(MBEDTLS_USE_PSA_CRYPTO)
status = psa_cipher_decrypt_setup( &cipher_op, status = psa_cipher_decrypt_setup( &cipher_op,
transform->psa_key_dec, transform->psa_alg ); transform->psa_key_dec, transform->psa_alg );
if( status != PSA_SUCCESS ) if( status != PSA_SUCCESS )
return( psa_status_to_mbedtls( status ) ); return( psa_status_to_mbedtls( status ) );