From 45103f3e15ccd16e873d985814843674ee47d115 Mon Sep 17 00:00:00 2001
From: Simon Butcher <simon.butcher@arm.com>
Date: Tue, 21 Jun 2016 14:47:11 +0100
Subject: [PATCH 1/2] Changes multiline string (for CMake >3.0) to list (for
 CMake 2.8)

---
 CMakeLists.txt | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7ae33ccb6..0a02ef1c1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,6 +15,18 @@ else()
     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 @@ if(PERL_FOUND)
     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\

From dd9895d8101f17ce804830472cbb140eba1c46a0 Mon Sep 17 00:00:00 2001
From: Simon Butcher <simon.butcher@arm.com>
Date: Tue, 21 Jun 2016 15:12:00 +0100
Subject: [PATCH 2/2] Fix config.pl to return successful exitcode for full and
 realfull

---
 scripts/config.pl | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/scripts/config.pl b/scripts/config.pl
index 04a9a7452..6f11d0ee8 100755
--- a/scripts/config.pl
+++ b/scripts/config.pl
@@ -225,13 +225,16 @@ if ($action eq "set"&& $force_option && !$done) {
 
 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) {