commit 611ac771278e0f720ff2d1de4cd68ffe0e2dfa55
author Hanno Becker <hanno.becker@arm.com> Tue May 14 11:45:26 2019 +0100
committer Hanno Becker <hanno.becker@arm.com> Mon Jun 03 16:07:50 2019 +0100
tree eb8e2166f06eca70b6083cb40128be1d1aef0d81
parent 7fefd83b34c5feb90cdce184385855d06a3e105b

Fix mbedtls_ssl_conf_cid() to not depend on macro constant values

The previous implementation of mbedtls_ssl_conf_cid() relied on
MBEDTLS_SSL_UNEXPECTED_CID_IGNORE being defined as 1.

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 4cdad6c..8a796b5 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -127,8 +127,13 @@
     if( len > MBEDTLS_SSL_CID_IN_LEN_MAX )
         return( MBEDTLS_ERR_SSL_BAD_INPUT_DATA );
 
-    conf->ignore_unexpected_cid =
-        ( ignore_other_cid == MBEDTLS_SSL_UNEXPECTED_CID_IGNORE );
+    if( ignore_other_cid != MBEDTLS_SSL_UNEXPECTED_CID_FAIL &&
+        ignore_other_cid != MBEDTLS_SSL_UNEXPECTED_CID_IGNORE )
+    {
+        return( MBEDTLS_ERR_SSL_BAD_INPUT_DATA );
+    }
+
+    conf->ignore_unexpected_cid = ignore_other_cid;
     conf->cid_len = len;
     return( 0 );
 }