awslabs · dannycjones · Jan 8, 2024 · Jan 5, 2024
diff --git a/mountpoint-s3-crt-sys/UPDATING_CRT.md b/mountpoint-s3-crt-sys/UPDATING_CRT.md
@@ -34,7 +34,6 @@ The CRT submodules can be updated by following these steps:
      - Any new features added or bugs fixed in the crate's bindings
      - Any breaking changes to the crate's API
    - For `mountpoint-s3-client`, it should mention any changes relevant for consumers of the crate such as:
-     - State that the AWS CRT was updated
      - New features or bug fixes
      - Breaking changes to APIs of the client, including any changes to defaults from this crate or AWS CRT
 

diff --git a/mountpoint-s3-crt-sys/crt/aws-c-auth b/mountpoint-s3-crt-sys/crt/aws-c-auth
diff --git a/mountpoint-s3-crt-sys/crt/aws-c-common b/mountpoint-s3-crt-sys/crt/aws-c-common
diff --git a/mountpoint-s3-crt-sys/crt/aws-c-http b/mountpoint-s3-crt-sys/crt/aws-c-http
diff --git a/mountpoint-s3-crt-sys/crt/aws-c-io b/mountpoint-s3-crt-sys/crt/aws-c-io
diff --git a/mountpoint-s3-crt-sys/crt/aws-c-s3 b/mountpoint-s3-crt-sys/crt/aws-c-s3
diff --git a/mountpoint-s3-crt-sys/crt/aws-lc b/mountpoint-s3-crt-sys/crt/aws-lc
diff --git a/mountpoint-s3-crt-sys/crt/s2n-tls b/mountpoint-s3-crt-sys/crt/s2n-tls
diff --git a/mountpoint-s3-crt/CHANGELOG.md b/mountpoint-s3-crt/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Unreleased
+
+* Update to latest CRT dependencies
+* Return type of `common::Uri::host_port` changed from `u16` to `u32`
+
 ## v0.5.1 (December 1, 2023)
 
 * Update to latest CRT dependencies

diff --git a/mountpoint-s3-crt/src/common/uri.rs b/mountpoint-s3-crt/src/common/uri.rs
@@ -64,8 +64,8 @@ impl Uri {
         }
     }
 
