Mbed-TLS · redtangent · Aug 31, 2018 · Aug 31, 2018 · Sep 30, 2018 · Dec 14, 2018
diff --git a/ChangeLog b/ChangeLog
@@ -19,6 +19,9 @@ Security
  DTLS client when parsing the Hello Verify Request message.
 
 Bugfix
+ * Add missing limits.h standard C library header to ssl_tls.c and udp_proxy.c
+ which was only including it via check_config.h previously, which may not be
+ included in custom configuration files. Fixes #1803
  * Fix compilation failure when both MBEDTLS_SSL_PROTO_DTLS and
  MBEDTLS_SSL_HW_RECORD_ACCEL are enabled.
  * Fix a function name in a debug message. Contributed by Ercan Ozturk in

diff --git a/configs/config-ccm-psk-tls1_2.h b/configs/config-ccm-psk-tls1_2.h
@@ -83,6 +83,4 @@
  */
 #define MBEDTLS_SSL_MAX_CONTENT_LEN 512
 
-#include "mbedtls/check_config.h"
-
 #endif /* MBEDTLS_CONFIG_H */
diff --git a/configs/config-mini-tls1_1.h b/configs/config-mini-tls1_1.h
@@ -73,6 +73,4 @@
 /* For testing with compat.sh */
 #define MBEDTLS_FS_IO
 
-#include "mbedtls/check_config.h"
-
 #endif /* MBEDTLS_CONFIG_H */
diff --git a/configs/config-no-entropy.h b/configs/config-no-entropy.h
@@ -86,6 +86,4 @@
 /* Miscellaneous options */
 #define MBEDTLS_AES_ROM_TABLES
 
-#include "check_config.h"
-
 #endif /* MBEDTLS_CONFIG_H */
diff --git a/configs/config-suite-b.h b/configs/config-suite-b.h
@@ -112,6 +112,4 @@
  */
 #define MBEDTLS_SSL_MAX_CONTENT_LEN 1024
 
-#include "mbedtls/check_config.h"
-
 #endif /* MBEDTLS_CONFIG_H */
diff --git a/configs/config-thread.h b/configs/config-thread.h
@@ -89,6 +89,4 @@
 /* Save ROM and a few bytes of RAM by specifying our own ciphersuite list */
 #define MBEDTLS_SSL_CIPHERSUITES MBEDTLS_TLS_ECJPAKE_WITH_AES_128_CCM_8
 
-#include "mbedtls/check_config.h"
-
 #endif /* MBEDTLS_CONFIG_H */
diff --git a/include/mbedtls/config.h b/include/mbedtls/config.h
@@ -2871,6 +2871,4 @@
 #include MBEDTLS_USER_CONFIG_FILE
 #endif
 
-#include "check_config.h"
-
 #endif /* MBEDTLS_CONFIG_H */
diff --git a/library/aes.c b/library/aes.c
@@ -30,6 +30,7 @@
 #else
 #include MBEDTLS_CONFIG_FILE
 #endif
+#include "mbedtls/check_config.h"
 
 #if defined(MBEDTLS_AES_C)
 

diff --git a/library/aesni.c b/library/aesni.c
@@ -29,6 +29,7 @@
 #else
 #include MBEDTLS_CONFIG_FILE
 #endif
+#include "mbedtls/check_config.h"
 
 #if defined(MBEDTLS_AESNI_C)
 

diff --git a/library/arc4.c b/library/arc4.c
@@ -29,6 +29,7 @@
 #else
 #include MBEDTLS_CONFIG_FILE
 #endif
+#include "mbedtls/check_config.h"
 
 #if defined(MBEDTLS_ARC4_C)
 

diff --git a/library/asn1parse.c b/library/asn1parse.c
@@ -24,6 +24,7 @@
 #else
 #include MBEDTLS_CONFIG_FILE
 #endif
+#include "mbedtls/check_config.h"
 
 #if defined(MBEDTLS_ASN1_PARSE_C)
 

diff --git a/library/asn1write.c b/library/asn1write.c
@@ -24,6 +24,7 @@
 #else
 #include MBEDTLS_CONFIG_FILE
 #endif
+#include "mbedtls/check_config.h"
 
 #if defined(MBEDTLS_ASN1_WRITE_C)
 

diff --git a/library/base64.c b/library/base64.c
@@ -24,6 +24,7 @@
 #else
 #include MBEDTLS_CONFIG_FILE
 #endif
+#include "mbedtls/check_config.h"
 
 #if defined(MBEDTLS_BASE64_C)
 

diff --git a/library/bignum.c b/library/bignum.c
@@ -40,6 +40,7 @@
 #else
 #include MBEDTLS_CONFIG_FILE
 #endif
+#include "mbedtls/check_config.h"
 
 #if defined(MBEDTLS_BIGNUM_C)
 

diff --git a/library/blowfish.c b/library/blowfish.c
@@ -30,6 +30,7 @@
 #else
 #include MBEDTLS_CONFIG_FILE
 #endif
+#include "mbedtls/check_config.h"
 
 #if defined(MBEDTLS_BLOWFISH_C)
 

