Merge branch 'master' of https://github.com/awslabs/aws-sdk-cpp-staging

Author: JonathanHenson

aws-cpp-sdk-s3-encryption-tests/CryptoModulesTest.cpp

@@ -52,10 +52,10 @@ namespace
     static size_t const CBC_IV_SIZE_BYTES = 16u;
 
 #ifndef ENABLE_COMMONCRYPTO_ENCRYPTION
-#ifndef NDEBUG
+#if !defined(NDEBUG) && !defined(GTEST_PSEUDO_WINDOWS)
     static const char* const BYTES_SPECIFIER = "bytes=0-10";
     static const char* const ASSERTION_FAILED = "Assertion .*";
-#endif // NDEBUG
+#endif // !defined(NDEBUG) && !defined(GTEST_PSEUDO_WINDOWS)
     static const char* const GET_RANGE_SPECIFIER = "bytes=20-40";
     static const char* const GET_RANGE_OUTPUT = "ge for encryption and";
     static size_t const GCM_TAG_LENGTH = 128u;
@@ -714,7 +714,7 @@ namespace
         ASSERT_EQ(kmsClient->m_decryptCalledCount, 1u);
     }
 
-#ifndef NDEBUG
+#if !defined(NDEBUG) && !defined(GTEST_PSEUDO_WINDOWS)
     TEST_F(CryptoModulesTest, StrictAERangeGet)
     {
         SimpleEncryptionMaterials materials(Aws::Utils::Crypto::SymmetricCipher::GenerateKey());
@@ -829,7 +829,7 @@ namespace
         auto getObjectFunction = [&s3Client](Aws::S3::Model::GetObjectRequest getRequest) -> Aws::S3::Model::GetObjectOutcome { return s3Client.GetObject(getRequest); };
         ASSERT_DEATH({ decryptionModule->GetObjectSecurely(getRequest, headOutcome.GetResult(), contentCryptoMaterial, getObjectFunction); }, ASSERTION_FAILED);
     }
-#endif // NDEBUG
+#endif // !defined(NDEBUG) && !defined(GTEST_PSEUDO_WINDOWS)
 #endif
 
     TEST_F(CryptoModulesTest, RangeParserSuccess)

aws-cpp-sdk-s3-encryption/CMakeLists.txt

