commit 2e7cd5aa4c547af551647ac1bb334fce80bb07f4
author Hanno Becker <hanno.becker@arm.com> Tue Apr 30 15:01:51 2019 +0100
committer Hanno Becker <hanno.becker@arm.com> Fri May 17 10:23:47 2019 +0100
tree 5c636a275cd48d2a803dba4a44adf0e1a49222a0
parent d91dc3767fc793db4d2db7fb89329eea24363ddb

Use MBEDTLS_ namespace for internal CID length constant

include/mbedtls/ssl_internal.h

diff --git a/include/mbedtls/ssl_internal.h b/include/mbedtls/ssl_internal.h
index 162f235..4276f48 100644
--- a/include/mbedtls/ssl_internal.h
+++ b/include/mbedtls/ssl_internal.h
@@ -611,9 +611,9 @@
  *
  */
 #if MBEDTLS_SSL_CID_OUT_LEN_MAX > MBEDTLS_SSL_CID_IN_LEN_MAX
-#define SSL_CID_LEN_MAX MBEDTLS_SSL_CID_OUT_LEN_MAX
+#define MBEDTLS_SSL_CID_LEN_MAX MBEDTLS_SSL_CID_OUT_LEN_MAX
 #else
-#define SSL_CID_LEN_MAX MBEDTLS_SSL_CID_IN_LEN_MAX
+#define MBEDTLS_SSL_CID_LEN_MAX MBEDTLS_SSL_CID_IN_LEN_MAX
 #endif
 
 typedef struct
@@ -629,7 +629,7 @@
 
 #if defined(MBEDTLS_SSL_CID)
     uint8_t cid_len;
-    unsigned char cid[ SSL_CID_LEN_MAX ];
+    unsigned char cid[ MBEDTLS_SSL_CID_LEN_MAX ];
 #endif /* MBEDTLS_SSL_CID */
 
 } mbedtls_record;

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 8a09a82..81ec29f 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -1627,7 +1627,7 @@
 }
 #endif /* MBEDTLS_SSL_CID */
 
-/* add_data must have size ( 13 + SSL_CID_LEN_MAX ) Bytes */
+/* add_data must have size ( 13 + MBEDTLS_SSL_CID_LEN_MAX ) Bytes */
 static void ssl_extract_add_data_from_record( unsigned char* add_data,
                                               size_t *add_data_len,
                                               mbedtls_record *rec )
@@ -1673,7 +1673,7 @@
     mbedtls_cipher_mode_t mode;
     int auth_done = 0;
     unsigned char * data;
-    unsigned char add_data[13 + SSL_CID_LEN_MAX ];
+    unsigned char add_data[13 + MBEDTLS_SSL_CID_LEN_MAX ];
     size_t add_data_len;
     size_t post_avail;
 
@@ -2110,7 +2110,7 @@
     size_t padlen = 0, correct = 1;
 #endif
     unsigned char* data;
-    unsigned char add_data[13 + SSL_CID_LEN_MAX ];
+    unsigned char add_data[13 + MBEDTLS_SSL_CID_LEN_MAX ];
     size_t add_data_len;
 
 #if !defined(MBEDTLS_DEBUG_C)