From 554b6ea30a8b50a6994b4e80ed2f459f59d2bc69 Mon Sep 17 00:00:00 2001
From: Hanno Becker <hanno.becker@arm.com>
Date: Tue, 30 Apr 2019 14:18:06 +0100
Subject: [PATCH] Correct compile-time guard around unhexify() in ssl_server2

---
 programs/ssl/ssl_server2.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/programs/ssl/ssl_server2.c b/programs/ssl/ssl_server2.c
index 03eda0bf76..a94ddac8ee 100644
--- a/programs/ssl/ssl_server2.c
+++ b/programs/ssl/ssl_server2.c
@@ -924,7 +924,8 @@ int sni_callback( void *p_info, mbedtls_ssl_context *ssl,
 
 #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 @@ int unhexify( unsigned char *output, const char *input, size_t *olen )
     return( 0 );
 }
 
+#endif
+
+#if defined(MBEDTLS_KEY_EXCHANGE__SOME__PSK_ENABLED)
+
 typedef struct _psk_entry psk_entry;
 
 struct _psk_entry