@@ -1,7 +1,7 @@
-add_project(aws-cpp-sdk-s3-encryption-integration-tests 
+add_project(aws-cpp-sdk-s3-encryption
     "Amazon S3 Encryption Client"
-    aws-cpp-sdk-core 
-    aws-cpp-sdk-s3 
+    aws-cpp-sdk-core 
+    aws-cpp-sdk-s3 
     aws-cpp-sdk-kms)
 
 file( GLOB S3ENCRYPTION_HEADERS "include/aws/s3-encryption/*.h" )
@@ -55,30 +55,23 @@ set(S3ENCRYPTION_INCLUDES
 
 include_directories(${S3ENCRYPTION_INCLUDES})
 
-if(MSVC AND BUILD_SHARED_LIBS)
+if(USE_WINDOWS_DLL_SEMANTICS AND BUILD_SHARED_LIBS)
     add_definitions("-DAWS_S3ENCRYPTION_EXPORTS")
 endif()
 
-add_library(aws-cpp-sdk-s3-encryption ${LIBTYPE} ${ALL_S3ENCRYPTION})
+add_library(${PROJECT_NAME} ${LIBTYPE} ${ALL_S3ENCRYPTION})
+add_library(AWS::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
 
-target_include_directories(aws-cpp-sdk-s3-encryption PUBLIC
+target_include_directories(${PROJECT_NAME} PUBLIC
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
         $<INSTALL_INTERFACE:include>)
-target_link_libraries(aws-cpp-sdk-s3-encryption ${PROJECT_LIBS})
+target_link_libraries(${PROJECT_NAME} ${PROJECT_LIBS})
 
-if(SIMPLE_INSTALL)
-    install (TARGETS aws-cpp-sdk-s3-encryption
-            ARCHIVE DESTINATION ${ARCHIVE_DIRECTORY}
-            LIBRARY DESTINATION lib
-            RUNTIME DESTINATION bin)
-else()
-    install (TARGETS aws-cpp-sdk-s3-encryption
-             ARCHIVE DESTINATION ${ARCHIVE_DIRECTORY}/${SDK_INSTALL_BINARY_PREFIX}/${PLATFORM_INSTALL_QUALIFIER}/\${CMAKE_INSTALL_CONFIG_NAME}
-             LIBRARY DESTINATION lib/${SDK_INSTALL_BINARY_PREFIX}/${PLATFORM_INSTALL_QUALIFIER}/\${CMAKE_INSTALL_CONFIG_NAME}
-             RUNTIME DESTINATION bin/${SDK_INSTALL_BINARY_PREFIX}/${PLATFORM_INSTALL_QUALIFIER}/\${CMAKE_INSTALL_CONFIG_NAME})
-endif()
+setup_install()
 
 install (FILES ${S3ENCRYPTION_HEADERS} DESTINATION include/aws/s3-encryption)
 install (FILES ${S3ENCRYPTION_MATERIALS_HEADERS} DESTINATION include/aws/s3-encryption/materials)
 install (FILES ${S3ENCRYPTION_HANDLERS_HEADERS} DESTINATION include/aws/s3-encryption/handlers)
 install (FILES ${S3ENCRYPTION_MODULES_HEADERS} DESTINATION include/aws/s3-encryption/modules)
+
+do_packaging()

aws-cpp-sdk-s3-encryption/include/aws/s3-encryption/s3Encryption_EXPORTS.h

@@ -12,24 +12,23 @@
 * express or implied. See the License for the specific language governing
 * permissions and limitations under the License.
 */
+
 #pragma once
 
-#ifdef _WIN32
-//disable windows complaining about max template size.
-#pragma warning (disable : 4503)
-#endif
+#if defined (USE_WINDOWS_DLL_SEMANTICS) || defined (WIN32)
+    #ifdef _MSC_VER
+        #pragma warning(disable : 4251)
+    #endif // _MSC_VER
+    #ifdef USE_IMPORT_EXPORT
+        #ifdef AWS_S3ENCRYPTION_EXPORTS
+            #define  AWS_S3ENCRYPTION_API __declspec(dllexport)
+        #else // AWS_S3ENCRYPTION_EXPORTS
+            #define  AWS_S3ENCRYPTION_API __declspec(dllimport)
+        #endif // AWS_S3ENCRYPTION_EXPORTS
+    #else // USE_IMPORT_EXPORT
+        #define AWS_S3ENCRYPTION_API
+    #endif // USE_IMPORT_EXPORT
+#else // defined (USE_WINDOWS_DLL_SEMANTICS) || defined (WIN32)
+    #define AWS_S3ENCRYPTION_API
+#endif // defined (USE_WINDOWS_DLL_SEMANTICS) || defined (WIN32)
 
-#if defined (_MSC_VER)
-#pragma warning(disable : 4251)
-	#ifdef USE_IMPORT_EXPORT
-		#ifdef AWS_S3ENCRYPTION_EXPORTS
-			#define AWS_S3ENCRYPTION_API __declspec(dllexport)
-		#else
-			#define AWS_S3ENCRYPTION_API __declspec(dllimport)
-		#endif /* AWS_S3ENCRYPTION_EXPORTS */
-	#else
-		#define AWS_S3ENCRYPTION_API
-	#endif //
-#else /* defined (_WIN32) */
-	#define AWS_S3ENCRYPTION_API
-#endif

cmake/build_external.cmake

@@ -55,12 +55,15 @@ if(BUILD_CURL OR BUILD_OPENSSL OR BUILD_ZLIB)
 
     # OpenSSL
     if(BUILD_OPENSSL)
-        set(OPENSSL_SOURCE_DIR ${CMAKE_BINARY_DIR}/openssl CACHE INTERNAL "openssl source dir")
+        set(OPENSSL_SOURCE_DIR ${CMAKE_BINARY_DIR}/openssl-src CACHE INTERNAL "openssl source dir")
         set(OPENSSL_INSTALL_DIR ${EXTERNAL_INSTALL_DIR}/openssl CACHE INTERNAL "openssl install dir")
         set(OPENSSL_INCLUDE_DIR ${OPENSSL_INSTALL_DIR}/include CACHE INTERNAL "openssl include dir")
         set(OPENSSL_LIBRARY_DIR ${OPENSSL_INSTALL_DIR}/lib CACHE INTERNAL "openssl library dir")
         set(OPENSSL_CXX_FLAGS "${EXTERNAL_CXX_FLAGS} ${ZLIB_INCLUDE_FLAGS} -fPIE" CACHE INTERNAL "openssl")
         set(OPENSSL_C_FLAGS "${EXTERNAL_C_FLAGS} ${ZLIB_INCLUDE_FLAGS} -fPIE" CACHE INTERNAL "openssl")
+        if(ANDROID_ABI STREQUAL "x86_64")
+            set(OPENSSL_C_FLAGS "${OPENSSL_C_FLAGS} -DOPENSSL_NO_INLINE_ASM" CACHE INTERNAL "openssl")
+        endif()
         set(OPENSSL_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fPIE -pie" CACHE INTERNAL "openssl")
 
         set(OPENSSL_INCLUDE_FLAGS "-isystem ${OPENSSL_INCLUDE_DIR} -isystem ${OPENSSL_INCLUDE_DIR}/openssl" CACHE INTERNAL "compiler flags to find openssl includes")