From 7a731583d3cb8c381e7ac9e9e148abce6203686f Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Fri, 11 Apr 2025 10:28:26 -0700 Subject: [PATCH 1/7] chore: update mpl --- mpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mpl b/mpl index d808fd88d..131ae583d 160000 --- a/mpl +++ b/mpl @@ -1 +1 @@ -Subproject commit d808fd88df92acf64fb9ca0e7c652d72e05fa50a +Subproject commit 131ae583de02cb8352f8a96d69a9e1c84fea7338 From cefd5ea6683dd5daa3bcbdd1321537f301859b5f Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Fri, 11 Apr 2025 10:30:25 -0700 Subject: [PATCH 2/7] pin integration node version to 4.2.0 to test failures --- .github/workflows/library_interop_mkp_test_vectors.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/library_interop_mkp_test_vectors.yml b/.github/workflows/library_interop_mkp_test_vectors.yml index 2ec8e63ec..993e379f7 100644 --- a/.github/workflows/library_interop_mkp_test_vectors.yml +++ b/.github/workflows/library_interop_mkp_test_vectors.yml @@ -472,7 +472,7 @@ jobs: working-directory: ${{matrix.library}}/runtimes shell: bash run: | - npx -y @aws-crypto/integration-node decrypt -v tests.zip -c cpu -f 100 -C + npx -y @aws-crypto/integration-node@4.2.0 decrypt -v tests.zip -c cpu -f 100 -C testWritesWithJs: needs: generateMkpKeyringLegacyFormatEncryptVectors @@ -531,7 +531,7 @@ jobs: working-directory: ${{matrix.library}} shell: bash run: | - npx -y @aws-crypto/integration-node encrypt -m encrypt-manifest.json -k keys.json -d decrypt-manifest-js.zip -C + npx -y @aws-crypto/integration-node@4.2.0 encrypt -m encrypt-manifest.json -k keys.json -d decrypt-manifest-js.zip -C - name: Upload Encrypt Manifest and keys.json files uses: actions/upload-artifact@v4 From d30db52ec6ffdbb94bb81e575d4c85e5ee44b662 Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Fri, 11 Apr 2025 11:52:07 -0700 Subject: [PATCH 3/7] update raw aes tests --- .../src/VectorsComposition/AllEsdkV4NoReqEc.dfy | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/TestVectors/dafny/TestVectors/src/VectorsComposition/AllEsdkV4NoReqEc.dfy b/TestVectors/dafny/TestVectors/src/VectorsComposition/AllEsdkV4NoReqEc.dfy index af4ca0313..828d7a782 100644 --- a/TestVectors/dafny/TestVectors/src/VectorsComposition/AllEsdkV4NoReqEc.dfy +++ b/TestVectors/dafny/TestVectors/src/VectorsComposition/AllEsdkV4NoReqEc.dfy @@ -54,9 +54,7 @@ module {:options "/functionSyntax:4"} AllEsdkV4NoReqEc { + AllKms.Tests + AllKmsMrkAware.Tests + AllKmsMrkAwareDiscovery.Tests - + AllRawAES.TestsNoEc - + AllRawAES.TestsBasicEc - + AllRawAES.TestControlEc + + AllRawAES.Tests + AllRawAES.TestsWithOnePairOfHighCodePointUtf8ValuesInEc + AllRawRSA.Tests + AllMulti.Tests @@ -74,11 +72,8 @@ module {:options "/functionSyntax:4"} AllEsdkV4NoReqEc { plaintextPath := "", encryptDescriptions := keyringConfig.encryptDescription, decryptDescriptions := keyringConfig.decryptDescription, - // For now, interop with the ESDK-JS is tricky because of it's sorting of the aad. - // To deal with this detail we will only include encryption context in the test vector if the algorithm - // suite does not have an asymmetric signature. - reproducedEncryptionContext := if algorithmSuite.signature.ECDSA? then Some(map[]) else Some(keyringConfig.encryptionContext), - encryptionContext := if algorithmSuite.signature.ECDSA? then Some(map[]) else Some(keyringConfig.encryptionContext), + reproducedEncryptionContext := Some(keyringConfig.encryptionContext), + encryptionContext := Some(keyringConfig.encryptionContext), frameLength := Some(frameSize), algorithmSuiteId := Some(algorithmSuite), description := keyringConfig.name From 78f7dda860849c4302a0da4963ffdceb8ed67203 Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Fri, 11 Apr 2025 14:39:04 -0700 Subject: [PATCH 4/7] smaller test --- .../TestVectors/src/VectorsComposition/AllEsdkV4NoReqEc.dfy | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/TestVectors/dafny/TestVectors/src/VectorsComposition/AllEsdkV4NoReqEc.dfy b/TestVectors/dafny/TestVectors/src/VectorsComposition/AllEsdkV4NoReqEc.dfy index 828d7a782..9ab238e75 100644 --- a/TestVectors/dafny/TestVectors/src/VectorsComposition/AllEsdkV4NoReqEc.dfy +++ b/TestVectors/dafny/TestVectors/src/VectorsComposition/AllEsdkV4NoReqEc.dfy @@ -54,7 +54,9 @@ module {:options "/functionSyntax:4"} AllEsdkV4NoReqEc { + AllKms.Tests + AllKmsMrkAware.Tests + AllKmsMrkAwareDiscovery.Tests - + AllRawAES.Tests + + AllRawAES.TestsNoEc + + AllRawAES.TestsBasicEc + + AllRawAES.TestControlEc + AllRawAES.TestsWithOnePairOfHighCodePointUtf8ValuesInEc + AllRawRSA.Tests + AllMulti.Tests From 2333f452112e83df8d5d330ced73d546bd67e0e6 Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Mon, 14 Apr 2025 10:40:19 -0700 Subject: [PATCH 5/7] maybe --- .../TestVectors/src/VectorsComposition/AllEsdkV4NoReqEc.dfy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/TestVectors/dafny/TestVectors/src/VectorsComposition/AllEsdkV4NoReqEc.dfy b/TestVectors/dafny/TestVectors/src/VectorsComposition/AllEsdkV4NoReqEc.dfy index 9ab238e75..162164449 100644 --- a/TestVectors/dafny/TestVectors/src/VectorsComposition/AllEsdkV4NoReqEc.dfy +++ b/TestVectors/dafny/TestVectors/src/VectorsComposition/AllEsdkV4NoReqEc.dfy @@ -57,6 +57,7 @@ module {:options "/functionSyntax:4"} AllEsdkV4NoReqEc { + AllRawAES.TestsNoEc + AllRawAES.TestsBasicEc + AllRawAES.TestControlEc + + AllRawAES.TestsWithMultipleUTF8Ec + AllRawAES.TestsWithOnePairOfHighCodePointUtf8ValuesInEc + AllRawRSA.Tests + AllMulti.Tests @@ -65,7 +66,7 @@ module {:options "/functionSyntax:4"} AllEsdkV4NoReqEc { const AllPostiveKeyringTestsNoDBESuiteNoReqEC := set keyringConfig <- AllPositiveKeyringTestsNoReqCmmNoKmsRsa | !keyringConfig.NegativeEncryptKeyringVector?, - algorithmSuite <- AllAlgorithmSuites.ESDKAlgorithmSuites | algorithmSuite.commitment.None? + algorithmSuite <- AllAlgorithmSuites.ESDKAlgorithmSuites :: EsdkTestVectors.PositiveEncryptTestVector( version := 4, From 7979c7d656c93c411f6177e9c42eb235cc18228c Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Mon, 14 Apr 2025 10:47:40 -0700 Subject: [PATCH 6/7] update --- mpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mpl b/mpl index 131ae583d..324c23ded 160000 --- a/mpl +++ b/mpl @@ -1 +1 @@ -Subproject commit 131ae583de02cb8352f8a96d69a9e1c84fea7338 +Subproject commit 324c23ded5e1011b19602697c304a1ab5b107669 From 02c256a79dd91789cd2c45d743a8187aa6366d16 Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Mon, 14 Apr 2025 11:07:06 -0700 Subject: [PATCH 7/7] m --- .../TestVectors/src/VectorsComposition/AllEsdkV4NoReqEc.dfy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/TestVectors/dafny/TestVectors/src/VectorsComposition/AllEsdkV4NoReqEc.dfy b/TestVectors/dafny/TestVectors/src/VectorsComposition/AllEsdkV4NoReqEc.dfy index 162164449..09ca0a06c 100644 --- a/TestVectors/dafny/TestVectors/src/VectorsComposition/AllEsdkV4NoReqEc.dfy +++ b/TestVectors/dafny/TestVectors/src/VectorsComposition/AllEsdkV4NoReqEc.dfy @@ -55,8 +55,8 @@ module {:options "/functionSyntax:4"} AllEsdkV4NoReqEc { + AllKmsMrkAware.Tests + AllKmsMrkAwareDiscovery.Tests + AllRawAES.TestsNoEc - + AllRawAES.TestsBasicEc - + AllRawAES.TestControlEc + // + AllRawAES.TestsBasicEc + // + AllRawAES.TestControlEc + AllRawAES.TestsWithMultipleUTF8Ec + AllRawAES.TestsWithOnePairOfHighCodePointUtf8ValuesInEc + AllRawRSA.Tests