that missing targent include directories is likely it

aws · Jul 1, 2024 · 48f5d52 · 48f5d52
1 parent d5c0c17
commit 48f5d52
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 13 deletions.
diff --git a/cmake/external_dependencies.cmake b/cmake/external_dependencies.cmake
@@ -19,21 +19,48 @@ endif()
 
 
 # Encryption control
-# TODO: BYO Crypto is not implemented for CRT/Was not working in the latest version of the SDK.
-if(NO_ENCRYPTION)
-    message(FATAL_ERROR "BYO_CRYPTO is not currently implemented and has been broken since version 1.9")
+if(NOT NO_ENCRYPTION)
+    if(PLATFORM_WINDOWS)
+        set(ENABLE_BCRYPT_ENCRYPTION ON)
+    elseif(PLATFORM_LINUX OR PLATFORM_ANDROID)
+        set(ENABLE_OPENSSL_ENCRYPTION ON)
+    elseif(PLATFORM_APPLE)
+        set(ENABLE_COMMONCRYPTO_ENCRYPTION ON)
+    endif()
+else()
     set(ENABLE_INJECTED_ENCRYPTION ON)
-    message(STATUS "Encryption: None")
-    message(STATUS "You will need to inject an encryption implementation before making any http requests!")
-elseif (PLATFORM_ANDROID AND ANDROID_BUILD_OPENSSL)
-    set(BUILD_OPENSSL 1)
-    set(CRYPTO_TARGET_NAME "crypto")
-    set(USE_OPENSSL ON)
-    message(STATUS "  Building Openssl as part of AWS SDK")
+endif()
+
+if(ENABLE_BCRYPT_ENCRYPTION)
+    add_definitions(-DENABLE_BCRYPT_ENCRYPTION)
+    set(CRYPTO_LIBS Bcrypt)
+    set(CRYPTO_LIBS_ABSTRACT_NAME Bcrypt)
+    message(STATUS "Encryption: Bcrypt")
+elseif(ENABLE_OPENSSL_ENCRYPTION)
+    add_definitions(-DENABLE_OPENSSL_ENCRYPTION)
+    message(STATUS "Encryption: LibCrypto")
+
+    set(CRYPTO_TARGET_NAME "AWS::crypto")
+    if(PLATFORM_ANDROID AND ANDROID_BUILD_OPENSSL)
+        set(BUILD_OPENSSL 1)
+        set(CRYPTO_TARGET_NAME "crypto")
+        set(USE_OPENSSL ON)
+        message(STATUS "  Building Openssl as part of AWS SDK")
+    else()
+        find_package(crypto REQUIRED)
+    endif()
     set(CRYPTO_LIBS ${CRYPTO_TARGET_NAME} ${ZLIB_LIBRARIES})
+    # ssl depends on libcrypto
     set(CRYPTO_LIBS_ABSTRACT_NAME ${CRYPTO_TARGET_NAME} ssl z)
+elseif(ENABLE_COMMONCRYPTO_ENCRYPTION)
+    add_definitions(-DENABLE_COMMONCRYPTO_ENCRYPTION)
+    message(STATUS "Encryption: CommonCrypto")
+elseif(ENABLE_INJECTED_ENCRYPTION)
+    message(STATUS "Encryption: None")
+    message(STATUS "You will need to inject an encryption implementation before making any http requests!")
 endif()
 
+
 # Http client control
 if(NOT NO_HTTP_CLIENT AND NOT USE_CRT_HTTP_CLIENT)
     if(PLATFORM_WINDOWS)

diff --git a/src/aws-cpp-sdk-core/CMakeLists.txt b/src/aws-cpp-sdk-core/CMakeLists.txt
@@ -593,6 +593,10 @@ if(BUILD_CURL)
     target_include_directories(${PROJECT_NAME} PRIVATE "${CURL_INCLUDE_DIR}")
 endif()
 
+if(BUILD_OPENSSL)
+    target_include_directories(${PROJECT_NAME} PRIVATE "${OPENSSL_INCLUDE_DIR}")
+endif()
+
 if (BUILD_OPTEL)
     target_include_directories(${PROJECT_NAME} PRIVATE ${OPENTELEMETRY_CPP_INCLUDE_DIRS})
 endif ()

diff --git a/tests/aws-cpp-sdk-core-tests/utils/crypto/SymmetricCiphersTest.cpp b/tests/aws-cpp-sdk-core-tests/utils/crypto/SymmetricCiphersTest.cpp
@@ -12,9 +12,6 @@
 #include <aws/core/utils/StringUtils.h>
 #include <aws/core/utils/memory/stl/AWSStringStream.h>
 #include <aws/core/utils/crypto/CryptoStream.h>
-#ifdef ENABLE_COMMONCRYPTO_ENCRYPTION
-#include <aws/core/utils/crypto/commoncrypto/CryptoImpl.h>
-#endif
 
 using namespace Aws::Utils;
 using namespace Aws::Utils::Crypto;