Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prebuild s2n & aws-lc #107

Merged
merged 4 commits into from
Oct 18, 2024
Merged

Prebuild s2n & aws-lc #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0123b26
try prebuild
waahm7 Oct 16, 2024
a88007d
try lowercase
waahm7 Oct 16, 2024
d1cbb19
parent dir
waahm7 Oct 16, 2024
38849d8
latest submodules
waahm7 Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crt/aws-c-auth
Open in desktop
Submodule aws-c-auth updated 24 files
+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 changes: 1 addition & 1 deletion crt/aws-c-cal
Open in desktop
Submodule aws-c-cal updated 26 files
+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
2 changes: 1 addition & 1 deletion crt/aws-c-common
Open in desktop
Submodule aws-c-common updated 95 files
+1 −1 .clang-tidy
+17 −8 .github/workflows/ci.yml
+4 −7 .github/workflows/clang-format.yml
+6 −5 .github/workflows/proof_ci_resources/config.yaml
+10 −1 CMakeLists.txt
+2 −1 README.md
+26 −0 THIRD-PARTY-LICENSES.txt
+19 −4 cmake/AwsCheckHeaders.cmake
+77 −0 cmake/AwsPrebuildDependency.cmake
+9 −2 cmake/AwsSIMD.cmake
+6 −4 cmake/AwsSanitizers.cmake
+47 −0 format-check.py
+0 −24 format-check.sh
+1 −1 include/aws/common/array_list.inl
+2 −4 include/aws/common/atomics.h
+1 −1 include/aws/common/byte_buf.h
+449 −0 include/aws/common/cbor.h
+11 −8 include/aws/common/condition_variable.h
+7 −2 include/aws/common/error.h
+68 −1 include/aws/common/json.h
+3 −2 include/aws/common/logging.h
+19 −1 include/aws/common/macros.h
+8 −1 include/aws/common/math.inl
+2 −4 include/aws/common/mutex.h
+19 −0 include/aws/common/private/byte_buf.h
+7 −3 include/aws/common/private/external_module_impl.h
+2 −4 include/aws/common/rw_lock.h
+1 −1 include/aws/common/statistics.h
+1 −2 include/aws/common/thread.h
+129 −0 scripts/import_libcbor.py
+8 −3 scripts/latest_submodules.py
+1 −1 source/allocator.c
+3 −1 source/android/logging.c
+19 −0 source/byte_buf.c
+647 −0 source/cbor.c
+12 −2 source/common.c
+19 −0 source/external/libcbor/allocators.c
+425 −0 source/external/libcbor/cbor.c
+74 −0 source/external/libcbor/cbor.h
+131 −0 source/external/libcbor/cbor/arrays.c
+137 −0 source/external/libcbor/cbor/arrays.h
+119 −0 source/external/libcbor/cbor/bytestrings.c
+150 −0 source/external/libcbor/cbor/bytestrings.h
+121 −0 source/external/libcbor/cbor/callbacks.c
+189 −0 source/external/libcbor/cbor/callbacks.h
+14 −0 source/external/libcbor/cbor/cbor_export.h
+163 −0 source/external/libcbor/cbor/common.c
+339 −0 source/external/libcbor/cbor/common.h
+46 −0 source/external/libcbor/cbor/configuration.h
+264 −0 source/external/libcbor/cbor/data.h
+200 −0 source/external/libcbor/cbor/encoding.c
+140 −0 source/external/libcbor/cbor/encoding.h
+189 −0 source/external/libcbor/cbor/floats_ctrls.c
+240 −0 source/external/libcbor/cbor/floats_ctrls.h
+422 −0 source/external/libcbor/cbor/internal/builder_callbacks.c
+85 −0 source/external/libcbor/cbor/internal/builder_callbacks.h
+98 −0 source/external/libcbor/cbor/internal/encoders.c
+41 −0 source/external/libcbor/cbor/internal/encoders.h
+80 −0 source/external/libcbor/cbor/internal/loaders.c
+43 −0 source/external/libcbor/cbor/internal/loaders.h
+57 −0 source/external/libcbor/cbor/internal/memory_utils.c
+50 −0 source/external/libcbor/cbor/internal/memory_utils.h
+33 −0 source/external/libcbor/cbor/internal/stack.c
+53 −0 source/external/libcbor/cbor/internal/stack.h
+95 −0 source/external/libcbor/cbor/internal/unicode.c
+33 −0 source/external/libcbor/cbor/internal/unicode.h
+190 −0 source/external/libcbor/cbor/ints.c
+211 −0 source/external/libcbor/cbor/ints.h
+125 −0 source/external/libcbor/cbor/maps.c
+121 −0 source/external/libcbor/cbor/maps.h
+368 −0 source/external/libcbor/cbor/serialization.c
+168 −0 source/external/libcbor/cbor/serialization.h
+600 −0 source/external/libcbor/cbor/streaming.c
+37 −0 source/external/libcbor/cbor/streaming.h
+142 −0 source/external/libcbor/cbor/strings.c
+183 −0 source/external/libcbor/cbor/strings.h
+46 −0 source/external/libcbor/cbor/tags.c
+74 −0 source/external/libcbor/cbor/tags.h
+51 −42 source/json.c
+1 −1 source/posix/clock.c
+19 −0 source/posix/thread.c
+1 −1 source/priority_queue.c
+2 −18 source/windows/device_random.c
+1 −0 source/windows/thread.c
+11 −0 tests/CMakeLists.txt
+2 −0 tests/assert_test.c
+58 −1 tests/byte_buf_test.c
+489 −0 tests/cbor_test.c
+18 −14 tests/condition_variable_test.c
+9 −7 tests/error_test.c
+87 −0 tests/fuzz/cbor_decoding_transitive.c
+66 −0 tests/fuzz/cbor_double_encode_decode.c
+12 −7 tests/json_test.c
+212 −184 verification/cbmc/proofs/Makefile.common
+4 −1 verification/cbmc/sources/utils.c
2 changes: 1 addition & 1 deletion crt/aws-c-compression
Open in desktop
Submodule aws-c-compression updated 5 files
+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
2 changes: 1 addition & 1 deletion crt/aws-c-http
Open in desktop
Submodule aws-c-http updated 30 files
+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
2 changes: 1 addition & 1 deletion crt/aws-c-io
Open in desktop
Submodule aws-c-io updated 26 files
+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
2 changes: 1 addition & 1 deletion crt/aws-c-sdkutils
Open in desktop
Submodule aws-c-sdkutils updated 15 files
+12 −3 .github/workflows/ci.yml
+4 −6 .github/workflows/clang-format.yml
+47 −0 format-check.py
+0 −24 format-check.sh
+18 −2 include/aws/sdkutils/endpoints_rule_engine.h
+30 −31 include/aws/sdkutils/private/endpoints_types_impl.h
+59 −27 source/endpoints_rule_engine.c
+67 −50 source/endpoints_ruleset.c
+2 −1 source/endpoints_standard_lib.c
+36 −4 source/endpoints_types_impl.c
+1 −0 tests/CMakeLists.txt
+28 −11 tests/endpoints_rule_engine_tests.c
+1 −1 tests/resources/test-cases/partition-fn.json
+45 −0 tests/resources/test-cases/string_array.json
+38 −0 tests/resources/valid-rules/string_array.json
2 changes: 1 addition & 1 deletion crt/aws-checksums
Open in desktop
Submodule aws-checksums updated 26 files
+105 −15 .github/workflows/ci.yml
+4 −6 .github/workflows/clang-format.yml
+60 −49 CMakeLists.txt
+29 −0 bin/benchmark/CMakeLists.txt
+133 −0 bin/benchmark/main.c
+4 −0 builder.json
+47 −0 format-check.py
+0 −24 format-check.sh
+42 −3 include/aws/checksums/crc.h
+51 −0 include/aws/checksums/private/crc64_priv.h
+28 −11 include/aws/checksums/private/crc_priv.h
+24 −0 include/aws/checksums/private/crc_util.h
+4 −4 source/arm/crc32c_arm.c
+208 −0 source/arm/crc64_arm.c
+35 −9 source/crc.c
+131 −0 source/crc64.c
+579 −0 source/crc64_sw.c
+0 −18 source/generic/crc32c_null.c
+3 −14 source/intel/asm/crc32c_sse42_asm.c
+245 −0 source/intel/intrin/crc32c_sse42_avx512.c
+130 −0 source/intel/intrin/crc64nvme_avx512.c
+147 −0 source/intel/intrin/crc64nvme_clmul.c
+0 −77 source/intel/visualc/visualc_crc32c_sse42.c
+3 −0 tests/CMakeLists.txt
+144 −0 tests/crc64_test.c
+129 −43 tests/crc_test.c
2 changes: 1 addition & 1 deletion crt/aws-lc
Open in desktop
Submodule aws-lc updated from 4e54dd to 8b2ebf
2 changes: 1 addition & 1 deletion crt/s2n
Open in desktop
Submodule s2n updated from 114cca to ffe0bf
33 changes: 28 additions & 5 deletions native/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading