Merge remote-tracking branch 'myfork/pr_1073' into mbedtls-2.7-proposed

This commit is contained in:
Gilles Peskine 2018-03-22 21:53:22 +01:00
commit 69d1b293fc
2 changed files with 5 additions and 1 deletions

View file

@ -31,7 +31,7 @@ find_package(Perl)
if(PERL_FOUND) if(PERL_FOUND)
# If NULL Entropy is configured, display an appropriate warning # If NULL Entropy is configured, display an appropriate warning
execute_process(COMMAND ${PERL_EXECUTABLE} ${CMAKE_SOURCE_DIR}/scripts/config.pl -f ${CMAKE_SOURCE_DIR}/include/mbedtls/config.h get MBEDTLS_TEST_NULL_ENTROPY execute_process(COMMAND ${PERL_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/scripts/config.pl -f ${CMAKE_CURRENT_SOURCE_DIR}/include/mbedtls/config.h get MBEDTLS_TEST_NULL_ENTROPY
RESULT_VARIABLE result) RESULT_VARIABLE result)
if(${result} EQUAL 0) if(${result} EQUAL 0)
message(WARNING ${NULL_ENTROPY_WARNING}) message(WARNING ${NULL_ENTROPY_WARNING})

View file

@ -6,6 +6,10 @@ Bugfix
* Fix spurious uninitialized variable warning in cmac.c. Fix independently * Fix spurious uninitialized variable warning in cmac.c. Fix independently
contributed by Brian J Murray and David Brown. contributed by Brian J Murray and David Brown.
Changes
* Support cmake build where Mbed TLS is a subproject. Fix
contributed independently by Matthieu Volat and Arne Schwabe.
= mbed TLS 2.7.2 branch released 2018-03-16 = mbed TLS 2.7.2 branch released 2018-03-16
Security Security