diff --git a/library/camellia.c b/library/camellia.c
@@ -30,6 +30,7 @@
 #else
 #include MBEDTLS_CONFIG_FILE
 #endif
+#include "mbedtls/check_config.h"
 
 #if defined(MBEDTLS_CAMELLIA_C)
 

diff --git a/library/ccm.c b/library/ccm.c
@@ -33,6 +33,7 @@
 #else
 #include MBEDTLS_CONFIG_FILE
 #endif
+#include "mbedtls/check_config.h"
 
 #if defined(MBEDTLS_CCM_C)
 

diff --git a/library/certs.c b/library/certs.c
@@ -24,6 +24,7 @@
 #else
 #include MBEDTLS_CONFIG_FILE
 #endif
+#include "mbedtls/check_config.h"
 
 #include "mbedtls/certs.h"
 

diff --git a/library/cipher.c b/library/cipher.c
@@ -28,6 +28,7 @@
 #else
 #include MBEDTLS_CONFIG_FILE
 #endif
+#include "mbedtls/check_config.h"
 
 #if defined(MBEDTLS_CIPHER_C)
 

diff --git a/library/cipher_wrap.c b/library/cipher_wrap.c
@@ -28,6 +28,7 @@
 #else
 #include MBEDTLS_CONFIG_FILE
 #endif
+#include "mbedtls/check_config.h"
 
 #if defined(MBEDTLS_CIPHER_C)
 

diff --git a/library/cmac.c b/library/cmac.c
@@ -45,6 +45,7 @@
 #else
 #include MBEDTLS_CONFIG_FILE
 #endif
+#include "mbedtls/check_config.h"
 
 #if defined(MBEDTLS_CMAC_C)
 

diff --git a/library/ctr_drbg.c b/library/ctr_drbg.c
@@ -29,6 +29,7 @@
 #else
 #include MBEDTLS_CONFIG_FILE
 #endif
+#include "mbedtls/check_config.h"
 
 #if defined(MBEDTLS_CTR_DRBG_C)
 

diff --git a/library/debug.c b/library/debug.c
@@ -24,6 +24,7 @@
 #else
 #include MBEDTLS_CONFIG_FILE
 #endif
+#include "mbedtls/check_config.h"
 
 #if defined(MBEDTLS_DEBUG_C)
 

diff --git a/library/des.c b/library/des.c
@@ -30,6 +30,7 @@
 #else
 #include MBEDTLS_CONFIG_FILE
 #endif
+#include "mbedtls/check_config.h"
 
 #if defined(MBEDTLS_DES_C)
 

diff --git a/library/dhm.c b/library/dhm.c
@@ -32,6 +32,7 @@
 #else
 #include MBEDTLS_CONFIG_FILE
 #endif
+#include "mbedtls/check_config.h"
 
 #if defined(MBEDTLS_DHM_C)
 

diff --git a/library/ecdh.c b/library/ecdh.c
@@ -31,6 +31,7 @@
 #else
 #include MBEDTLS_CONFIG_FILE
 #endif
+#include "mbedtls/check_config.h"
 
 #if defined(MBEDTLS_ECDH_C)
 

diff --git a/library/ecdsa.c b/library/ecdsa.c
@@ -30,6 +30,7 @@
 #else
 #include MBEDTLS_CONFIG_FILE
 #endif
+#include "mbedtls/check_config.h"
 
 #if defined(MBEDTLS_ECDSA_C)
 

diff --git a/library/ecjpake.c b/library/ecjpake.c
@@ -29,6 +29,7 @@
 #else
 #include MBEDTLS_CONFIG_FILE
 #endif
+#include "mbedtls/check_config.h"
 
 #if defined(MBEDTLS_ECJPAKE_C)
 

diff --git a/library/ecp.c b/library/ecp.c
@@ -45,6 +45,7 @@
 #else
 #include MBEDTLS_CONFIG_FILE
 #endif
+#include "mbedtls/check_config.h"
 
 #if defined(MBEDTLS_ECP_C)
 

diff --git a/library/ecp_curves.c b/library/ecp_curves.c
@@ -24,6 +24,7 @@
 #else
 #include MBEDTLS_CONFIG_FILE
 #endif
+#include "mbedtls/check_config.h"
 
 #if defined(MBEDTLS_ECP_C)
 

diff --git a/library/entropy.c b/library/entropy.c
@@ -24,6 +24,7 @@
 #else
 #include MBEDTLS_CONFIG_FILE
 #endif
+#include "mbedtls/check_config.h"
 
 #if defined(MBEDTLS_ENTROPY_C)
 

diff --git a/library/entropy_poll.c b/library/entropy_poll.c
@@ -24,6 +24,7 @@
 #else
 #include MBEDTLS_CONFIG_FILE
 #endif
+#include "mbedtls/check_config.h"
 
 #if defined(MBEDTLS_ENTROPY_C)
 

diff --git a/library/error.c b/library/error.c
@@ -24,6 +24,7 @@
 #else
 #include MBEDTLS_CONFIG_FILE
 #endif
