commit 21b89761f899c9b40f03500c98910b855a5fe831
author David Horstmann <david.horstmann@arm.com> Thu Oct 06 18:34:28 2022 +0100
committer David Horstmann <david.horstmann@arm.com> Fri Oct 07 14:08:42 2022 +0100
tree 7cc6babc0ebb5199885634b26f21e740b0d82eb6
parent 10be134d8ef1e08862e1e2884dde3926e1435d0c

Refactor macro-spanning if in ssl_tls13_server.c

Signed-off-by: David Horstmann <david.horstmann@arm.com>

library/ssl_tls13_server.c

diff --git a/library/ssl_tls13_server.c b/library/ssl_tls13_server.c
index 6591ecb..f61c634 100644
--- a/library/ssl_tls13_server.c
+++ b/library/ssl_tls13_server.c
@@ -680,11 +680,13 @@
 
     *olen = 0;
 
+    int not_using_psk = 0;
 #if defined(MBEDTLS_USE_PSA_CRYPTO)
-    if( mbedtls_svc_key_id_is_null( ssl->handshake->psk_opaque ) )
+    not_using_psk = ( mbedtls_svc_key_id_is_null( ssl->handshake->psk_opaque ) );
 #else
-    if( ssl->handshake->psk == NULL )
+    not_using_psk = ( ssl->handshake->psk == NULL );
 #endif
+    if( not_using_psk )
     {
         /* We shouldn't have called this extension writer unless we've
          * chosen to use a PSK. */