commit e88477844c4e1aa1a43ff1214031331e2323a193
author Przemyslaw Stekiel <przemyslaw.stekiel@mobica.com> Mon Jan 24 23:19:21 2022 +0100
committer Przemyslaw Stekiel <przemyslaw.stekiel@mobica.com> Mon Jan 31 15:38:29 2022 +0100
tree 47a0105055db90197a7acd59f124e3ce83b09c46
parent f4b3f087ae0c33de2ac67387dd5515a9c3f19f0b

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

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>

library/ssl_msg.c

diff --git a/library/ssl_msg.c b/library/ssl_msg.c
index e473c27..d27c561 100644
--- a/library/ssl_msg.c
+++ b/library/ssl_msg.c
@@ -793,12 +793,7 @@
     defined(MBEDTLS_CCM_C) || \
     defined(MBEDTLS_CHACHAPOLY_C)
 #if defined(MBEDTLS_USE_PSA_CRYPTO)
-    if ( transform->psa_alg == PSA_ALG_GCM ||
-         /* 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 )
+    if ( PSA_ALG_IS_AEAD( transform->psa_alg ) )
 #else
     if( mode == MBEDTLS_MODE_GCM ||
         mode == MBEDTLS_MODE_CCM ||
@@ -1233,12 +1228,7 @@
     defined(MBEDTLS_CCM_C) || \
     defined(MBEDTLS_CHACHAPOLY_C)
 #if defined(MBEDTLS_USE_PSA_CRYPTO)
-    if ( transform->psa_alg == PSA_ALG_GCM ||
-         /* 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 )
+    if ( PSA_ALG_IS_AEAD( transform->psa_alg ) )
 #else
     if( mode == MBEDTLS_MODE_GCM ||
         mode == MBEDTLS_MODE_CCM ||