Build fixes (#355)

* Make sure AWS_CRYPTOSDK_PRIVATE_GITVERSION is defined in version.h

When build system couldn't detect a git version, this variable
was unset and causing build failures

* Don't run any network tests if AWS_ENC_SDK_END_TO_END_TESTS is FALSE

* Small fix to test to allow it to work on old Red Hat versions

MAP_ANONYMOUS is not defined without it on some older systems

* Update patch version number and changelog

Author: david-koenig

CHANGELOG.rst

@@ -10,3 +10,9 @@ Changelog
 ===================
 * Fixed cmake bug regarding git version of KMS user agent
 * Added CBMC header file needed by newer aws-c-common versions
+
+0.1.2 -- 2019-02-28
+===================
+* Fixed empty string bug on git version of KMS user agent
+* Local tests only by default
+* Fix of MAP_ANONYMOUS issue for older Linuxes

CMakeLists.txt

@@ -44,10 +44,7 @@ include(TestLibraryPath)
 include(CheckLibraryExists)
 include(CodeCoverageFlags)
 
-# TODO: Static link?
 include(FindOpenSSL)
-# For tests
-include(FindCURL)
 
 set(PROJECT_NAME aws-encryption-sdk)
 
@@ -61,6 +58,11 @@ set(REDUCE_TEST_ITERATIONS FALSE
 set(BUILD_SHARED_LIBS FALSE
     CACHE BOOL "Build aws-encryption-sdk-c as a shared library")
 
+option(AWS_ENC_SDK_END_TO_END_TESTS "Enable end-to-end tests. If set to FALSE (the default), runs local tests only.")
+if(AWS_ENC_SDK_END_TO_END_TESTS)
+    include(FindCURL)
+endif()
+
 option(PERFORM_HEADER_CHECK "Performs compile-time checks that each header can be included independently. Requires a C++ compiler.")
 
 option(VALGRIND_TEST_SUITE "Run the test suite under valgrind")

aws-encryption-sdk-cpp/CMakeLists.txt

@@ -13,9 +13,6 @@
 # limitations under the License.
 #
 
-# End-to-End tests might require special permissions
-option(AWS_ENC_SDK_END_TO_END_TESTS "Enable End-to-End tests")
-
 file(GLOB AWS_CRYPTOSDK_CPP_HEADERS
     # Headers subject to API/ABI stability guarantees
     "${CMAKE_CURRENT_SOURCE_DIR}/include/aws/cryptosdk/cpp/*.h"

include/aws/cryptosdk/version.h

@@ -50,9 +50,13 @@
  * @{
  */
 
+#ifndef AWS_CRYPTOSDK_PRIVATE_GITVERSION
+#    define AWS_CRYPTOSDK_PRIVATE_GITVERSION ""
+#endif
+
 #define AWS_CRYPTOSDK_VERSION_MAJOR 0
 #define AWS_CRYPTOSDK_VERSION_MINOR 1
-#define AWS_CRYPTOSDK_VERSION_PATCH 1
+#define AWS_CRYPTOSDK_VERSION_PATCH 2
 
 #ifndef AWS_CRYPTOSDK_DOXYGEN  // undocumented private helpers
 #    define AWS_CRYPTOSDK_PRIVATE_QUOTEARG(a) #    a

tests/CMakeLists.txt

@@ -71,7 +71,7 @@ if (REDUCE_TEST_ITERATIONS)
     target_compile_definitions(test_decryption_vectors PRIVATE REDUCE_TEST_ITERATIONS)
 endif()
 
-if(CURL_FOUND)
+if(AWS_ENC_SDK_END_TO_END_TESTS AND CURL_FOUND)
     add_executable(t_encrypt_compat integration/t_encrypt_compat.c)
     set_target_properties(t_encrypt_compat PROPERTIES
         C_STANDARD 99
@@ -81,7 +81,7 @@ if(CURL_FOUND)
     target_sources(t_encrypt_compat PRIVATE ${UNIT_TEST_SRC_CPP})
     target_include_directories(t_encrypt_compat PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/lib)
     aws_add_test(integration_encrypt_compatibility ${VALGRIND} ${CMAKE_CURRENT_BINARY_DIR}/t_encrypt_compat)
-endif(CURL_FOUND)
+endif(AWS_ENC_SDK_END_TO_END_TESTS AND CURL_FOUND)
 
 aws_add_test(cipher ${VALGRIND} ${CMAKE_CURRENT_BINARY_DIR}/unit-test-suite cipher)
 aws_add_test(header ${VALGRIND} ${CMAKE_CURRENT_BINARY_DIR}/unit-test-suite header)

tests/unit/t_header.c

@@ -13,6 +13,12 @@
  * limitations under the License.
  */
 
+#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
+#    define _BSD_SOURCE
+#    include <sys/mman.h>
+#    include <unistd.h>
+#endif
+
 #include <aws/common/hash_table.h>
 #include <aws/common/string.h>
 #include <aws/cryptosdk/edk.h>
@@ -24,11 +30,6 @@
 #include "testing.h"
 #include "testutil.h"
 
-#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
-#    include <sys/mman.h>
-#    include <unistd.h>
-#endif
-
 #ifdef _MSC_VER
 #    include <malloc.h>
 #    define alloca _alloca