Merge branch 'main' into seebees/update-dafny-verification-size

seebees · web-flow · commit 33a2563d4b34 · 2024-08-13T16:56:28.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,27 @@
 # Changelog
 
+## [3.6.1](https://github.com/aws/aws-database-encryption-sdk-dynamodb/compare/v3.6.0...v3.6.1) (2024-08-12)
+
+### Fixes
+
+- allow multi-tenant queries with allow_plaintext ([#1240](https://github.com/aws/aws-database-encryption-sdk-dynamodb/issues/1240)) ([1487d7e](https://github.com/aws/aws-database-encryption-sdk-dynamodb/commit/1487d7efe740920b5d8c7b30579947b6b3d26d12))
+- **TestVectors:** define StartUpObject in csproj ([#1231](https://github.com/aws/aws-database-encryption-sdk-dynamodb/issues/1231)) ([2f97bf3](https://github.com/aws/aws-database-encryption-sdk-dynamodb/commit/2f97bf365e2d027103cd9eb2b1951752a3687e3c))
+
+### Maintenance
+
+- Add examples to examine contents of query error list ([#1251](https://github.com/aws/aws-database-encryption-sdk-dynamodb/issues/1251)) ([b5705ee](https://github.com/aws/aws-database-encryption-sdk-dynamodb/commit/b5705ee12257fb18f867478bf17ba31f50c26c8b))
+- **CI:** add smithy diff checker GHA ([#1226](https://github.com/aws/aws-database-encryption-sdk-dynamodb/issues/1226)) ([86406f5](https://github.com/aws/aws-database-encryption-sdk-dynamodb/commit/86406f5cdcdf2067a27d35f370c5844eab2e23f3))
+- **deps:** bump actions/setup-dotnet from 3 to 4 in /.github/workflows ([#1191](https://github.com/aws/aws-database-encryption-sdk-dynamodb/issues/1191)) ([c3b736e](https://github.com/aws/aws-database-encryption-sdk-dynamodb/commit/c3b736ee714199b15738defd9e37c0f6dcee15ed))
+- **deps:** bump aws-actions/configure-aws-credentials ([#1190](https://github.com/aws/aws-database-encryption-sdk-dynamodb/issues/1190)) ([becbd0a](https://github.com/aws/aws-database-encryption-sdk-dynamodb/commit/becbd0a498830758bc29c86af94790740bc0a93c))
+- **deps:** bump com.amazonaws:aws-java-sdk-dynamodb ([#1230](https://github.com/aws/aws-database-encryption-sdk-dynamodb/issues/1230)) ([3aa25d0](https://github.com/aws/aws-database-encryption-sdk-dynamodb/commit/3aa25d0a93ef5269d9d90efbc1f64de6987064c4))
+- **deps:** bump dafny-lang/setup-dafny-action in /.github/workflows ([#1200](https://github.com/aws/aws-database-encryption-sdk-dynamodb/issues/1200)) ([5284f0b](https://github.com/aws/aws-database-encryption-sdk-dynamodb/commit/5284f0ba413d8ee90289387ca55ea02e6d6d8a08))
+- **deps:** bump software.amazon.awssdk:bom ([#1227](https://github.com/aws/aws-database-encryption-sdk-dynamodb/issues/1227)) ([abd1727](https://github.com/aws/aws-database-encryption-sdk-dynamodb/commit/abd17276a3c8d8bd071edefa709903423c1af8f6))
+- **deps:** bump software.amazon.awssdk:bom ([#1229](https://github.com/aws/aws-database-encryption-sdk-dynamodb/issues/1229)) ([bf3e1c3](https://github.com/aws/aws-database-encryption-sdk-dynamodb/commit/bf3e1c368d562035fc2a093b57f648f69f7f69e8))
+- **deps:** bump software.amazon.awssdk:core ([#1228](https://github.com/aws/aws-database-encryption-sdk-dynamodb/issues/1228)) ([9c67729](https://github.com/aws/aws-database-encryption-sdk-dynamodb/commit/9c67729c58f544dd6e2bd1bf4fabf9cf080d448d))
+- do not add beacons when FORCE_PLAINTEXT_WRITE is used. ([#1232](https://github.com/aws/aws-database-encryption-sdk-dynamodb/issues/1232)) ([23c8a18](https://github.com/aws/aws-database-encryption-sdk-dynamodb/commit/23c8a18ff8d9a49d5ecebf578b3c01d03567620f))
+- include bad item keys in query errors ([#1244](https://github.com/aws/aws-database-encryption-sdk-dynamodb/issues/1244)) ([07bba8b](https://github.com/aws/aws-database-encryption-sdk-dynamodb/commit/07bba8b0415531f4d6eb6c689c6c9c173d870b3e))
+- update version to snapshot ([#1225](https://github.com/aws/aws-database-encryption-sdk-dynamodb/issues/1225)) ([c817b5b](https://github.com/aws/aws-database-encryption-sdk-dynamodb/commit/c817b5bb9bc3b4815a5d0b22939edaa06792123a))
+
 ## [3.6.0](https://github.com/aws/aws-database-encryption-sdk-dynamodb/compare/v3.5.0...v3.6.0) (2024-07-23)
 
 ### Features
diff --git a/DynamoDbEncryption/dafny/DynamoDbEncryptionTransforms/test/QueryTransform.dfy b/DynamoDbEncryption/dafny/DynamoDbEncryptionTransforms/test/QueryTransform.dfy
@@ -172,7 +172,7 @@ module QueryTransformTest {
     expect transformed.error ==
            AwsCryptographyDbEncryptionSdkDynamoDbTransformsTypes.Error.CollectionOfErrors(
              [
-               AwsCryptographyDbEncryptionSdkDynamoDbTransformsTypes.Error.AwsCryptographyDbEncryptionSdkDynamoDbItemEncryptor(AwsCryptographyDbEncryptionSdkDynamoDbItemEncryptorTypes.Error.AwsCryptographyDbEncryptionSdkDynamoDb(AwsCryptographyDbEncryptionSdkDynamoDbTypes.Error.AwsCryptographyDbEncryptionSdkStructuredEncryption(AwsCryptographyDbEncryptionSdkStructuredEncryptionTypes.Error.StructuredEncryptionException(message := "No recipient tag matched.")))),
+               AwsCryptographyDbEncryptionSdkDynamoDbTransformsTypes.Error.AwsCryptographyDbEncryptionSdkDynamoDbItemEncryptor(AwsCryptographyDbEncryptionSdkDynamoDbItemEncryptorTypes.Error.AwsCryptographyDbEncryptionSdkDynamoDb(AwsCryptographyDbEncryptionSdkDynamoDbTypes.Error.AwsCryptographyDbEncryptionSdkStructuredEncryption(AwsCryptographyDbEncryptionSdkStructuredEncryptionTypes.Error.StructuredEncryptionException(message := "Signature of record does not match the signature computed when the record was encrypted.")))),
                AwsCryptographyDbEncryptionSdkDynamoDbTransformsTypes.Error.DynamoDbEncryptionTransformsException(message := "bar = 1234; sortKey = 01020304")
              ],
              message := "Error(s) found decrypting Query results."
@@ -191,7 +191,7 @@ module QueryTransformTest {
     expect transformed.error ==
            AwsCryptographyDbEncryptionSdkDynamoDbTransformsTypes.Error.CollectionOfErrors(
              [
-               AwsCryptographyDbEncryptionSdkDynamoDbTransformsTypes.Error.AwsCryptographyDbEncryptionSdkDynamoDbItemEncryptor(AwsCryptographyDbEncryptionSdkDynamoDbItemEncryptorTypes.Error.AwsCryptographyDbEncryptionSdkDynamoDb(AwsCryptographyDbEncryptionSdkDynamoDbTypes.Error.AwsCryptographyDbEncryptionSdkStructuredEncryption(AwsCryptographyDbEncryptionSdkStructuredEncryptionTypes.Error.StructuredEncryptionException(message := "No recipient tag matched.")))),
+               AwsCryptographyDbEncryptionSdkDynamoDbTransformsTypes.Error.AwsCryptographyDbEncryptionSdkDynamoDbItemEncryptor(AwsCryptographyDbEncryptionSdkDynamoDbItemEncryptorTypes.Error.AwsCryptographyDbEncryptionSdkDynamoDb(AwsCryptographyDbEncryptionSdkDynamoDbTypes.Error.AwsCryptographyDbEncryptionSdkStructuredEncryption(AwsCryptographyDbEncryptionSdkStructuredEncryptionTypes.Error.StructuredEncryptionException(message := "Signature of record does not match the signature computed when the record was encrypted.")))),
                AwsCryptographyDbEncryptionSdkDynamoDbTransformsTypes.Error.DynamoDbEncryptionTransformsException(message := "bar = 1234; sortKey = 01020304"),
                AwsCryptographyDbEncryptionSdkDynamoDbTransformsTypes.Error.DynamoDbEncryptionTransformsException(message := "bar = 890; sortKey = 030104")
              ],
@@ -209,7 +209,7 @@ module QueryTransformTest {
     expect transformed_scan.error ==
            AwsCryptographyDbEncryptionSdkDynamoDbTransformsTypes.Error.CollectionOfErrors(
              [
-               AwsCryptographyDbEncryptionSdkDynamoDbTransformsTypes.Error.AwsCryptographyDbEncryptionSdkDynamoDbItemEncryptor(AwsCryptographyDbEncryptionSdkDynamoDbItemEncryptorTypes.Error.AwsCryptographyDbEncryptionSdkDynamoDb(AwsCryptographyDbEncryptionSdkDynamoDbTypes.Error.AwsCryptographyDbEncryptionSdkStructuredEncryption(AwsCryptographyDbEncryptionSdkStructuredEncryptionTypes.Error.StructuredEncryptionException(message := "No recipient tag matched.")))),
+               AwsCryptographyDbEncryptionSdkDynamoDbTransformsTypes.Error.AwsCryptographyDbEncryptionSdkDynamoDbItemEncryptor(AwsCryptographyDbEncryptionSdkDynamoDbItemEncryptorTypes.Error.AwsCryptographyDbEncryptionSdkDynamoDb(AwsCryptographyDbEncryptionSdkDynamoDbTypes.Error.AwsCryptographyDbEncryptionSdkStructuredEncryption(AwsCryptographyDbEncryptionSdkStructuredEncryptionTypes.Error.StructuredEncryptionException(message := "Signature of record does not match the signature computed when the record was encrypted.")))),
                AwsCryptographyDbEncryptionSdkDynamoDbTransformsTypes.Error.DynamoDbEncryptionTransformsException(message := "bar = 1234; sortKey = 01020304"),
                AwsCryptographyDbEncryptionSdkDynamoDbTransformsTypes.Error.DynamoDbEncryptionTransformsException(message := "bar = 890; sortKey = 030104")
              ],
diff --git a/DynamoDbEncryption/dafny/StructuredEncryption/src/Footer.dfy b/DynamoDbEncryption/dafny/StructuredEncryption/src/Footer.dfy
@@ -118,7 +118,7 @@ module StructuredEncryptionFooter {
       //= specification/structured-encryption/footer.md#recipient-tag-verification
       //# Verification MUST fail unless at least one of the [Recipient Tags](#recipient-tags)
       //# matches a calculated recipient tag using the provided symmetricSigningKey.
-      :- Need(foundTag, E("No recipient tag matched."));
+      :- Need(foundTag, E("Signature of record does not match the signature computed when the record was encrypted."));
 
       :- Need(sig.Some? == mat.algorithmSuite.signature.ECDSA?, E("Internal error. Signature both does and does not exist."));
       //= specification/structured-encryption/footer.md#signature-verification
diff --git a/DynamoDbEncryption/runtimes/net/AssemblyInfo.cs b/DynamoDbEncryption/runtimes/net/AssemblyInfo.cs
@@ -3,5 +3,5 @@
 [assembly: AssemblyTitle("AWS.Cryptography.DbEncryptionSDK.DynamoDb")]
 
 // This should be kept in sync with the version number in MPL.csproj
-[assembly: AssemblyVersion("3.6.0")]
+[assembly: AssemblyVersion("3.6.1")]
 
diff --git a/DynamoDbEncryption/runtimes/net/DynamoDbEncryption.csproj b/DynamoDbEncryption/runtimes/net/DynamoDbEncryption.csproj
@@ -5,7 +5,7 @@
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <IsPackable>true</IsPackable>
 
-    <Version>3.6.0</Version>
+    <Version>3.6.1</Version>
 
     <AssemblyName>AWS.Cryptography.DbEncryptionSDK.DynamoDb</AssemblyName>
     <PackageId>AWS.Cryptography.DbEncryptionSDK.DynamoDb</PackageId>
diff --git a/project.properties b/project.properties
@@ -1,4 +1,4 @@
-projectJavaVersion=3.6.0-SNAPSHOT
+projectJavaVersion=3.6.1
 mplDependencyJavaVersion=1.5.1
 dafnyVersion=4.2.0
 dafnyVerifyVersion=4.7.0

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-projectJavaVersion=3.6.0-SNAPSHOT`
	`1`	`+projectJavaVersion=3.6.1`
`2`	`2`	`mplDependencyJavaVersion=1.5.1`
`3`	`3`	`dafnyVersion=4.2.0`
`4`	`4`	`dafnyVerifyVersion=4.7.0`