Merge branch 'main' into latest-submodules-prebuild

awslabs · Oct 18, 2024 · 2414eda · 2414eda
2 parents 0bc54d6 + e13621e
commit 2414eda
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 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/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) {