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 diff --git a/TestVectors/dafny/TestVectors/src/VectorsComposition/AllEsdkV4NoReqEc.dfy b/TestVectors/dafny/TestVectors/src/VectorsComposition/AllEsdkV4NoReqEc.dfy index af4ca0313..09ca0a06c 100644 --- a/TestVectors/dafny/TestVectors/src/VectorsComposition/AllEsdkV4NoReqEc.dfy +++ b/TestVectors/dafny/TestVectors/src/VectorsComposition/AllEsdkV4NoReqEc.dfy @@ -55,8 +55,9 @@ 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 + 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, @@ -74,11 +75,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 diff --git a/mpl b/mpl index d808fd88d..324c23ded 160000 --- a/mpl +++ b/mpl @@ -1 +1 @@ -Subproject commit d808fd88df92acf64fb9ca0e7c652d72e05fa50a +Subproject commit 324c23ded5e1011b19602697c304a1ab5b107669