ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #3088 from andresag01/mbedtls-preoprocessor-checks 

Add checks for NULL_ENTROPY and SSL_TLS in mbed OS
pull/3112/head
Russ Butler 2016-10-20 15:51:24 -04:00 committed by GitHub
parent a6e199ac75 509a72ca81
commit d1a71eb9fc
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
features/mbedtls/importer/adjust-config.sh
View File

@ -55,10 +55,21 @@ add_code
"\n" \ "\n" \
"#else\n" "#else\n"
add_code \ add_code \
"#include \"check_config.h\"\n" \ "#include \"check_config.h\"\n" \
"\n" \ "\n" \
"#endif \/* !MBEDTLS_ENTROPY_HARDWARE_ALT && !MBEDTLS_TEST_NULL_ENTROPY *\/" "#endif \/* !MBEDTLS_ENTROPY_HARDWARE_ALT && !MBEDTLS_TEST_NULL_ENTROPY *\/\n" \
"\n" \
"#if defined(MBEDTLS_TEST_NULL_ENTROPY)\n" \
"#warning \"MBEDTLS_TEST_NULL_ENTROPY has been enabled. This \" \\\\\n" \
" \"configuration is not secure and is not suitable for production use\"\n" \
"#endif\n" \
"\n" \
"#if defined(MBEDTLS_SSL_TLS_C) && !defined(MBEDTLS_TEST_NULL_ENTROPY) && \\\\\n" \
" !defined(MBEDTLS_ENTROPY_HARDWARE_ALT)\n" \
"#error \"No entropy source was found at build time, so TLS \" \\\\\n" \
" \"functionality is not available\"\n" \
"#endif\n"
# not supported on mbed OS, nor used by mbed Client # not supported on mbed OS, nor used by mbed Client
conf unset MBEDTLS_NET_C conf unset MBEDTLS_NET_C

12
features/mbedtls/inc/mbedtls/config.h
View File

@ -2613,4 +2613,16 @@
#include "check_config.h" #include "check_config.h"
#endif /* !MBEDTLS_ENTROPY_HARDWARE_ALT && !MBEDTLS_TEST_NULL_ENTROPY */ #endif /* !MBEDTLS_ENTROPY_HARDWARE_ALT && !MBEDTLS_TEST_NULL_ENTROPY */
#if defined(MBEDTLS_TEST_NULL_ENTROPY)
#warning "MBEDTLS_TEST_NULL_ENTROPY has been enabled. This " \
"configuration is not secure and is not suitable for production use"
#endif
#if defined(MBEDTLS_SSL_TLS_C) && !defined(MBEDTLS_TEST_NULL_ENTROPY) && \
!defined(MBEDTLS_ENTROPY_HARDWARE_ALT)
#error "No entropy source was found at build time, so TLS " \
"functionality is not available"
#endif
#endif /* MBEDTLS_CONFIG_H */ #endif /* MBEDTLS_CONFIG_H */