From 2e7cd5aa4c547af551647ac1bb334fce80bb07f4 Mon Sep 17 00:00:00 2001 From: Hanno Becker Date: Tue, 30 Apr 2019 15:01:51 +0100 Subject: [PATCH] Use MBEDTLS_ namespace for internal CID length constant --- include/mbedtls/ssl_internal.h | 6 +++--- library/ssl_tls.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/mbedtls/ssl_internal.h b/include/mbedtls/ssl_internal.h index 162f235eb..4276f48ff 100644 --- a/include/mbedtls/ssl_internal.h +++ b/include/mbedtls/ssl_internal.h @@ -611,9 +611,9 @@ struct mbedtls_ssl_transform * */ #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 @@ typedef struct #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; diff --git a/library/ssl_tls.c b/library/ssl_tls.c index 8a09a82cb..81ec29f36 100644 --- a/library/ssl_tls.c +++ b/library/ssl_tls.c @@ -1627,7 +1627,7 @@ static int ssl_cid_parse_inner_plaintext( unsigned char const *content, } #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 @@ int mbedtls_ssl_encrypt_buf( mbedtls_ssl_context *ssl, 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 @@ int mbedtls_ssl_decrypt_buf( mbedtls_ssl_context *ssl, 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)