commit 2e0bedcc35ba67d481272676a19cf43d58f07bd3
author Hanno Becker <hanno.becker@arm.com> Tue Apr 30 14:18:06 2019 +0100
committer Hanno Becker <hanno.becker@arm.com> Fri May 17 10:20:41 2019 +0100
tree b4879cfa10f44ec330c61b1a62f9ad3b8bda3a3a
parent 31f1668d3c5e581d784ab67d838f98493dc3a733

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 ca9d035..4a1c047 100644
--- a/programs/ssl/ssl_server2.c
+++ b/programs/ssl/ssl_server2.c
@@ -759,7 +759,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 )                    \
         if( c >= '0' && c <= '9' )      \
@@ -799,6 +800,10 @@
     return( 0 );
 }
 
+#endif
+
+#if defined(MBEDTLS_KEY_EXCHANGE__SOME__PSK_ENABLED)
+
 typedef struct _psk_entry psk_entry;
 
 struct _psk_entry