Merge branch 'main' into crc62

awslabs · Oct 21, 2024 · dfa1216 · dfa1216
2 parents 44fd84b + 37e50ac
commit dfa1216
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 14 deletions.
diff --git a/crt/aws-c-auth b/crt/aws-c-auth
diff --git a/crt/aws-c-cal b/crt/aws-c-cal
diff --git a/crt/aws-c-common b/crt/aws-c-common
diff --git a/crt/aws-c-compression b/crt/aws-c-compression
diff --git a/crt/aws-c-http b/crt/aws-c-http
diff --git a/crt/aws-c-io b/crt/aws-c-io
diff --git a/crt/aws-c-sdkutils b/crt/aws-c-sdkutils
diff --git a/crt/aws-lc b/crt/aws-lc
diff --git a/crt/s2n b/crt/s2n
diff --git a/native/CMakeLists.txt b/native/CMakeLists.txt
@@ -51,12 +51,35 @@ if (BUILD_DEPS)
     set(BUILD_TESTING OFF)
     add_subdirectory(../crt/aws-c-common ${CMAKE_BINARY_DIR}/deps/aws-c-common)
     if (UNIX AND NOT APPLE)
-        set(DISABLE_PERL ON CACHE BOOL "Disable Perl for AWS-LC.")
-        set(DISABLE_GO ON CACHE BOOL "Disable Go for AWS-LC.")
+        include(AwsPrebuildDependency)
         set(SEARCH_LIBCRYPTO OFF CACHE BOOL "libcrypto will come from aws-lc, don't look for it")