-    /// Return the host port portion of the URI. If no port was present, returns 0
-    pub fn host_port(&self) -> u16 {
+    /// Return the host port portion of the URI. If no port was present, returns 0.
+    pub fn host_port(&self) -> u32 {
         // SAFETY: `inner` is a valid `aws_uri` since it's owned by this struct, and the lifetime of
         // the returned slice will be tied to &self.
         unsafe { aws_uri_port(self.to_inner_ptr()) }

diff --git a/mountpoint-s3-crt/src/s3/client.rs b/mountpoint-s3-crt/src/s3/client.rs
@@ -99,7 +99,10 @@ impl ClientConfig {
         self
     }
 
-    /// Size of parts the files will be downloaded or uploaded in.
+    /// Size in bytes of parts the files will be downloaded or uploaded in.
+    ///
+    /// The AWS CRT client may adjust this value per-request where possible
+    /// to address service limits (such as the max number of parts).
     pub fn part_size(&mut self, part_size: usize) -> &mut Self {
         self.inner.part_size = part_size as u64;
         self
@@ -306,8 +309,7 @@ impl MetaRequestOptions {
 
     /// Provide a callback to run when telemetry for individual requests made by this meta request
     /// arrives. The callback is invoked once for each request made, after the request completes
-    /// (including failures). This callback may be invoked concurrently by multiple threads for
-    /// different requests.
+    /// (including failures).
     pub fn on_telemetry(&mut self, callback: impl Fn(&RequestMetrics) + Send + 'static) -> &mut Self {
         // SAFETY: we aren't moving out of the struct.
         let options = unsafe { Pin::get_unchecked_mut(Pin::as_mut(&mut self.0)) };
@@ -339,7 +341,7 @@ impl MetaRequestOptions {
         self
     }
 
-    /// Provide a callback to run when the request completes.
+    /// Provide a callback to run when the meta request completes.
     pub fn on_finish(&mut self, callback: impl FnOnce(MetaRequestResult) + Send + 'static) -> &mut Self {
         // SAFETY: we aren't moving out of the struct.
         let options = unsafe { Pin::get_unchecked_mut(Pin::as_mut(&mut self.0)) };
+7 −1		include/aws/auth/credentials.h
+8 −8		source/credentials_provider_default_chain.c
+1 −0		tests/CMakeLists.txt
+1 −1		tests/credentials_provider_ecs_tests.c
+44 −14		tests/credentials_provider_sso_tests.c
+27 −0		tests/credentials_provider_utils.c
+5 −0		tests/credentials_provider_utils.h
+82 −0		tests/credentials_tests.c
+25 −8		tests/token_provider_sso_tests.c
+25 −3		include/aws/common/uri.h
+30 −28		source/uri.c
+1 −1		tests/uri_test.c
+1 −1		bin/elasticurl/main.c
+1 −1		include/aws/http/connection.h
+1 −1		include/aws/http/connection_manager.h
+1 −1		include/aws/http/http2_stream_manager.h
+1 −0		include/aws/http/private/h1_stream.h
+2 −2		include/aws/http/private/proxy_impl.h
+1 −0		include/aws/http/private/request_response_impl.h
+1 −1		include/aws/http/proxy.h
+16 −3		include/aws/http/request_response.h
+1 −1		include/aws/http/websocket.h
+6 −6		source/connection.c
+1 −1		source/connection_manager.c
+28 −0		source/h1_connection.c
+2 −2		source/h1_encoder.c
+1 −0		source/h1_stream.c
+1 −1		source/h2_connection.c
+31 −9		source/h2_stream.c
+1 −1		source/proxy_connection.c
+4 −0		source/request_response.c
+1 −1		source/websocket_bootstrap.c
+2 −0		tests/CMakeLists.txt
+3 −3		tests/proxy_test_helper.c
+4 −4		tests/proxy_test_helper.h
+2 −2		tests/test_connection_manager.c
+78 −6		tests/test_h1_client.c
+72 −4		tests/test_h2_client.c
+2 −2		tests/test_proxy.c
+1 −1		tests/test_stream_manager.c
+2 −2		include/aws/io/channel_bootstrap.h
+17 −1		include/aws/io/socket.h
+6 −6		source/channel_bootstrap.c
+25 −28		source/posix/socket.c
+75 −0		source/socket_shared.c
+43 −33		source/windows/iocp/socket.c
+1 −0		tests/CMakeLists.txt
+53 −0		tests/socket_test.c
+4 −4		tests/tls_handler_test.c
+15 −6		include/aws/s3/private/s3_auto_ranged_get.h
+1 −1		include/aws/s3/private/s3_client_impl.h
+12 −1		include/aws/s3/private/s3_meta_request_impl.h
+9 −0		include/aws/s3/private/s3_request.h
+31 −7		include/aws/s3/private/s3_util.h
+2 −0		include/aws/s3/s3.h
+56 −13		include/aws/s3/s3_client.h
+2 −0		source/s3.c
+320 −119		source/s3_auto_ranged_get.c
+131 −169		source/s3_auto_ranged_put.c
+76 −36		source/s3_client.c
+11 −1		source/s3_copy_object.c
+8 −0		source/s3_default_meta_request.c
+4 −4		source/s3_endpoint.c
+148 −145		source/s3_endpoint_resolver/aws_s3_endpoint_resolver_partition.c
+180 −25		source/s3_meta_request.c
+20 −13		source/s3_request.c
+120 −16		source/s3_util.c
+14 −2		tests/CMakeLists.txt
+4 −3		tests/mock_s3_server/mock_s3_server.py
+142 −44		tests/s3_cancel_tests.c
+141 −0		tests/s3_client_test.c
+485 −20		tests/s3_data_plane_tests.c
+1 −1		tests/s3_mock_server_tests.c
+8 −1		tests/s3_tester.c
+4 −0		tests/s3_tester.h
+167 −7		tests/s3_util_tests.c
+4 −6		.github/workflows/ci_freebsd.yml
+9 −4		.github/workflows/ci_linting.yml
+23 −0		.github/workflows/ci_rust.yml
+2 −2		.github/workflows/proof_ci.yaml
+0 −1		.pep8
+4 −5		README.md
+5 −5		api/s2n.h
+33 −6		api/unstable/ktls.h
+1 −1		bin/s2nc.c
+1 −1		bin/s2nd.c
+1 −0		bindings/rust/bench/scripts/generate-certs.sh
+3 −3		bindings/rust/bench/src/s2n_tls.rs
+5 −0		bindings/rust/generate.sh
+1 −0		bindings/rust/generate/Cargo.toml
+1 −1		bindings/rust/s2n-tls-sys/templates/Cargo.template
+2 −2		bindings/rust/s2n-tls-tokio/Cargo.toml
+22 −0		bindings/rust/s2n-tls-tokio/tests/common/mod.rs
+68 −0		bindings/rust/s2n-tls-tokio/tests/tcp.rs
+2 −2		bindings/rust/s2n-tls/Cargo.toml
+12 −6		bindings/rust/s2n-tls/src/error.rs
+10 −2		codebuild/bin/test_libcrypto_interning.sh
+100 −23		crypto/s2n_aead_cipher_aes_gcm.c
+1 −0		crypto/s2n_ktls_crypto.h
+15 −1		docs/BUILD.md
+1 −1		docs/DEVELOPMENT-GUIDE.md
+5 −5		docs/FAQ.md
+0 −1,051		docs/USAGE-GUIDE.md
+5 −0		docs/usage-guide/book.toml
+17 −0		docs/usage-guide/topics/SUMMARY.md
+2 −0		docs/usage-guide/topics/ch00-introduction.md
+28 −0		docs/usage-guide/topics/ch01-api.md
+8 −0		docs/usage-guide/topics/ch02-initialization.md
+77 −0		docs/usage-guide/topics/ch03-error-handling.md
+26 −0		docs/usage-guide/topics/ch04-connection.md
+14 −0		docs/usage-guide/topics/ch05-config.md
+120 −0		docs/usage-guide/topics/ch06-security-policies.md
+229 −0		docs/usage-guide/topics/ch07-io.md
+50 −0		docs/usage-guide/topics/ch08-record-sizes.md
+103 −0		docs/usage-guide/topics/ch09-certificates.md
+40 −0		docs/usage-guide/topics/ch10-client-hello.md
+46 −0		docs/usage-guide/topics/ch11-resumption.md
+77 −0		docs/usage-guide/topics/ch12-private-key-ops.md
+59 −0		docs/usage-guide/topics/ch13-preshared-keys.md
+131 −0		docs/usage-guide/topics/ch14-early-data.md
+3 −1		error/s2n_errno.c
+2 −0		error/s2n_errno.h
+1 −1		libcrypto-build/README.md
+247 −244		scram/aes_scram.py
+122 −114		scripts/s2n_safety_macros.py
+3 −6		stuffer/s2n_stuffer.c
+7 −2		stuffer/s2n_stuffer_text.c
+1 −1		tests/cbmc/proofs/lib/summarize.py
+3 −2		tests/cbmc/proofs/run-cbmc-proofs.py
+38 −0		tests/cbmc/proofs/s2n_stuffer_printf/Makefile
+1 −0		tests/cbmc/proofs/s2n_stuffer_printf/cbmc-proof.txt
+66 −0		tests/cbmc/proofs/s2n_stuffer_printf/s2n_stuffer_printf_harness.c
+32 −20		tests/cbmc/proofs/s2n_stuffer_wipe_n/s2n_stuffer_wipe_n_harness.c
+9 −8		tests/features/S2N_KTLS_SUPPORTED.c
+4 −1		tests/sidetrail/bin/bpl_trace_to_c.py
+9 −2		tests/unit/kats/generate_pq_hybrid_tls13_handshake_kats.py
+64 −0		tests/unit/s2n_key_update_test.c
+1 −7		tests/unit/s2n_key_update_threads_test.c
+47 −0		tests/unit/s2n_ktls_io_sendfile_test.c
+133 −0		tests/unit/s2n_ktls_io_test.c
+50 −10		tests/unit/s2n_ktls_test.c
+51 −0		tests/unit/s2n_safety_test.c
+42 −0		tests/unit/s2n_security_policies_rules_test.c
+4 −4		tests/unit/s2n_security_rules_test.c
+111 −9		tests/unit/s2n_self_talk_ktls_test.c
+150 −0		tests/unit/s2n_send_test.c
+2 −0		tls/s2n_alerts.c
+5 −2		tls/s2n_config.h
+23 −0		tls/s2n_connection.c
+2 −0		tls/s2n_connection.h
+1 −1		tls/s2n_internal.h
+7 −8		tls/s2n_key_update.c
+28 −11		tls/s2n_ktls.c
+80 −0		tls/s2n_ktls_io.c
+106 −0		tls/s2n_security_policies.c
+1 −1		tls/s2n_security_policies.h
+7 −33		tls/s2n_security_rules.c
+0 −5		tls/s2n_security_rules.h
+34 −16		tls/s2n_send.c
+2 −0		tls/s2n_tls.h
+1 −5		tls/s2n_tls13_handshake.c
+64 −30		tls/s2n_tls13_key_schedule.c
+4 −0		tls/s2n_tls13_key_schedule.h
+5 −1		tls/s2n_tls13_secrets.c
+3 −3		utils/s2n_random.c
+1 −0		utils/s2n_safety.h