+#include "mbedtls/check_config.h"
 
 #if defined(MBEDTLS_ERROR_C) || defined(MBEDTLS_ERROR_STRERROR_DUMMY)
 #include "mbedtls/error.h"

diff --git a/library/gcm.c b/library/gcm.c
@@ -34,6 +34,7 @@
 #else
 #include MBEDTLS_CONFIG_FILE
 #endif
+#include "mbedtls/check_config.h"
 
 #if defined(MBEDTLS_GCM_C)
 

diff --git a/library/havege.c b/library/havege.c
@@ -31,6 +31,7 @@
 #else
 #include MBEDTLS_CONFIG_FILE
 #endif
+#include "mbedtls/check_config.h"
 
 #if defined(MBEDTLS_HAVEGE_C)
 

diff --git a/library/hmac_drbg.c b/library/hmac_drbg.c
@@ -30,6 +30,7 @@
 #else
 #include MBEDTLS_CONFIG_FILE
 #endif
+#include "mbedtls/check_config.h"
 
 #if defined(MBEDTLS_HMAC_DRBG_C)
 

diff --git a/library/md.c b/library/md.c
@@ -28,6 +28,7 @@
 #else
 #include MBEDTLS_CONFIG_FILE
 #endif
+#include "mbedtls/check_config.h"
 
 #if defined(MBEDTLS_MD_C)
 

diff --git a/library/md2.c b/library/md2.c
@@ -30,6 +30,7 @@
 #else
 #include MBEDTLS_CONFIG_FILE
 #endif
+#include "mbedtls/check_config.h"
 
 #if defined(MBEDTLS_MD2_C)
 

diff --git a/library/md4.c b/library/md4.c
@@ -30,6 +30,7 @@
 #else
 #include MBEDTLS_CONFIG_FILE
 #endif
+#include "mbedtls/check_config.h"
 
 #if defined(MBEDTLS_MD4_C)
 

diff --git a/library/md5.c b/library/md5.c
@@ -29,6 +29,7 @@
 #else
 #include MBEDTLS_CONFIG_FILE
 #endif
+#include "mbedtls/check_config.h"
 
 #if defined(MBEDTLS_MD5_C)
 

diff --git a/library/md_wrap.c b/library/md_wrap.c
@@ -28,6 +28,7 @@
 #else
 #include MBEDTLS_CONFIG_FILE
 #endif
+#include "mbedtls/check_config.h"
 
 #if defined(MBEDTLS_MD_C)
 

diff --git a/library/memory_buffer_alloc.c b/library/memory_buffer_alloc.c
@@ -24,6 +24,7 @@
 #else
 #include MBEDTLS_CONFIG_FILE
 #endif
+#include "mbedtls/check_config.h"
 
 #if defined(MBEDTLS_MEMORY_BUFFER_ALLOC_C)
 #include "mbedtls/memory_buffer_alloc.h"

diff --git a/library/net_sockets.c b/library/net_sockets.c
@@ -24,6 +24,7 @@
 #else
 #include MBEDTLS_CONFIG_FILE
 #endif
+#include "mbedtls/check_config.h"
 
 #if defined(MBEDTLS_NET_C)
 

diff --git a/library/oid.c b/library/oid.c
@@ -26,6 +26,7 @@
 #else
 #include MBEDTLS_CONFIG_FILE
 #endif
+#include "mbedtls/check_config.h"
 
 #if defined(MBEDTLS_OID_C)
 

diff --git a/library/padlock.c b/library/padlock.c
@@ -30,6 +30,7 @@
 #else
 #include MBEDTLS_CONFIG_FILE
 #endif
+#include "mbedtls/check_config.h"
 
 #if defined(MBEDTLS_PADLOCK_C)
 

diff --git a/library/pem.c b/library/pem.c
@@ -24,6 +24,7 @@
 #else
 #include MBEDTLS_CONFIG_FILE
 #endif
+#include "mbedtls/check_config.h"
 
 #if defined(MBEDTLS_PEM_PARSE_C) || defined(MBEDTLS_PEM_WRITE_C)
 

diff --git a/library/pk.c b/library/pk.c
@@ -24,6 +24,7 @@
 #else
 #include MBEDTLS_CONFIG_FILE
 #endif
+#include "mbedtls/check_config.h"
 
 #if defined(MBEDTLS_PK_C)
 #include "mbedtls/pk.h"

diff --git a/library/pk_wrap.c b/library/pk_wrap.c
@@ -24,6 +24,7 @@
 #else
 #include MBEDTLS_CONFIG_FILE
 #endif
+#include "mbedtls/check_config.h"
 
 #if defined(MBEDTLS_PK_C)
 #include "mbedtls/pk_internal.h"

diff --git a/library/pkcs11.c b/library/pkcs11.c
@@ -23,9 +23,15 @@
  * This file is part of mbed TLS (https://tls.mbed.org)
  */
 
-#include "mbedtls/pkcs11.h"
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "mbedtls/config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+#include "mbedtls/check_config.h"
 
 #if defined(MBEDTLS_PKCS11_C)
+#include "mbedtls/pkcs11.h"
 
 #include "mbedtls/md.h"
 #include "mbedtls/oid.h"