-        set(BUILD_LIBSSL OFF)
-        add_subdirectory(../crt/aws-lc ${CMAKE_BINARY_DIR}/deps/aws-lc)
-        add_subdirectory(../crt/s2n ${CMAKE_BINARY_DIR}/deps/s2n)
+        set(AWSLC_CMAKE_ARGUMENTS
+                -DDISABLE_GO=ON  # Build without using Go, we don't want the extra dependency
+                -DDISABLE_PERL=ON  # Build without using Perl, we don't want the extra dependency
+                -DBUILD_LIBSSL=OFF  # Don't need libssl, only need libcrypto
+                -DBUILD_TESTING=OFF
+            )
+        if(CMAKE_C_COMPILER_ID MATCHES "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_LESS "5.0")
+            # Disable AVX512 on old GCC that not supports it.
+            list(APPEND AWSLC_CMAKE_ARGUMENTS -DMY_ASSEMBLER_IS_TOO_OLD_FOR_512AVX=ON)
+        endif()
+
+        # s2n-tls uses libcrypto during its configuration, so we need to prebuild aws-lc.
+        aws_prebuild_dependency(
+                DEPENDENCY_NAME AWSLC
+                SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../crt/aws-lc
+                CMAKE_ARGUMENTS ${AWSLC_CMAKE_ARGUMENTS}
+            )
+
+        # prebuild s2n-tls.
+        aws_prebuild_dependency(
+            DEPENDENCY_NAME S2N
+            SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../crt/s2n
+            CMAKE_ARGUMENTS
+                -DUNSAFE_TREAT_WARNINGS_AS_ERRORS=OFF
+                -DBUILD_TESTING=OFF
+        )
+
     endif()
     add_subdirectory(../crt/aws-c-io ${CMAKE_BINARY_DIR}/deps/aws-c-io)
     add_subdirectory(../crt/aws-c-sdkutils ${CMAKE_BINARY_DIR}/deps/sdkutils)
+15 −3		.github/workflows/ci.yml
+4 −6		.github/workflows/clang-format.yml
+1 −0		.gitignore
+47 −0		format-check.py
+0 −24		format-check.sh
+1 −0		include/aws/auth/auth.h
+15 −0		include/aws/auth/credentials.h
+8 −8		include/aws/auth/private/credentials_utils.h
+3 −0		source/auth.c
+25 −0		source/aws_signing.c
+3 −1		source/credentials_provider_cached.c
+1 −16		source/credentials_provider_default_chain.c
+104 −5		source/credentials_provider_ecs.c
+17 −2		source/credentials_provider_process.c
+44 −5		source/credentials_provider_profile.c
+37 −12		source/credentials_provider_sts.c
+1 −0		source/credentials_provider_sts_web_identity.c
+49 −7		source/credentials_utils.c
+17 −9		tests/CMakeLists.txt
+92 −17		tests/credentials_provider_ecs_tests.c
+75 −26		tests/credentials_provider_process_tests.c
+273 −108		tests/credentials_provider_sts_tests.c
+42 −0		tests/credentials_provider_sts_web_identity_tests.c
+58 −0		tests/credentials_utils_tests.c
+33 −6		.github/workflows/ci.yml
+4 −6		.github/workflows/clang-format.yml
+5 −1		CMakeLists.txt
+22 −1		builder.json
+47 −0		format-check.py
+0 −25		format-check.sh
+2 −2		include/aws/cal/private/symmetric_cipher_priv.h
+32 −26		include/aws/cal/symmetric_cipher.h
+1 −1		source/cal.c
+16 −15		source/darwin/commoncrypto_aes.c
+8 −10		source/ecc.c
+4 −4		source/rsa.c
+10 −8		source/symmetric_cipher.c
+38 −34		source/unix/openssl_aes.c
+117 −26		source/unix/openssl_platform_init.c
+150 −124		source/windows/bcrypt_aes.c
+3 −0		tests/CMakeLists.txt
+235 −13		tests/aes256_test.c
+46 −0		tests/der_test.c
+20 −13		tests/ecc_test.c
+5 −5		tests/md5_test.c
+16 −14		tests/rsa_test.c
+8 −8		tests/sha1_test.c
+5 −5		tests/sha256_hmac_test.c
+8 −8		tests/sha256_test.c
+35 −2		tests/test_case_helper.h
+11 −7		cmake/AwsPrebuildDependency.cmake
+2 −1		cmake/AwsSIMD.cmake
+9 −4		include/aws/common/condition_variable.h
+12 −3		.github/workflows/ci.yml
+4 −6		.github/workflows/clang-format.yml
+47 −0		format-check.py
+0 −24		format-check.sh
+1 −1		source/compression.c
+15 −5		.github/workflows/ci.yml
+4 −6		.github/workflows/clang-format.yml
+3 −0		.github/workflows/stale_issue.yml
+47 −0		format-check.py
+0 −24		format-check.sh
+4 −1		include/aws/http/connection.h
+29 −0		include/aws/http/connection_manager.h
+2 −0		include/aws/http/http.h
+14 −2		include/aws/http/private/h1_connection.h
+3 −1		include/aws/http/private/h2_frames.h
+7 −7		include/aws/http/proxy.h
+3 −1		include/aws/http/request_response.h
+9 −4		include/aws/http/server.h
+1 −1		integration-testing/http_client_test.py
+217 −48		source/connection_manager.c
+123 −23		source/h1_connection.c
+7 −1		source/http.c
+61 −59		source/websocket.c
+10 −0		tests/CMakeLists.txt
+0 −3		tests/test_connection.c
+179 −2		tests/test_connection_manager.c
+219 −5		tests/test_h1_client.c
+4 −1		tests/test_h2_client.c
+2 −1		tests/test_h2_encoder.c
+2 −1		tests/test_h2_headers.c
+4 −1		tests/test_localhost_integ.c
+4 −1		tests/test_message.c
+4 −1		tests/test_stream_manager.c
+135 −36		tests/test_tls.c
+35 −1		tests/test_websocket_handler.c
+40 −5		.github/workflows/ci.yml
+4 −6		.github/workflows/clang-format.yml
+15 −8		CMakeLists.txt
+47 −0		format-check.py
+0 −24		format-check.sh
+2 −2		include/aws/io/channel.h
+3 −4		include/aws/io/channel_bootstrap.h
+3 −4		include/aws/io/event_loop.h
+6 −0		include/aws/io/private/tls_channel_handler_shared.h
+18 −0		include/aws/io/socket.h
+4 −5		include/aws/io/tls_channel_handler.h
+13 −20		source/channel.c
+126 −60		source/darwin/secure_transport_tls_channel_handler.c
+1 −1		source/io.c
+2 −5		source/message_pool.c
+101 −3		source/posix/socket.c
+125 −59		source/s2n/s2n_tls_channel_handler.c
+1 −7		source/socket_channel_handler.c
+1 −1		source/windows/iocp/iocp_event_loop.c
+25 −0		source/windows/iocp/socket.c
+275 −206		source/windows/secure_channel_tls_handler.c
+24 −0		source/windows/windows_pki_utils.c
+6 −0		tests/CMakeLists.txt
+1 −1		tests/socket_handler_test.c
+96 −7		tests/socket_test.c
+404 −128		tests/tls_handler_test.c