Merge pull request #6467 from davidhorstmann-arm/fix-unusual-macros-0

Fix unusual macros
2022-10-25 19:55:29 +02:00 · 2022-10-25 19:55:29 +02:00 · 744fd37d23
commit 744fd37d23
parent 383b0bbea0 3a334c2edc
14 changed files with 111 additions and 73 deletions
--- a/library/ssl_tls12_client.c
+++ b/library/ssl_tls12_client.c
@ -2444,9 +2444,11 @@ start_processing:

        if( ret != 0 )
        {
+            int send_alert_msg = 1;
 #if defined(MBEDTLS_SSL_ECP_RESTARTABLE_ENABLED)
-            if( ret != MBEDTLS_ERR_ECP_IN_PROGRESS )
+            send_alert_msg = ( ret != MBEDTLS_ERR_ECP_IN_PROGRESS );
 #endif
+            if( send_alert_msg )
                mbedtls_ssl_send_alert_message(
                    ssl,
                    MBEDTLS_SSL_ALERT_LEVEL_FATAL,