From 7b70ee6efc592fbb99838de3e917049483be5cb3 Mon Sep 17 00:00:00 2001 From: Dengke Date: Thu, 10 Oct 2024 18:04:46 +0000 Subject: [PATCH 01/11] s2n fix --- crt/aws-c-io | 2 +- crt/s2n | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/crt/aws-c-io b/crt/aws-c-io index 878b4fa0..8f85d226 160000 --- a/crt/aws-c-io +++ b/crt/aws-c-io @@ -1 +1 @@ -Subproject commit 878b4fa027bda4041493f06e0562d5e98bb3deb8 +Subproject commit 8f85d22662c9eefadd2ad683d29206a82970aa07 diff --git a/crt/s2n b/crt/s2n index 114ccab0..ffe0bf42 160000 --- a/crt/s2n +++ b/crt/s2n @@ -1 +1 @@ -Subproject commit 114ccab0ff2cde491203ac841837d0d39b767412 +Subproject commit ffe0bf42da8f139eff8fd2237f47fbde40b478fb From 24c5385997853ded030ec6212420842c34712ef4 Mon Sep 17 00:00:00 2001 From: Dengke Date: Thu, 10 Oct 2024 11:24:50 -0700 Subject: [PATCH 02/11] zero it out --- source/io.c | 1 + 1 file changed, 1 insertion(+) diff --git a/source/io.c b/source/io.c index 8661a4ce..f5aafd6f 100644 --- 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) { From f8030e0d994af8a7decf6855b98d879daf1cf529 Mon Sep 17 00:00:00 2001 From: Dengke Date: Thu, 10 Oct 2024 11:50:21 -0700 Subject: [PATCH 03/11] latest submodules --- crt/aws-c-auth | 2 +- crt/aws-c-cal | 2 +- crt/aws-c-common | 2 +- crt/aws-c-compression | 2 +- crt/aws-c-event-stream | 2 +- crt/aws-c-http | 2 +- crt/aws-c-io | 2 +- crt/aws-c-mqtt | 2 +- crt/aws-c-sdkutils | 2 +- crt/aws-lc | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/crt/aws-c-auth b/crt/aws-c-auth index 53a31bac..48d647bf 160000 --- a/crt/aws-c-auth +++ b/crt/aws-c-auth @@ -1 +1 @@ -Subproject commit 53a31bacf2918e848e00b052d2e25cba0be069d9 +Subproject commit 48d647bf43f8872e4dc5ec6343b0c5974195fbdd diff --git a/crt/aws-c-cal b/crt/aws-c-cal index 77ca3aea..2cb1d2ea 160000 --- a/crt/aws-c-cal +++ b/crt/aws-c-cal @@ -1 +1 @@ -Subproject commit 77ca3aea879bc768082fe7ec715adcde8e98c332 +Subproject commit 2cb1d2eac925e2dbc45025eb89af82bd790c23a0 diff --git a/crt/aws-c-common b/crt/aws-c-common index 8419fe70..b9959f59 160000 --- a/crt/aws-c-common +++ b/crt/aws-c-common @@ -1 +1 @@ -Subproject commit 8419fe7077778b5ca40e8822f969665bbddc226c +Subproject commit b9959f5922a4b969beab8f0b99aa0b34bc9ee55c diff --git a/crt/aws-c-compression b/crt/aws-c-compression index ea1d421a..f36d0167 160000 --- a/crt/aws-c-compression +++ b/crt/aws-c-compression @@ -1 +1 @@ -Subproject commit ea1d421a421ad83a540309a94c38d50b6a5d836b +Subproject commit f36d01672d61e49d96a777870d456f66fa391cd4 diff --git a/crt/aws-c-event-stream b/crt/aws-c-event-stream index 1a70c50f..1b3825fc 160000 --- a/crt/aws-c-event-stream +++ b/crt/aws-c-event-stream @@ -1 +1 @@ -Subproject commit 1a70c50f78a6e706f1f91a4ed138478271b6d9d3 +Subproject commit 1b3825fc9cae2e9c7ed7479ee5d354d52ebdf7a0 diff --git a/crt/aws-c-http b/crt/aws-c-http index d83f8d70..6068653e 160000 --- a/crt/aws-c-http +++ b/crt/aws-c-http @@ -1 +1 @@ -Subproject commit d83f8d70143ddce5ab4e479175fbd44ba994211b +Subproject commit 6068653e1d582bd8e7d1c9f81f86beaf10444e3d diff --git a/crt/aws-c-io b/crt/aws-c-io index 8f85d226..dc41ddc4 160000 --- a/crt/aws-c-io +++ b/crt/aws-c-io @@ -1 +1 @@ -Subproject commit 8f85d22662c9eefadd2ad683d29206a82970aa07 +Subproject commit dc41ddc498c10ebbf69aba7775afa36c8c1910bd diff --git a/crt/aws-c-mqtt b/crt/aws-c-mqtt index ed7bbd68..77d6f00e 160000 --- a/crt/aws-c-mqtt +++ b/crt/aws-c-mqtt @@ -1 +1 @@ -Subproject commit ed7bbd68c03d7022c915a2924740ab7992ad2311 +Subproject commit 77d6f00e89b10e3263d8a17576ec8e91c45b4606 diff --git a/crt/aws-c-sdkutils b/crt/aws-c-sdkutils index 8c7af71f..4658412a 160000 --- a/crt/aws-c-sdkutils +++ b/crt/aws-c-sdkutils @@ -1 +1 @@ -Subproject commit 8c7af71f91ed5b9d2a043d51f120495f43723f80 +Subproject commit 4658412a61ad5749db92a8d1e0717cb5e76ada1c diff --git a/crt/aws-lc b/crt/aws-lc index 4e54dd83..8b2ebfcf 160000 --- a/crt/aws-lc +++ b/crt/aws-lc @@ -1 +1 @@ -Subproject commit 4e54dd8363396f257d7a2317c48101e18170e6fb +Subproject commit 8b2ebfcf3fc8b0656f1f4161166484a70238aeaa From ebedf4bd8511cc1de355c9982a6ff705a8d1d545 Mon Sep 17 00:00:00 2001 From: Dengke Date: Thu, 10 Oct 2024 11:51:06 -0700 Subject: [PATCH 04/11] adn prebuild --- CMakeLists.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 30224fa1..c783204b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,7 +55,14 @@ if (BUILD_DEPS) -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}/s2n + CMAKE_ARGUMENTS + -DUNSAFE_TREAT_WARNINGS_AS_ERRORS=OFF + -DBUILD_TESTING=OFF + ) endif() add_subdirectory(crt/aws-c-sdkutils) From 7a1918ba06c4c7f6437b1713b1e972e05e380492 Mon Sep 17 00:00:00 2001 From: Dengke Date: Thu, 10 Oct 2024 11:52:16 -0700 Subject: [PATCH 05/11] remove unused --- CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c783204b..13f866e5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,7 +54,6 @@ if (BUILD_DEPS) -DBUILD_LIBSSL=OFF -DBUILD_TESTING=OFF ) - set(UNSAFE_TREAT_WARNINGS_AS_ERRORS OFF) # prebuild s2n-tls. aws_prebuild_dependency( DEPENDENCY_NAME S2N From 08a52c0a328e3e8689f7fe299a63dda12cf070df Mon Sep 17 00:00:00 2001 From: Dengke Date: Thu, 10 Oct 2024 11:59:10 -0700 Subject: [PATCH 06/11] update --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 13f866e5..66464c9c 100644 --- 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 From 8a358711f4096f1f7b0903f435c54f1802f9b09e Mon Sep 17 00:00:00 2001 From: Dengke Date: Thu, 10 Oct 2024 12:03:15 -0700 Subject: [PATCH 07/11] same wrong directory --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 66464c9c..f7ee45e9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,7 +57,7 @@ if (BUILD_DEPS) # prebuild s2n-tls. aws_prebuild_dependency( DEPENDENCY_NAME S2N - SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/s2n + SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/crt/s2n CMAKE_ARGUMENTS -DUNSAFE_TREAT_WARNINGS_AS_ERRORS=OFF -DBUILD_TESTING=OFF From c36a90f5e3f9a8f4fe5e07483c97db10859584b9 Mon Sep 17 00:00:00 2001 From: Dengke Date: Thu, 10 Oct 2024 21:04:47 +0000 Subject: [PATCH 08/11] you don't need to set a relative path as the prefix path --- scripts/build_dependencies/build_step_cmake.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/build_dependencies/build_step_cmake.js b/scripts/build_dependencies/build_step_cmake.js index 663244c2..22fff79c 100644 --- a/scripts/build_dependencies/build_step_cmake.js +++ b/scripts/build_dependencies/build_step_cmake.js @@ -81,8 +81,6 @@ module.exports = { CMAKE_EXPORT_COMPILE_COMMANDS: true, CMAKE_JS_PLATFORM: platform, BUILD_TESTING: 'OFF', - CMAKE_INSTALL_PREFIX: 'crt/install', - CMAKE_PREFIX_PATH: 'crt/install', } } From 8200bd881a9706d785d525a7cd44d7438fe91dd1 Mon Sep 17 00:00:00 2001 From: Dengke Date: Thu, 10 Oct 2024 14:18:33 -0700 Subject: [PATCH 09/11] increase size --- .builder/actions/crt_size_check.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.builder/actions/crt_size_check.py b/.builder/actions/crt_size_check.py index 75bf5526..2caddcf1 100644 --- 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 @@ -74,4 +74,5 @@ def run(self, env): print(f"Total NPM package file size: {total_size} bytes") if total_size > max_size: - raise Exception(f'NPM package exceeds size limit of {max_size} bytes.') + raise Exception(f'NPM package exceeds size limit of { + max_size} bytes.') From 327cb5fe6204254844eef430c8a0b77fc2889963 Mon Sep 17 00:00:00 2001 From: Dengke Date: Thu, 10 Oct 2024 14:35:30 -0700 Subject: [PATCH 10/11] why --- .builder/actions/crt_size_check.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.builder/actions/crt_size_check.py b/.builder/actions/crt_size_check.py index 2caddcf1..b9c363a4 100644 --- a/.builder/actions/crt_size_check.py +++ b/.builder/actions/crt_size_check.py @@ -74,5 +74,4 @@ def run(self, env): print(f"Total NPM package file size: {total_size} bytes") if total_size > max_size: - raise Exception(f'NPM package exceeds size limit of { - max_size} bytes.') + raise Exception(f'NPM package exceeds size limit of {max_size} bytes.') From ead79f40267c630643adea90ddeaf294ad7dce99 Mon Sep 17 00:00:00 2001 From: Dengke Date: Fri, 11 Oct 2024 15:22:53 -0700 Subject: [PATCH 11/11] less change --- crt/aws-c-common | 2 +- scripts/build_dependencies/build_step_cmake.js | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/crt/aws-c-common b/crt/aws-c-common index b9959f59..f8c5d8e5 160000 --- a/crt/aws-c-common +++ b/crt/aws-c-common @@ -1 +1 @@ -Subproject commit b9959f5922a4b969beab8f0b99aa0b34bc9ee55c +Subproject commit f8c5d8e5134fa97955351a44f16b84f96de24045 diff --git a/scripts/build_dependencies/build_step_cmake.js b/scripts/build_dependencies/build_step_cmake.js index 22fff79c..663244c2 100644 --- a/scripts/build_dependencies/build_step_cmake.js +++ b/scripts/build_dependencies/build_step_cmake.js @@ -81,6 +81,8 @@ module.exports = { CMAKE_EXPORT_COMPILE_COMMANDS: true, CMAKE_JS_PLATFORM: platform, BUILD_TESTING: 'OFF', + CMAKE_INSTALL_PREFIX: 'crt/install', + CMAKE_PREFIX_PATH: 'crt/install', } }