From 1010d6ab3f29c38fae2131042b232a5e532b8625 Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Fri, 14 Nov 2025 15:40:32 -0800 Subject: [PATCH 1/2] chore: fix php duvet --- .../php-v2-transition-server/.duvet/config.toml | 15 +++++++++++++++ .../compliance_exceptions/content-metadata.txt | 7 ++++++- .../compliance_exceptions/hkdf-operation.txt | 4 ++++ test-server/php-v3-server/local-php-sdk | 2 +- 4 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 test-server/php-v3-server/compliance_exceptions/hkdf-operation.txt diff --git a/test-server/php-v2-transition-server/.duvet/config.toml b/test-server/php-v2-transition-server/.duvet/config.toml index 64b00927..e1c3a432 100644 --- a/test-server/php-v2-transition-server/.duvet/config.toml +++ b/test-server/php-v2-transition-server/.duvet/config.toml @@ -6,15 +6,30 @@ pattern = "local-php-sdk/src/S3/**/*.php" [[source]] pattern = "local-php-sdk/src/Crypto/**/*.php" +[[source]] +pattern = "local-php-sdk/tests/S3/**/*.php" + +[[source]] +pattern = "local-php-sdk/tests/Crypto/**/*.php" + +[[source]] +pattern = "../php-v3-server/compliance_exceptions/*.txt" + # Include required specifications here [[specification]] source = "../specification/s3-encryption/data-format/content-metadata.md" [[specification]] source = "../specification/s3-encryption/data-format/metadata-strategy.md" [[specification]] +source = "../specification/s3-encryption/client.md" +[[specification]] +source = "../specification/s3-encryption/decryption.md" +[[specification]] source = "../specification/s3-encryption/encryption.md" [[specification]] source = "../specification/s3-encryption/key-derivation.md" +[[specification]] +source = "../specification/s3-encryption/key-commitment.md" [report.html] enabled = true diff --git a/test-server/php-v3-server/compliance_exceptions/content-metadata.txt b/test-server/php-v3-server/compliance_exceptions/content-metadata.txt index 6053a0a6..20ba0862 100644 --- a/test-server/php-v3-server/compliance_exceptions/content-metadata.txt +++ b/test-server/php-v3-server/compliance_exceptions/content-metadata.txt @@ -47,4 +47,9 @@ //= ../specification/s3-encryption/data-format/content-metadata.md#v3-only //= type=exception -//# If the mapkey is not present, the default Material Description value MUST be set to an empty map (`{}`). +//# If the mapkey x-amz-m is not present, the default Material Description value MUST be set to an empty map (`{}`). + +//= ../specification/s3-encryption/data-format/content-metadata.md#v3-only +//= type=exception +//= reason=PHP always writes x-amz-t since it only supports a KMS Material Provider. +//# If the mapkey x-amz-t is not present, the default Material Description value MUST be set to an empty map (`{}`). diff --git a/test-server/php-v3-server/compliance_exceptions/hkdf-operation.txt b/test-server/php-v3-server/compliance_exceptions/hkdf-operation.txt new file mode 100644 index 00000000..bb1e6f73 --- /dev/null +++ b/test-server/php-v3-server/compliance_exceptions/hkdf-operation.txt @@ -0,0 +1,4 @@ +//= ../specification/s3-encryption/key-derivation.md#hkdf-operation +//= type=exception +//= reason=PHP allows for AAD for content encryption, so if provided it will do AAD + Alg Suite +//# The client MUST set the AAD to the Algorithm Suite ID represented as bytes. diff --git a/test-server/php-v3-server/local-php-sdk b/test-server/php-v3-server/local-php-sdk index d75f911e..a0080e8e 160000 --- a/test-server/php-v3-server/local-php-sdk +++ b/test-server/php-v3-server/local-php-sdk @@ -1 +1 @@ -Subproject commit d75f911e41df81a1224f09bb4330c4a1c6c8ed59 +Subproject commit a0080e8e1cf3b89f22fb1c980061ede902b7eaf5 From 2d79b028a9458742528cac1de4358b0de75223d3 Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Fri, 5 Dec 2025 10:28:59 -0800 Subject: [PATCH 2/2] m --- test-server/php-v3-server/local-php-sdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-server/php-v3-server/local-php-sdk b/test-server/php-v3-server/local-php-sdk index a0080e8e..3acb3ad4 160000 --- a/test-server/php-v3-server/local-php-sdk +++ b/test-server/php-v3-server/local-php-sdk @@ -1 +1 @@ -Subproject commit a0080e8e1cf3b89f22fb1c980061ede902b7eaf5 +Subproject commit 3acb3ad4d98debcfc2148290cd6fcea83962fe08