Prebuild S2N (#584)

awslabs · Oct 18, 2024 · e13621e · e13621e
1 parent 83d197d
commit e13621e
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 15 deletions.
diff --git a/.builder/actions/crt_size_check.py b/.builder/actions/crt_size_check.py
@@ -11,7 +11,7 @@ def run(self, env):
         # Maximum package size (for current platform) in bytes
         # NOTE: if you increase this, you might also need to increase the
         # limit in continuous-delivery/pack.sh
-        max_size = 7_500_000
+        max_size = 8_000_000
         # size of current folder
         folder_size = 0
         # total size in bytes

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -45,7 +45,7 @@ if (BUILD_DEPS)
     if (UNIX AND NOT APPLE)
         include(AwsPrebuildDependency)
         # s2n-tls uses libcrypto during its configuration, so we need to prebuild aws-lc.
-        prebuild_dependency(
+        aws_prebuild_dependency(
             DEPENDENCY_NAME AWSLC
             SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/crt/aws-lc
             CMAKE_ARGUMENTS
@@ -54,8 +54,14 @@ if (BUILD_DEPS)
                 -DBUILD_LIBSSL=OFF
                 -DBUILD_TESTING=OFF
         )
-        set(UNSAFE_TREAT_WARNINGS_AS_ERRORS OFF)
-        add_subdirectory(crt/s2n)
+        # 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-sdkutils)

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-event-stream b/crt/aws-c-event-stream
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-mqtt b/crt/aws-c-mqtt
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/source/io.c b/source/io.c
@@ -770,6 +770,7 @@ napi_value aws_napi_io_socket_options_new(napi_env env, napi_callback_info info)
     }
 
     struct aws_socket_options options;
+    AWS_ZERO_STRUCT(options);
 
     uint32_t enum_value = 0;
     if (napi_get_value_uint32(env, node_args[0], &enum_value) || enum_value > AWS_SOCKET_DGRAM) {
+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
+2 −2		.github/workflows/proof_ci_resources/config.yaml
+19 −4		cmake/AwsCheckHeaders.cmake
+11 −7		cmake/AwsPrebuildDependency.cmake
+9 −2		cmake/AwsSIMD.cmake
+1 −1		include/aws/common/array_list.inl
+8 −1		include/aws/common/math.inl
+212 −183		verification/cbmc/proofs/Makefile.common
+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
+12 −3		.github/workflows/ci.yml
+4 −8		.github/workflows/clang-format.yml
+7 −4		.github/workflows/stale_issue.yml
+47 −0		format-check.py
+0 −24		format-check.sh
+4 −2		include/aws/event-stream/event_stream.h
+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
+13 −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
+93 −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
+19 −0		source/windows/iocp/socket.c
+275 −206		source/windows/secure_channel_tls_handler.c
+4 −0		tests/CMakeLists.txt
+1 −1		tests/socket_handler_test.c
+82 −7		tests/socket_test.c
+368 −128		tests/tls_handler_test.c