From 814c5c707bd4180b1ba33d23275c4bb893bd84f2 Mon Sep 17 00:00:00 2001 From: Daniel Carl Jones Date: Thu, 23 Jan 2025 00:32:37 +0000 Subject: [PATCH] Update CRT submodules to latest releases (#1242) Update the CRT to the latest releases. This change also updates the exclude list, primarily due to one of the test files being replaced by a compressed (but still large) file: https://github.com/aws/aws-lc/pull/2123/ This change pulls in a bug fix (https://github.com/awslabs/aws-c-auth/pull/259/), addressing https://github.com/awslabs/mountpoint-s3/issues/1207. ### Does this change impact existing behavior? One bug fix is included in CRT changes. ### Does this change need a changelog entry? Does it require a version change? Change log entry added for the CRT fix. It is a bug fix, so patch version bump to `mountpoint-s3-client` remains appropriate. --- By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license and I agree to the terms of the [Developer Certificate of Origin (DCO)](https://developercertificate.org/). Signed-off-by: Daniel Carl Jones --- mountpoint-s3-client/CHANGELOG.md | 4 ++++ mountpoint-s3-crt-sys/CHANGELOG.md | 2 ++ mountpoint-s3-crt-sys/Cargo.toml | 8 ++++++-- mountpoint-s3-crt-sys/crt/aws-c-auth | 2 +- mountpoint-s3-crt-sys/crt/aws-c-s3 | 2 +- mountpoint-s3-crt-sys/crt/aws-lc | 2 +- mountpoint-s3-crt-sys/crt/s2n-tls | 2 +- mountpoint-s3-crt/CHANGELOG.md | 2 ++ 8 files changed, 18 insertions(+), 6 deletions(-) diff --git a/mountpoint-s3-client/CHANGELOG.md b/mountpoint-s3-client/CHANGELOG.md index 5ea1c7f7d..2faaa34df 100644 --- a/mountpoint-s3-client/CHANGELOG.md +++ b/mountpoint-s3-client/CHANGELOG.md @@ -1,5 +1,9 @@ ## Unreleased +### Other changes + +- The ECS credentials provider now performs retries in the event of some failures. ([awslabs/aws-c-auth#259][https://github.com/awslabs/aws-c-auth/pull/259/]) + ## v0.12.0 (January 20, 2025) ### Breaking changes diff --git a/mountpoint-s3-crt-sys/CHANGELOG.md b/mountpoint-s3-crt-sys/CHANGELOG.md index dd960c2fd..711d87bb3 100644 --- a/mountpoint-s3-crt-sys/CHANGELOG.md +++ b/mountpoint-s3-crt-sys/CHANGELOG.md @@ -1,5 +1,7 @@ ## Unreleased +* Update to latest CRT dependencies. + ## v0.11.0 (January 20, 2025) * Update to latest CRT dependencies diff --git a/mountpoint-s3-crt-sys/Cargo.toml b/mountpoint-s3-crt-sys/Cargo.toml index 0999fbde8..4722195eb 100644 --- a/mountpoint-s3-crt-sys/Cargo.toml +++ b/mountpoint-s3-crt-sys/Cargo.toml @@ -23,14 +23,18 @@ exclude = [ "crt/aws-lc/**/*test*.json", "crt/aws-lc/**/*test*.py", "crt/aws-lc/**/*test*.txt", + # All the text files in kat/ directory are 'known answer tests' + "crt/aws-lc/crypto/ml_dsa/kat/*.txt", "crt/aws-lc/crypto/**/*_test.cc", "crt/aws-lc/crypto/cipher_extra/test/*", "crt/aws-lc/crypto/fipsmodule/bn/test/*", "crt/aws-lc/crypto/fipsmodule/policydocs/*", "crt/aws-lc/crypto/fipsmodule/sha/testvectors/*", - # All the text files in crt/aws-lc/crypto/*/kat/ directory are used for tests + # All the text files in kat/ directory are 'known answer tests' "crt/aws-lc/crypto/fipsmodule/ml_kem/kat/*.txt", + # All the text files in kat/ directory are 'known answer tests' "crt/aws-lc/crypto/kyber/kat/*.txt", + # All the text files in kat/ directory are 'known answer tests' "crt/aws-lc/crypto/dilithium/kat/*.txt", "crt/aws-lc/crypto/x509/test/*", "crt/aws-lc/crypto/ocsp/test/*", @@ -39,7 +43,7 @@ exclude = [ "crt/aws-lc/generated-src/ios-*", "crt/aws-lc/generated-src/mac-*", "crt/aws-lc/generated-src/win-*", - "crt/aws-lc/generated-src/crypto_test_data.cc", + "crt/aws-lc/generated-src/crypto_test_data.cc.tar.bz2", "crt/aws-lc/ssl/ssl_test.cc", "crt/aws-lc/ssl/test/*", "crt/aws-lc/tests", diff --git a/mountpoint-s3-crt-sys/crt/aws-c-auth b/mountpoint-s3-crt-sys/crt/aws-c-auth index 3982bd75f..5bc677976 160000 --- a/mountpoint-s3-crt-sys/crt/aws-c-auth +++ b/mountpoint-s3-crt-sys/crt/aws-c-auth @@ -1 +1 @@ -Subproject commit 3982bd75fea74efd8f9b462b27fedd4599db4f53 +Subproject commit 5bc6779764388a3e769ed9b88e8b7b8c834c9e47 diff --git a/mountpoint-s3-crt-sys/crt/aws-c-s3 b/mountpoint-s3-crt-sys/crt/aws-c-s3 index 1c8041884..a3b401bfb 160000 --- a/mountpoint-s3-crt-sys/crt/aws-c-s3 +++ b/mountpoint-s3-crt-sys/crt/aws-c-s3 @@ -1 +1 @@ -Subproject commit 1c8041884de6f3e6712b9880ba3704df1cec656b +Subproject commit a3b401bfb53c28c88a930d496b481311dd76a4f5 diff --git a/mountpoint-s3-crt-sys/crt/aws-lc b/mountpoint-s3-crt-sys/crt/aws-lc index 697acc661..ffd6fb71b 160000 --- a/mountpoint-s3-crt-sys/crt/aws-lc +++ b/mountpoint-s3-crt-sys/crt/aws-lc @@ -1 +1 @@ -Subproject commit 697acc6616736ad07539fda1e0726cc043e1097a +Subproject commit ffd6fb71b1e1582a620149337b77706f2391578d diff --git a/mountpoint-s3-crt-sys/crt/s2n-tls b/mountpoint-s3-crt-sys/crt/s2n-tls index 2e79e7efe..6cc9f53d7 160000 --- a/mountpoint-s3-crt-sys/crt/s2n-tls +++ b/mountpoint-s3-crt-sys/crt/s2n-tls @@ -1 +1 @@ -Subproject commit 2e79e7efeb26f06eb59a1d4f3444ea63fc3e20c3 +Subproject commit 6cc9f53d7ab5f0427ae5f838891fff57844a9e3f diff --git a/mountpoint-s3-crt/CHANGELOG.md b/mountpoint-s3-crt/CHANGELOG.md index a28c2ef21..524ae6bec 100644 --- a/mountpoint-s3-crt/CHANGELOG.md +++ b/mountpoint-s3-crt/CHANGELOG.md @@ -1,5 +1,7 @@ ## Unreleased +* Update to latest CRT dependencies. + ## v0.11.0 (January 20, 2025) * Update to latest CRT dependencies.