commit 301711e96ee71bef96163f51ba877f8b3fa92301
author Gilles Peskine <Gilles.Peskine@arm.com> Tue Apr 26 16:57:05 2022 +0200
committer Neil Armstrong <narmstrong@baylibre.com> Wed Apr 27 10:28:55 2022 +0200
tree 1332cdbf9885c6743c6c49f3e496b4d4f3370ade
parent e108d987eaf93684e5f58054b11cae0b127841ca

Simplify mbedtls_ssl_get_base_mode

Reduce the amount of ifdef's by making the USE_PSA_CRYPTO and
non-USE_PSA_CRYPTO definitions independent.

No behavior change.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index bbdd5e6..2175734 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -1713,28 +1713,29 @@
 }
 #endif /* MBEDTLS_KEY_EXCHANGE_SOME_PSK_ENABLED */
 
-static mbedtls_ssl_mode_t mbedtls_ssl_get_base_mode(
 #if defined(MBEDTLS_USE_PSA_CRYPTO)
-        psa_algorithm_t alg
-#else
-        mbedtls_cipher_mode_t mode
-#endif /* MBEDTLS_USE_PSA_CRYPTO */
-        )
+static mbedtls_ssl_mode_t mbedtls_ssl_get_base_mode(
+        psa_algorithm_t alg )
 {
 #if defined(MBEDTLS_SSL_SOME_SUITES_USE_MAC)
-#if defined(MBEDTLS_USE_PSA_CRYPTO)
     if( alg == PSA_ALG_CBC_NO_PADDING )
         return( MBEDTLS_SSL_MODE_CBC );
-#else
-    if( mode == MBEDTLS_MODE_CBC )
-        return( MBEDTLS_SSL_MODE_CBC );
-#endif /* MBEDTLS_USE_PSA_CRYPTO */
 #endif /* MBEDTLS_SSL_SOME_SUITES_USE_MAC */
-
-#if defined(MBEDTLS_USE_PSA_CRYPTO)
     if( PSA_ALG_IS_AEAD( alg ) )
         return( MBEDTLS_SSL_MODE_AEAD );
-#else
+    return( MBEDTLS_SSL_MODE_STREAM );
+}
+
+#else /* MBEDTLS_USE_PSA_CRYPTO */
+
+static mbedtls_ssl_mode_t mbedtls_ssl_get_base_mode(
+        mbedtls_cipher_mode_t mode )
+{
+#if defined(MBEDTLS_SSL_SOME_SUITES_USE_MAC)
+    if( mode == MBEDTLS_MODE_CBC )
+        return( MBEDTLS_SSL_MODE_CBC );
+#endif /* MBEDTLS_SSL_SOME_SUITES_USE_MAC */
+
 #if defined(MBEDTLS_GCM_C) || \
     defined(MBEDTLS_CCM_C) || \
     defined(MBEDTLS_CHACHAPOLY_C)
@@ -1743,10 +1744,10 @@
         mode == MBEDTLS_MODE_CHACHAPOLY )
         return( MBEDTLS_SSL_MODE_AEAD );
 #endif /* MBEDTLS_GCM_C || MBEDTLS_CCM_C || MBEDTLS_CHACHAPOLY_C */
-#endif /* MBEDTLS_USE_PSA_CRYPTO */
 
     return( MBEDTLS_SSL_MODE_STREAM );
 }
+#endif /* MBEDTLS_USE_PSA_CRYPTO */
 
 static mbedtls_ssl_mode_t mbedtls_ssl_get_actual_mode(
     mbedtls_ssl_mode_t base_mode,