Skip to content

Commit 3d8acae

Browse files
authored
chore: Update MPL to 1.3.0 (#972)
* chore: Update MPL to 1.3.0
1 parent 2796693 commit 3d8acae

File tree

5 files changed

+14
-11
lines changed

5 files changed

+14
-11
lines changed

DynamoDbEncryption/dafny/DynamoDbItemEncryptor/src/Index.dfy

+7
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,13 @@ module
214214

215215
var client := new DynamoDbItemEncryptorClient(internalConfig);
216216

217+
assert fresh(client.History);
218+
assert client.Modifies == Operations.ModifiesInternalConfig(internalConfig) + {client.History};
219+
assert Operations.ModifiesInternalConfig(internalConfig) ==
220+
internalConfig.cmm.Modifies
221+
+ internalConfig.structuredEncryption.Modifies
222+
+ internalConfig.cmpClient.Modifies;
223+
217224
assert fresh(client.Modifies
218225
- ( if config.keyring.Some? then config.keyring.value.Modifies else {})
219226
- ( if config.cmm.Some? then config.cmm.value.Modifies else {} )

TestVectors/dafny/DDBEncryption/src/JsonConfig.dfy

+5-5
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ module {:options "-functionSyntax:4"} JsonConfig {
3333
import DynamoDbItemEncryptor
3434

3535

36-
const DEFAULT_KEYS := "../../../submodules/MaterialProviders/TestVectorsAwsCryptographicMaterialProviders/dafny/TestVectorsAwsCryptographicMaterialProviders/test/keys.json"
36+
const DEFAULT_KEYS : string := "../../../submodules/MaterialProviders/TestVectorsAwsCryptographicMaterialProviders/dafny/TestVectorsAwsCryptographicMaterialProviders/test/keys.json"
3737

3838
predicate IsValidInt32(x: int) { -0x8000_0000 <= x < 0x8000_0000}
3939
type ConfigName = string
@@ -298,7 +298,7 @@ module {:options "-functionSyntax:4"} JsonConfig {
298298

299299
var keys :- expect KeyVectors.KeyVectors(
300300
KeyVectorsTypes.KeyVectorsConfig(
301-
keyManifiestPath := DEFAULT_KEYS
301+
keyManifestPath := DEFAULT_KEYS
302302
)
303303
);
304304
var keyDescription :-
@@ -311,7 +311,7 @@ module {:options "-functionSyntax:4"} JsonConfig {
311311
.MapFailure(ParseJsonManifests.ErrorToString);
312312
Success(keyOut.keyDescription);
313313

314-
var keyring :- expect keys.CreateWappedTestVectorKeyring(KeyVectorsTypes.TestVectorKeyringInput(keyDescription := keyDescription));
314+
var keyring :- expect keys.CreateWrappedTestVectorKeyring(KeyVectorsTypes.TestVectorKeyringInput(keyDescription := keyDescription));
315315

316316
var encryptorConfig :=
317317
ENC.DynamoDbItemEncryptorConfig(
@@ -402,7 +402,7 @@ module {:options "-functionSyntax:4"} JsonConfig {
402402

403403
var keys :- expect KeyVectors.KeyVectors(
404404
KeyVectorsTypes.KeyVectorsConfig(
405-
keyManifiestPath := DEFAULT_KEYS
405+
keyManifestPath := DEFAULT_KEYS
406406
)
407407
);
408408
var keyDescription :-
@@ -415,7 +415,7 @@ module {:options "-functionSyntax:4"} JsonConfig {
415415
.MapFailure(ParseJsonManifests.ErrorToString);
416416
Success(keyOut.keyDescription);
417417

418-
var keyring :- expect keys.CreateWappedTestVectorKeyring(KeyVectorsTypes.TestVectorKeyringInput(keyDescription := keyDescription));
418+
var keyring :- expect keys.CreateWrappedTestVectorKeyring(KeyVectorsTypes.TestVectorKeyringInput(keyDescription := keyDescription));
419419

420420
var config :=
421421
Types.DynamoDbTableEncryptionConfig(

TestVectors/dafny/DDBEncryption/src/TestVectors.dfy

-4
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,8 @@ module {:options "-functionSyntax:4"} DdbEncryptionTestVectors {
3131
import DDB = ComAmazonawsDynamodbTypes
3232
import Filter = DynamoDBFilterExpr
3333
import SE = AwsCryptographyDbEncryptionSdkStructuredEncryptionTypes
34-
import SKS = CreateStaticKeyStores
35-
import KeyMaterial
3634
import UTF8
37-
import KeyVectorsTypes = AwsCryptographyMaterialProvidersTestVectorKeysTypes
3835
import CMP = AwsCryptographyMaterialProvidersTypes
39-
import KeyVectors
4036
import CreateInterceptedDDBClient
4137
import SortedSets
4238
import Seq

project.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
projectJavaVersion=3.3.0
2-
mplDependencyJavaVersion=1.2.0
2+
mplDependencyJavaVersion=1.3.0
33
dafnyRuntimeJavaVersion=4.2.0
44
smithyDafnyJavaConversionVersion=0.1

0 commit comments

Comments
 (0)