From c70085a17dc9bc8112b5c2416f383bad1b18c1af Mon Sep 17 00:00:00 2001 From: Andy Jewell Date: Tue, 19 Mar 2024 11:39:18 -0400 Subject: [PATCH 1/3] chore: bump version number from 3.2 to 3.3 --- DynamoDbEncryption/runtimes/net/AssemblyInfo.cs | 2 +- DynamoDbEncryption/runtimes/net/DynamoDbEncryption.csproj | 2 +- TestVectors/dafny/DDBEncryption/src/TestVectors.dfy | 8 ++++---- .../{decrypt_dotnet_42.json => decrypt_dotnet_32.json} | 0 .../{decrypt_dotnet_43.json => decrypt_dotnet_33.json} | 0 .../java/{decrypt_java_42.json => decrypt_java_32.json} | 0 .../java/{decrypt_java_43.json => decrypt_java_33.json} | 0 project.properties | 2 +- 8 files changed, 7 insertions(+), 7 deletions(-) rename TestVectors/runtimes/java/{decrypt_dotnet_42.json => decrypt_dotnet_32.json} (100%) rename TestVectors/runtimes/java/{decrypt_dotnet_43.json => decrypt_dotnet_33.json} (100%) rename TestVectors/runtimes/java/{decrypt_java_42.json => decrypt_java_32.json} (100%) rename TestVectors/runtimes/java/{decrypt_java_43.json => decrypt_java_33.json} (100%) diff --git a/DynamoDbEncryption/runtimes/net/AssemblyInfo.cs b/DynamoDbEncryption/runtimes/net/AssemblyInfo.cs index 5eb534c40..16d8ce650 100644 --- 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.2.0")] +[assembly: AssemblyVersion("3.3.0")] diff --git a/DynamoDbEncryption/runtimes/net/DynamoDbEncryption.csproj b/DynamoDbEncryption/runtimes/net/DynamoDbEncryption.csproj index 60f0c76d3..45b1ef992 100644 --- a/DynamoDbEncryption/runtimes/net/DynamoDbEncryption.csproj +++ b/DynamoDbEncryption/runtimes/net/DynamoDbEncryption.csproj @@ -5,7 +5,7 @@ false true - 3.2.0 + 3.3.0 AWS.Cryptography.DbEncryptionSDK.DynamoDb AWS.Cryptography.DbEncryptionSDK.DynamoDb diff --git a/TestVectors/dafny/DDBEncryption/src/TestVectors.dfy b/TestVectors/dafny/DDBEncryption/src/TestVectors.dfy index d5b3416fb..39615e648 100644 --- a/TestVectors/dafny/DDBEncryption/src/TestVectors.dfy +++ b/TestVectors/dafny/DDBEncryption/src/TestVectors.dfy @@ -86,10 +86,10 @@ module {:options "-functionSyntax:4"} DdbEncryptionTestVectors { print |roundTripTests[1].configs|, " configs and ", |roundTripTests[1].records|, " records for round trip.\n"; } - var _ :- expect DecryptManifest.Decrypt("decrypt_dotnet_42.json"); - var _ :- expect DecryptManifest.Decrypt("decrypt_java_42.json"); - var _ :- expect DecryptManifest.Decrypt("decrypt_dotnet_43.json"); - var _ :- expect DecryptManifest.Decrypt("decrypt_java_43.json"); + var _ :- expect DecryptManifest.Decrypt("decrypt_dotnet_32.json"); + var _ :- expect DecryptManifest.Decrypt("decrypt_java_32.json"); + var _ :- expect DecryptManifest.Decrypt("decrypt_dotnet_33.json"); + var _ :- expect DecryptManifest.Decrypt("decrypt_java_33.json"); var _ :- expect WriteManifest.Write("encrypt.json"); var _ :- expect EncryptManifest.Encrypt("encrypt.json", "decrypt.json", "java", "3.2"); var _ :- expect DecryptManifest.Decrypt("decrypt.json"); diff --git a/TestVectors/runtimes/java/decrypt_dotnet_42.json b/TestVectors/runtimes/java/decrypt_dotnet_32.json similarity index 100% rename from TestVectors/runtimes/java/decrypt_dotnet_42.json rename to TestVectors/runtimes/java/decrypt_dotnet_32.json diff --git a/TestVectors/runtimes/java/decrypt_dotnet_43.json b/TestVectors/runtimes/java/decrypt_dotnet_33.json similarity index 100% rename from TestVectors/runtimes/java/decrypt_dotnet_43.json rename to TestVectors/runtimes/java/decrypt_dotnet_33.json diff --git a/TestVectors/runtimes/java/decrypt_java_42.json b/TestVectors/runtimes/java/decrypt_java_32.json similarity index 100% rename from TestVectors/runtimes/java/decrypt_java_42.json rename to TestVectors/runtimes/java/decrypt_java_32.json diff --git a/TestVectors/runtimes/java/decrypt_java_43.json b/TestVectors/runtimes/java/decrypt_java_33.json similarity index 100% rename from TestVectors/runtimes/java/decrypt_java_43.json rename to TestVectors/runtimes/java/decrypt_java_33.json diff --git a/project.properties b/project.properties index 7ed9c6492..30877786f 100644 --- a/project.properties +++ b/project.properties @@ -1,4 +1,4 @@ -projectJavaVersion=3.2.0 +projectJavaVersion=3.3.0 mplDependencyJavaVersion=1.2.0 dafnyRuntimeJavaVersion=4.2.0 smithyDafnyJavaConversionVersion=0.1 From 2f5c9e19dc5cc33eff1695df5323a839e686d870 Mon Sep 17 00:00:00 2001 From: Andy Jewell Date: Tue, 19 Mar 2024 12:24:28 -0400 Subject: [PATCH 2/3] ChangeLog --- CHANGELOG.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f9b14eb00..628689b82 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # Changelog +## 3.2.0 2024-03-20 + +### Features + +- A fourth Crypto Action will be made available : `SIGN_AND_INCLUDE_IN_ENCRYPTION_CONTEXT`, to join the existing `DO_NOTHING`, `SIGN_ONLY` and `ENCRYPT_AND_SIGN`. `SIGN_AND_INCLUDE_IN_ENCRYPTION_CONTEXT` behaves like `SIGN_ONLY`, but also includes the value in the encryption context, making it available to the branch key selector. +- The Parsed Header, returned from EncryptItem and DecryptItem, now returns two more fields + - encryptionContext : the full encryption context used for encryption + - selectorContext : the encryption context as presented to the branch key selector +- The Java Enhanced Client now supports Single Table Design. When using the DynamoDbEnhancedTableEncryptionConfig builder, one can now specify `schemaOnEncrypt` multiple times, once for each class being modeled in the table. + ## 3.2.0 2024-01-16 ### Features @@ -15,7 +25,7 @@ - New APIs : ResolveAttributes and GetVirtualFields to assist in development and debugging. ### Fix - - String compare for client side filtering of Scan and Query results could somtimes produce the wrong result for certain characters. + - String compare for client side filtering of Scan and Query results could sometimes produce the wrong result for certain characters. ## 3.1.2 2023-11-13 From 9431ece942ea0cdacc2483b55aa8cb12a1f9e810 Mon Sep 17 00:00:00 2001 From: Andy Jewell Date: Tue, 19 Mar 2024 12:39:05 -0400 Subject: [PATCH 3/3] mention limit removal in changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 628689b82..8480918d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - encryptionContext : the full encryption context used for encryption - selectorContext : the encryption context as presented to the branch key selector - The Java Enhanced Client now supports Single Table Design. When using the DynamoDbEnhancedTableEncryptionConfig builder, one can now specify `schemaOnEncrypt` multiple times, once for each class being modeled in the table. +- There was a hard limit of 100 on the size of maps and lists in Items to be encrypted. This limit has been removed. ## 3.2.0 2024-01-16