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

Adapt the mbed tls mode: ccm or gcm or cachapoly to psa version

Browse Source 
mode == MBEDTLS_MODE_CCM || mode == MBEDTLS_GCM || mode == MBEDTLS_CHACHAPOLY is equivalent to PSA_ALG_IS_AEAD( alg ).

Signed-off-by: Przemyslaw Stekiel <przemyslaw.stekiel@mobica.com>
This commit is contained in:
Przemyslaw Stekiel
2022-01-24 23:19:21 +01:00
parent f4b3f087ae
commit e88477844c
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
library/ssl_msg.c
View File

@ -793,12 +793,7 @@ int mbedtls_ssl_encrypt_buf( mbedtls_ssl_context *ssl,
defined(MBEDTLS_CCM_C) || \ defined(MBEDTLS_CCM_C) || \
defined(MBEDTLS_CHACHAPOLY_C) defined(MBEDTLS_CHACHAPOLY_C)
#if defined(MBEDTLS_USE_PSA_CRYPTO) #if defined(MBEDTLS_USE_PSA_CRYPTO)
if ( transform->psa_alg == PSA_ALG_GCM || if ( PSA_ALG_IS_AEAD( transform->psa_alg ) )
/* PSA_ALG_IS_AEAD( transform->psa_alg ) corresponds to
psa_alg == PSA_ALG_CCM || psa_alg == PSA_ALG_AEAD_WITH_SHORTENED_TAG( PSA_ALG_CCM, 8 )
in tls context (TLS only uses the default taglen or 8) */
PSA_ALG_IS_AEAD( transform->psa_alg ) ||
transform->psa_alg == PSA_ALG_CHACHA20_POLY1305 )
#else #else
if( mode == MBEDTLS_MODE_GCM || if( mode == MBEDTLS_MODE_GCM ||
mode == MBEDTLS_MODE_CCM || mode == MBEDTLS_MODE_CCM ||
@ -1233,12 +1228,7 @@ int mbedtls_ssl_decrypt_buf( mbedtls_ssl_context const *ssl,
defined(MBEDTLS_CCM_C) || \ defined(MBEDTLS_CCM_C) || \
defined(MBEDTLS_CHACHAPOLY_C) defined(MBEDTLS_CHACHAPOLY_C)
#if defined(MBEDTLS_USE_PSA_CRYPTO) #if defined(MBEDTLS_USE_PSA_CRYPTO)
if ( transform->psa_alg == PSA_ALG_GCM || if ( PSA_ALG_IS_AEAD( transform->psa_alg ) )
/* PSA_ALG_IS_AEAD( transform->psa_alg ) corresponds to
psa_alg == PSA_ALG_CCM || psa_alg == PSA_ALG_AEAD_WITH_SHORTENED_TAG( PSA_ALG_CCM, 8 )
in tls context (TLS only uses the default taglen or 8) */
PSA_ALG_IS_AEAD( transform->psa_alg ) ||
transform->psa_alg == PSA_ALG_CHACHA20_POLY1305 )
#else #else
if( mode == MBEDTLS_MODE_GCM || if( mode == MBEDTLS_MODE_GCM ||
mode == MBEDTLS_MODE_CCM || mode == MBEDTLS_MODE_CCM ||