Update deps fix cmake templates (#94)

* Updated dependencies to latest, fixed cmake template files. * Don't need the finder module updates anymore. * Update aws-c-io for new libcrypto dependency mess, and pull in some minor bug fixes from s2n. * Make sure tests don't get built accidentally this time.
awslabs · Jan 29, 2020 · 102015e · 102015e
1 parent 1f045a1
commit 102015e
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 13 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -46,13 +46,11 @@ if (BUILD_DEPS)
     include(AwsFindPackage)
 
     set(IN_SOURCE_BUILD ON)
-    set(BUILD_TESTING_PREV BUILD_TESTING)
+    set(BUILD_TESTING_PREV ${BUILD_TESTING})
     set(BUILD_TESTING OFF)
     add_subdirectory(aws-common-runtime/aws-c-common)
 
     if (UNIX AND NOT APPLE)
-        list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/aws-common-runtime/s2n/cmake/modules")
-        find_package(LibCrypto REQUIRED)
         add_subdirectory(aws-common-runtime/s2n)
     endif()
 
@@ -62,7 +60,7 @@ if (BUILD_DEPS)
     add_subdirectory(aws-common-runtime/aws-c-http)
     add_subdirectory(aws-common-runtime/aws-c-auth)
     add_subdirectory(aws-common-runtime/aws-c-mqtt)
-    set(BUILD_TESTING BUILD_TESTING_PREV)
+    set(BUILD_TESTING ${BUILD_TESTING_PREV})
 else()
     include(AwsFindPackage)
     set(IN_SOURCE_BUILD OFF)
@@ -210,6 +208,9 @@ aws_use_package(aws-c-http)
 aws_use_package(aws-c-mqtt)
 aws_use_package(aws-c-cal)
 aws_use_package(aws-c-auth)
+aws_use_package(aws-c-common)
+aws_use_package(aws-c-io)
+
 target_link_libraries(${PROJECT_NAME} ${DEP_AWS_LIBS})
 
 install(FILES ${AWS_CRT_HEADERS} DESTINATION "include/aws/crt" COMPONENT Development)

diff --git a/aws-common-runtime/aws-c-auth b/aws-common-runtime/aws-c-auth
diff --git a/aws-common-runtime/aws-c-cal b/aws-common-runtime/aws-c-cal
diff --git a/aws-common-runtime/aws-c-common b/aws-common-runtime/aws-c-common
diff --git a/aws-common-runtime/aws-c-compression b/aws-common-runtime/aws-c-compression
diff --git a/aws-common-runtime/aws-c-http b/aws-common-runtime/aws-c-http
diff --git a/aws-common-runtime/aws-c-io b/aws-common-runtime/aws-c-io
diff --git a/aws-common-runtime/aws-c-mqtt b/aws-common-runtime/aws-c-mqtt
diff --git a/aws-common-runtime/s2n b/aws-common-runtime/s2n
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -21,7 +21,7 @@ add_test_case(SHA256ResourceSafety)
 add_test_case(MD5ResourceSafety)
 add_test_case(SHA256HMACResourceSafety)
 add_net_test_case(HttpDownloadNoBackPressure)
-add_test_case(IotPublishSubscribe)
+add_net_test_case(IotPublishSubscribe)
 add_net_test_case(HttpClientConnectionManagerResourceSafety)
 add_net_test_case(HttpClientConnectionWithPendingAcquisitions)
 add_net_test_case(HttpClientConnectionWithPendingAcquisitionsAndClosedConnections)
+2 −2		cmake/aws-c-auth-config.cmake
+2 −0		tests/credentials_tests.c
+6 −5		CMakeLists.txt
+2 −2		cmake/aws-c-cal-config.cmake
+35 −0		include/aws/cal/cal.h
+165 −0		include/aws/cal/ecc.h
+228 −0		include/aws/cal/private/der.h
+35 −0		include/aws/cal/private/ecc.h
+68 −0		source/cal.c
+0 −0		source/darwin/commoncrypto_hmac.c
+0 −0		source/darwin/commoncrypto_md5.c
+0 −0		source/darwin/commoncrypto_sha256.c
+599 −0		source/darwin/securityframework_ecc.c
+511 −0		source/der.c
+221 −0		source/ecc.c
+381 −0		source/unix/opensslcrypto_ecc.c
+0 −0		source/unix/opensslcrypto_hash.c
+0 −0		source/unix/opensslcrypto_hmac.c
+470 −0		source/windows/bcrypt_ecc.c
+0 −0		source/windows/bcrypt_hash.c
+0 −0		source/windows/bcrypt_hmac.c
+32 −0		tests/CMakeLists.txt
+517 −0		tests/der_test.c
+659 −0		tests/ecc_test.c
+20 −0		.github/workflows/clang-tsan.yml
+2 −2		codebuild/builder.py
+4 −3		docker-images/ubuntu-16.04-x64/Dockerfile
+3 −2		include/aws/common/allocator.h
+3 −2		include/aws/common/condition_variable.h
+4 −0		include/aws/common/math.gcc_x64_asm.inl
+4 −3		include/aws/common/mutex.h
+3 −1		include/aws/testing/aws_test_harness.h
+88 −70		source/memtrace.c
+21 −1		source/posix/condition_variable.c
+10 −4		source/posix/mutex.c
+14 −8		source/windows/condition_variable.c
+11 −4		source/windows/mutex.c
+7 −1		tests/CMakeLists.txt
+24 −9		tests/byte_order_test.c
+2 −0		tests/ring_buffer_test.c
+1 −0		.gitignore
+2 −2		cmake/aws-c-http-config.cmake
+6 −0		include/aws/http/http.h
+26 −3		include/aws/http/private/h2_connection.h
+9 −4		include/aws/http/private/h2_decoder.h
+6 −5		include/aws/http/private/h2_frames.h
+16 −2		include/aws/http/private/h2_stream.h
+30 −5		include/aws/http/private/hpack.h
+11 −5		source/h1_connection.c
+390 −32		source/h2_connection.c
+676 −192		source/h2_decoder.c
+51 −39		source/h2_frames.c
+22 −36		source/h2_stream.c
+391 −166		source/hpack.c
+11 −0		source/http.c
+3 −0		tests/CMakeLists.txt
+354 −0		tests/fuzz/fuzz_h2_decoder_correct.c
+4 −3		tests/fuzz/fuzz_h2_decoder_random.c
+102 −0		tests/test_h2_client.c
+0 −4		tests/test_h2_frames.c
+0 −4		tests/test_h2_headers.c
+71 −20		tests/test_hpack.c
+26 −0		.github/workflows/clang-tsan.yml
+6 −1		CMakeLists.txt
+1 −0		cmake/aws-c-io-config.cmake
+97 −0		cmake/modules/FindLibCrypto.cmake
+13 −12		source/host_resolver.c
+107 −86		tests/channel_test.c
+6 −6		tests/event_loop_test.c
+8 −7		tests/read_write_test_handler.c
+12 −8		tests/socket_handler_test.c
+6 −3		tests/tls_handler_test.c