cuberite/polarssl
1
0
Fork 0
mirror of https://github.com/cuberite/polarssl.git synced 2025-11-04 04:32:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development' into development-restricted

Browse Source
This commit is contained in:
Janos Follath 2016-06-21 15:07:00 +01:00
commit c8dd1148f0
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
CMakeLists.txt
View File

@ -15,6 +15,18 @@ else()
option(ENABLE_TESTING "Build mbed TLS tests." ON) option(ENABLE_TESTING "Build mbed TLS tests." ON)
endif() endif()
# Warning string - created as a list for compatibility with CMake 2.8
set(WARNING_BORDER "*******************************************************\n")
set(NULL_ENTROPY_WARN_L1 "**** WARNING! MBEDTLS_TEST_NULL_ENTROPY defined!\n")
set(NULL_ENTROPY_WARN_L2 "**** THIS BUILD HAS NO DEFINED ENTROPY SOURCES\n")
set(NULL_ENTROPY_WARN_L3 "**** AND IS *NOT* SUITABLE FOR PRODUCTION USE\n")
set(NULL_ENTROPY_WARNING "${WARNING_BORDER}"
"${NULL_ENTROPY_WARN_L1}"
"${NULL_ENTROPY_WARN_L2}"
"${NULL_ENTROPY_WARN_L3}"
"${WARNING_BORDER}")
find_package(Perl) find_package(Perl)
if(PERL_FOUND) if(PERL_FOUND)
@ -22,12 +34,8 @@ if(PERL_FOUND)
execute_process(COMMAND ${PERL_EXECUTABLE} scripts/config.pl get MBEDTLS_TEST_NULL_ENTROPY execute_process(COMMAND ${PERL_EXECUTABLE} scripts/config.pl get MBEDTLS_TEST_NULL_ENTROPY
RESULT_VARIABLE result) RESULT_VARIABLE result)
if(${result} EQUAL 0) if(${result} EQUAL 0)
message(WARNING "\ message(WARNING ${NULL_ENTROPY_WARNING})
*******************************************************
**** WARNING! MBEDTLS_TEST_NULL_ENTROPY defined!
**** THIS BUILD HAS NO DEFINED ENTROPY SOURCES
**** AND IS *NOT* SUITABLE FOR PRODUCTION USE
*******************************************************")
if(NOT UNSAFE_BUILD) if(NOT UNSAFE_BUILD)
message(FATAL_ERROR "\ message(FATAL_ERROR "\
\n\ \n\

15
scripts/config.pl
View File

@ -225,13 +225,16 @@ if ($action eq "set"&& $force_option && !$done) {
close $config_write; close $config_write;
if ($action eq "get" && $done) { if ($action eq "get") {
if ($value ne '') { if($done) {
print $value; if ($value ne '') {
print $value;
}
exit 0;
} else {
# If the symbol was not found, return an error
exit -1;
} }
exit 0;
} else {
exit -1;
} }
if ($action eq "full" && !$done) { if ($action eq "full" && !$done) {