Submodule work (#36)

* Existing submodule sync * Add aws-c-sdkutils * Rust related updates for sdkutils
awslabs · Mar 11, 2022 · 95b71d8 · 95b71d8
1 parent aecdb91
commit 95b71d8
Show file tree

Hide file tree

Showing 15 changed files with 18 additions and 10 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -28,3 +28,6 @@
 [submodule "aws-lc"]
 	path = crt/aws-lc
 	url = https://github.com/awslabs/aws-lc.git
+[submodule "crt/aws-c-sdkutils"]
+	path = crt/aws-c-sdkutils
+	url = https://github.com/awslabs/aws-c-sdkutils
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -68,6 +68,7 @@ if (UNIX AND NOT APPLE)
     endif()
     add_subdirectory(crt/s2n)
 endif()
+add_subdirectory(crt/aws-c-sdkutils)
 add_subdirectory(crt/aws-c-io)
 add_subdirectory(crt/aws-c-cal)
 add_subdirectory(crt/aws-c-compression)
@@ -89,6 +90,7 @@ aws_set_common_properties(${PROJECT_NAME})
 aws_prepare_shared_lib_exports(${PROJECT_NAME})
 
 aws_use_package(aws-c-common)
+aws_use_package(aws-c-sdkutils)
 aws_use_package(aws-c-io)
 aws_use_package(aws-c-cal)
 aws_use_package(aws-c-compression)

diff --git a/aws-crt-sys/build.rs b/aws-crt-sys/build.rs
@@ -79,6 +79,7 @@ fn compile_aws_crt_ffi() {
     println!("cargo:rustc-link-lib={}", "aws-c-io");
     println!("cargo:rustc-link-lib={}", "aws-c-cal");
     println!("cargo:rustc-link-lib={}", "aws-checksums");
+    println!("cargo:rustc-link-lib={}", "aws-c-sdkutils");
     println!("cargo:rustc-link-lib={}", "aws-c-common");
     configure_link_for_platform();
 }

diff --git a/aws-crt-sys/src/lib.rs b/aws-crt-sys/src/lib.rs
@@ -1,4 +1,4 @@
-/* automatically generated by rust-bindgen 0.59.1 */
+/* automatically generated by rust-bindgen 0.59.2 */
 
 #![allow(dead_code)]
 #![allow(non_upper_case_globals)]

diff --git a/cmake/aws-crt-ffi-config.cmake b/cmake/aws-crt-ffi-config.cmake
@@ -5,6 +5,7 @@ if (UNIX AND NOT APPLE)
 endif()
 
 find_dependency(aws-c-common)
+find_dependency(aws-c-sdkutils)
 find_dependency(aws-c-cal)
 find_dependency(aws-c-io)
 find_dependency(aws-c-http)

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-checksums b/crt/aws-checksums
diff --git a/crt/aws-lc b/crt/aws-lc
diff --git a/crt/s2n b/crt/s2n
+37 −66		.github/workflows/ci.yml
+2 −2		.github/workflows/clang-format.yml
+1 −0		CMakeLists.txt
+2 −1		builder.json
+1 −0		cmake/aws-c-auth-config.cmake
+4 −3		include/aws/auth/auth.h
+5 −0		include/aws/auth/credentials.h
+1 −161		include/aws/auth/private/aws_profile.h
+17 −0		include/aws/auth/signable.h
+26 −0		include/aws/auth/signing_config.h
+5 −7		source/auth.c
+2 −1,483		source/aws_profile.c
+96 −22		source/aws_signing.c
+1 −0		source/credentials_provider_default_chain.c
+5 −1		source/credentials_provider_ecs.c
+5 −4		source/credentials_provider_process.c
+27 −21		source/credentials_provider_profile.c
+4 −4		source/credentials_provider_sts_web_identity.c
+5 −4		source/external/cJSON.c
+115 −0		source/signable_chunk.c
+130 −0		source/signable_http_request.c
+133 −0		source/signable_trailer.c
+9 −0		source/signing_config.c
+0 −234		source/sigv4_http_request.c
+2 −53		tests/CMakeLists.txt
+0 −107		tests/aws_profile_fatal_parse_tests.c
+0 −1,197		tests/aws_profile_tests.c
+21 −0		tests/credentials_provider_ecs_tests.c
+0 −1		tests/sigv4_signing_tests.c
+703 −0		tests/test_chunked_signing.c
+41 −77		.github/workflows/ci.yml
+9 −14		CMakeLists.txt
+5 −0		bin/sha256_profile/main.c
+8 −4		builder.json
+1 −1		cmake/aws-c-cal-config.cmake
+0 −109		cmake/modules/FindLibCrypto.cmake
+118 −0		cmake/modules/Findcrypto.cmake
+1 −1		source/darwin/commoncrypto_hmac.c
+1 −1		source/darwin/commoncrypto_md5.c
+2 −2		source/darwin/commoncrypto_sha1.c
+2 −2		source/darwin/commoncrypto_sha256.c
+1 −1		source/unix/opensslcrypto_hash.c
+1 −1		source/unix/opensslcrypto_hmac.c
+1 −1		source/windows/bcrypt_hash.c
+1 −1		source/windows/bcrypt_hmac.c
+4 −0		tests/CMakeLists.txt
+29 −1		tests/md5_test.c
+29 −1		tests/sha1_test.c
+35 −0		tests/sha256_hmac_test.c
+29 −0		tests/sha256_test.c
+52 −55		.github/workflows/ci.yml
+27 −23		CMakeLists.txt
+1 −1		README.md
+3 −3		cmake/AwsCFlags.cmake
+21 −6		cmake/AwsFeatureTests.cmake
+35 −33		cmake/AwsSIMD.cmake
+18 −5		include/aws/common/allocator.h
+8 −0		include/aws/common/array_list.h
+26 −0		include/aws/common/array_list.inl
+18 −0		include/aws/common/assert.h
+97 −0		include/aws/common/bus.h
+49 −0		include/aws/common/byte_buf.h
+48 −1		include/aws/common/command_line_parser.h
+4 −1		include/aws/common/error.h
+181 −5		include/aws/common/file.h
+3 −0		include/aws/common/logging.h
+1 −0		include/aws/common/mutex.h
+4 −0		include/aws/common/platform.h
+0 −43		include/aws/common/resource_name.h
+0 −6		include/aws/common/ring_buffer.h
+1 −0		include/aws/common/rw_lock.h
+118 −1		include/aws/common/string.h
+0 −93		include/aws/testing/aws_test_allocators.h
+2 −2		include/aws/testing/aws_test_harness.h
+31 −48		source/allocator.c
+1 −0		source/arch/generic/cpuid.c
+27 −5		source/arch/intel/cpuid.c
+724 −0		source/bus.c
+46 −1		source/byte_buf.c
+53 −2		source/command_line_parser.c
+17 −0		source/common.c
+171 −0		source/file.c
+4 −2		source/logging.c
+270 −2		source/posix/file.c
+0 −111		source/resource_name.c
+0 −61		source/ring_buffer.c
+178 −1		source/string.c
+465 −17		source/windows/file.c
+23 −1		source/windows/mutex.c
+38 −2		source/windows/rw_lock.c
+68 −10		source/windows/thread.c
+23 −13		tests/CMakeLists.txt
+69 −0		tests/array_list_test.c
+436 −0		tests/bus_test.c
+110 −0		tests/byte_buf_test.c
+1 −15		tests/calloc_test.c
+65 −6		tests/command_line_parser_test.c
+330 −1		tests/file_test.c
+1 −0		tests/logging/logging_test_utilities.c
+0 −65		tests/realloc_test.c
+0 −199		tests/resource_name_test.c
+1 −0		tests/resources/dir_traversal_test/first_child_dir/child.txt
+1 −0		tests/resources/dir_traversal_test/root_child.txt
+0 −37		tests/ring_buffer_test.c
+0 −162		tests/task_scheduler_test.c
+0 −41		tests/timebomb_test.c
+1 −1		verification/cbmc/litani
+25 −0		verification/cbmc/proofs/aws_array_list_push_front/Makefile
+45 −0		verification/cbmc/proofs/aws_array_list_push_front/aws_array_list_push_front_harness.c
+1 −0		verification/cbmc/proofs/aws_array_list_push_front/cbmc-proof.txt
+1 −1		verification/cbmc/sources/make_common_data_structures.c
+0 −29		verification/cbmc/stubs/aws_array_list_defined_type.c
+0 −36		verification/cbmc/stubs/aws_byte_buf_write_stub.c
+1 −1		verification/cbmc/templates
+3 −3		include/aws/compression/private/huffman_testing.h
+1 −6		source/huffman_testing.c
+1 −1		tests/fuzz/decode.c
+1 −1		tests/fuzz/transitive.c
+1 −1		tests/fuzz/transitive_chunked.c
+1 −1		tests/huffman_test.c
+19 −0		.builder/action/aws-c-http-test.sh
+51 −72		.github/workflows/ci.yml
+1 −1		.github/workflows/clang-format.yml
+3 −4		CMakeLists.txt
+49 −29		bin/elasticurl/main.c
+2 −2		builder.json
+25 −0		codebuild/linux-integration-tests.yml
+135 −32		include/aws/http/connection.h
+25 −2		include/aws/http/connection_manager.h
+5 −0		include/aws/http/http.h
+164 −0		include/aws/http/http2_stream_manager.h
+14 −5		include/aws/http/private/connection_impl.h
+3 −0		include/aws/http/private/connection_manager_system_vtable.h
+13 −0		include/aws/http/private/h1_encoder.h
+12 −0		include/aws/http/private/h1_stream.h
+3 −7		include/aws/http/private/h2_connection.h
+8 −6		include/aws/http/private/h2_decoder.h
+10 −3		include/aws/http/private/h2_stream.h
+182 −0		include/aws/http/private/http2_stream_manager_impl.h
+21 −0		include/aws/http/private/http_impl.h
+79 −0		include/aws/http/private/random_access_set.h
+18 −0		include/aws/http/private/request_response_impl.h
+6 −40		include/aws/http/private/strutil.h
+50 −1		include/aws/http/proxy.h
+126 −4		include/aws/http/request_response.h
+3 −3		include/aws/http/websocket.h
+16 −0		integration-testing/http_client_test.py
+189 −62		source/connection.c
+357 −176		source/connection_manager.c
+5 −0		source/connection_monitor.c
+3 −3		source/h1_connection.c
+3 −3		source/h1_decoder.c
+105 −10		source/h1_encoder.c
+102 −1		source/h1_stream.c
+118 −168		source/h2_connection.c
+48 −16		source/h2_decoder.c
+114 −58		source/h2_stream.c
+34 −0		source/http.c
+1,001 −0		source/http2_stream_manager.c
+193 −11		source/proxy_connection.c
+181 −0		source/random_access_set.c
+360 −38		source/request_response.c
+12 −43		source/strutil.c
+1 −1		source/websocket.c
+1 −1		source/websocket_encoder.c
+76 −18		tests/CMakeLists.txt
+19 −33		tests/h2_test_helper.c
+12 −2		tests/h2_test_helper.h
+0 −365		tests/integration_test_proxy.c
+4 −2		tests/proxy_test_helper.c
+20 −0		tests/resources/unittests.conf
+21 −21		tests/resources/unittests.crt
+ −		tests/resources/unittests.p12
+16 −0		tests/resources/unittests.readme
+350 −27		tests/test_connection.c
+825 −16		tests/test_connection_manager.c
+46 −4		tests/test_connection_monitor.c
+412 −6		tests/test_h1_client.c
+4 −2		tests/test_h1_server.c
+465 −127		tests/test_h2_client.c
+1 −1		tests/test_h2_decoder.c
+85 −76		tests/test_message.c
+203 −0		tests/test_random_access_set.c
+1,038 −0		tests/test_stream_manager.c
+22 −93		tests/test_strutil.c
+1 −42		tests/test_websocket_bootstrap.c
+106 −0		.builder/actions/pkcs11_test_setup.py
+43 −77		.github/workflows/ci.yml
+1 −1		.github/workflows/clang-format.yml
+1 −1		.github/workflows/proof-alarm.yml
+10 −6		CMakeLists.txt
+55 −0		PKCS11.md
+0 −13		README.md
+31 −0		THIRD-PARTY-LICENSES.txt
+8 −2		builder.json
+25 −0		codebuild/linux-integration-tests.yml
+15 −0		include/aws/io/channel.h
+6 −0		include/aws/io/channel_bootstrap.h
+27 −2		include/aws/io/event_loop.h
+2 −62		include/aws/io/file_utils.h
+108 −2		include/aws/io/io.h
+1 −0		include/aws/io/logging.h
+94 −0		include/aws/io/pkcs11.h
+2 −0		include/aws/io/private/pem_utils.h
+17 −6		include/aws/io/private/pki_utils.h
+11 −0		include/aws/io/private/tls_channel_handler_shared.h
+130 −24		include/aws/io/tls_channel_handler.h
+3 −0		include/aws/io/uri.h
+26 −0		source/channel.c
+52 −3		source/channel_bootstrap.c
+1 −1		source/darwin/darwin_pki_utils.c
+8 −7		source/darwin/secure_transport_tls_channel_handler.c
+1 −2		source/event_loop.c
+0 −65		source/file_utils_shared.c
+124 −1		source/io.c
+14 −2		source/pem_utils.c
+1,208 −0		source/pkcs11.c
+1 −0		source/pkcs11/v2.40/.clang-format
+265 −0		source/pkcs11/v2.40/pkcs11.h
+939 −0		source/pkcs11/v2.40/pkcs11f.h
+2,003 −0		source/pkcs11/v2.40/pkcs11t.h
+159 −0		source/pkcs11_private.h
+1 −1		source/pki_utils.c
+0 −72		source/posix/file_utils.c
+3 −2		source/posix/host_resolver.c
+14 −9		source/posix/socket.c
+519 −135		source/s2n/s2n_tls_channel_handler.c
+8 −1		source/socket_channel_handler.c
+280 −155		source/tls_channel_handler.c
+4 −0		source/tls_channel_handler_shared.c
+25 −2		source/uri.c
+0 −115		source/windows/file_utils.c
+6 −0		source/windows/iocp/iocp_event_loop.c
+8 −6		source/windows/iocp/pipe.c
+25 −11		source/windows/iocp/socket.c
+38 −22		source/windows/secure_channel_tls_handler.c
+120 −68		source/windows/windows_pki_utils.c
+104 −15		tests/CMakeLists.txt
+23 −15		tests/alpn_handler_test.c
+49 −37		tests/event_loop_test.c
+0 −23		tests/file_utils_test.c
+102 −2		tests/pem_utils_test.c
+1,521 −0		tests/pkcs11_test.c
+2 −2		tests/pki_utils_test.c
+132 −0		tests/resources/ca_root.cnf
+24 −0		tests/resources/ca_root.crt
+91 −0		tests/resources/generateCerts.sh
+29 −0		tests/resources/server.crt
+27 −0		tests/resources/server.key
+53 −0		tests/resources/server_chain.crt
+2 −0		tests/resources/suppressions-asan.txt
+0 −0		tests/resources/suppressions-lsan.txt
+23 −0		tests/resources/testparse.crt
+8 −8		tests/resources/unittests.crt
+ −		tests/resources/unittests.p12
+28 −0		tests/resources/unittests.p8
+0 −16		tests/resources/unittests.readme
+103 −7		tests/socket_handler_test.c
+2 −0		tests/socket_test.c
+434 −656		tests/tls_handler_test.c
+89 −3		tests/uri_test.c
+80 −45		.github/workflows/ci.yml
+0 −26		.github/workflows/clang-tsan.yml
+34 −32		CMakeLists.txt
+0 −92		build-deps.sh