Fixed incorrect usage of BUILD_SHARED_LIBS and pointed S2N at private… (

#71) * Fixed incorrect usage of BUILD_SHARED_LIBS * Pointed at official s2n repo after merge of libcrypto fixes * Removed unused s2n config flag
awslabs · Jul 15, 2019 · c2c8d04 · c2c8d04
1 parent 05799ed
commit c2c8d04
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 10 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -191,10 +191,6 @@ find_package(aws-c-http REQUIRED)
 target_link_libraries(${CMAKE_PROJECT_NAME} AWS::aws-c-http)
 
 if (UNIX AND NOT APPLE)
-    find_library(LIBCRYPTO_STATIC 
-                NAMES libcrypto.a
-                PATHS ${AWS_DEPS_INSTALL_DIR}/${CMAKE_INSTALL_LIBDIR}
-                NO_DEFAULT_PATH)
-    message(STATUS "LIBCRYPTO_STATIC: ${LIBCRYPTO_STATIC}")
-    target_link_libraries(${CMAKE_PROJECT_NAME} ${LIBCRYPTO_STATIC})
+    message(STATUS "Linking libcrypto: ${LibCrypto_STATIC_LIBRARY}")
+    target_link_libraries(${CMAKE_PROJECT_NAME} ${LibCrypto_STATIC_LIBRARY})
 endif()
diff --git a/aws-common-runtime/CMakeLists.txt b/aws-common-runtime/CMakeLists.txt
@@ -25,7 +25,7 @@ if (UNIX AND NOT APPLE)
     include(BuildOpenSSL)
 
     set(S2N_URL "https://github.com/awslabs/s2n.git")
-    set(S2N_SHA "db4fe111c6e64a206662524da31a5aba6b0932a8")
+    set(S2N_SHA "b159c3e1b86509e628638ef185748b253b4c9f35")
     include(BuildS2N)
 endif()
 

diff --git a/aws-common-runtime/cmake/BuildS2N.cmake b/aws-common-runtime/cmake/BuildS2N.cmake
@@ -20,7 +20,6 @@ if("${TARGET_ARCH}" STREQUAL ANDROID)
             -DENABLE_HW_OPTIMIZATION=OFF
             -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
             -DBUILD_TESTING=OFF
-            -DUSE_S2N_PQ_CRYPTO=OFF
             )
 else()
     ExternalProject_Add(S2N
@@ -37,6 +36,5 @@ else()
             -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
             -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
             -DBUILD_TESTING=OFF
-            -DUSE_S2N_PQ_CRYPTO=OFF
             )
 endif()
diff --git a/pom.xml b/pom.xml
@@ -182,7 +182,6 @@
                                     <arguments>
                                         <argument>-G${cmake.generator}</argument>
                                         <argument>-DCMAKE_BUILD_TYPE=${cmake.buildtype}</argument>
-                                        <argument>-DBUILD_SHARED_LIBS=ON</argument>
                                         <argument>-DCMAKE_EXPORT_COMPILE_COMMANDS=ON</argument>
                                         <argument>-DBUILD_DEPS=ON</argument>
                                         <argument>-DCMAKE_C_FLAGS=${cmake.cflags}</argument>