Merge branch 'development' into development-restricted
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7ae33cc..0a02ef1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,6 +15,18 @@
option(ENABLE_TESTING "Build mbed TLS tests." ON)
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)
if(PERL_FOUND)
@@ -22,12 +34,8 @@
execute_process(COMMAND ${PERL_EXECUTABLE} scripts/config.pl get MBEDTLS_TEST_NULL_ENTROPY
RESULT_VARIABLE result)
if(${result} EQUAL 0)
- message(WARNING "\
- *******************************************************
- **** WARNING! MBEDTLS_TEST_NULL_ENTROPY defined!
- **** THIS BUILD HAS NO DEFINED ENTROPY SOURCES
- **** AND IS *NOT* SUITABLE FOR PRODUCTION USE
- *******************************************************")
+ message(WARNING ${NULL_ENTROPY_WARNING})
+
if(NOT UNSAFE_BUILD)
message(FATAL_ERROR "\
\n\
diff --git a/scripts/config.pl b/scripts/config.pl
index 04a9a74..6f11d0e 100755
--- a/scripts/config.pl
+++ b/scripts/config.pl
@@ -225,13 +225,16 @@
close $config_write;
-if ($action eq "get" && $done) {
- if ($value ne '') {
- print $value;
+if ($action eq "get") {
+ if($done) {
+ 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) {