commit 554b6ea30a8b50a6994b4e80ed2f459f59d2bc69
author Hanno Becker <hanno.becker@arm.com> Tue Apr 30 14:18:06 2019 +0100
committer Hanno Becker <hanno.becker@arm.com> Mon Jun 03 14:43:16 2019 +0100
tree 2f9de1322b4d67e72486d9cbc59357a42ea10f6f
parent a34ff5b9a2c97706c5f9304cad394d0a85037c11

Correct compile-time guard around unhexify() in ssl_server2

programs/ssl/ssl_server2.c

diff --git a/programs/ssl/ssl_server2.c b/programs/ssl/ssl_server2.c
index 03eda0b..a94ddac 100644
--- a/programs/ssl/ssl_server2.c
+++ b/programs/ssl/ssl_server2.c
@@ -924,7 +924,8 @@
 
 #endif /* SNI_OPTION */
 
-#if defined(MBEDTLS_KEY_EXCHANGE__SOME__PSK_ENABLED)
+#if defined(MBEDTLS_KEY_EXCHANGE__SOME__PSK_ENABLED) || \
+    defined(MBEDTLS_SSL_CID)
 
 #define HEX2NUM( c )                        \
     do                                      \
@@ -967,6 +968,10 @@
     return( 0 );
 }
 
+#endif
+
+#if defined(MBEDTLS_KEY_EXCHANGE__SOME__PSK_ENABLED)
+
 typedef struct _psk_entry psk_entry;
 
 struct _psk_entry