diff --git a/TestVectors/dafny/DDBEncryption/src/DecryptManifest.dfy b/TestVectors/dafny/DDBEncryption/src/DecryptManifest.dfy index f68489003..e751c291d 100644 --- a/TestVectors/dafny/DDBEncryption/src/DecryptManifest.dfy +++ b/TestVectors/dafny/DDBEncryption/src/DecryptManifest.dfy @@ -21,6 +21,7 @@ module {:options "-functionSyntax:4"} DecryptManifest { import JsonConfig import ENC = AwsCryptographyDbEncryptionSdkDynamoDbItemEncryptorTypes import KeyVectors + import OsLang method OnePositiveTest(name : string, config : JSON, encrypted : JSON, plaintext : JSON, keys : KeyVectors.KeyVectorsClient) returns (output : Result) @@ -110,6 +111,14 @@ module {:options "-functionSyntax:4"} DecryptManifest { } } + function LogFileName() : string + { + if OsLang.GetOsShort() == "Windows" && OsLang.GetLanguageShort() == "Dotnet" then + "..\\..\\PerfLog.txt" + else + "../../PerfLog.txt" + } + method Decrypt(inFile : string, keyVectors: KeyVectors.KeyVectorsClient) returns (output : Result) requires keyVectors.ValidState() @@ -167,11 +176,13 @@ module {:options "-functionSyntax:4"} DecryptManifest { } } + var time := Time.GetAbsoluteTime(); for i := 0 to |tests.value| { var obj := tests.value[i]; :- Need(obj.1.Object?, "Value of test '" + obj.0 + "' must be an Object."); var _ :- OneTest(obj.0, obj.1, keyVectors); } + Time.PrintTimeSinceLong(time, "DB-ESDK-TV-Decrypt-" + inFile, Some(LogFileName())); timeStamp :- expect Time.GetCurrentTimeStamp(); print timeStamp + " Tests Complete.\n"; diff --git a/submodules/MaterialProviders b/submodules/MaterialProviders index ccd56cfae..416d8e308 160000 --- a/submodules/MaterialProviders +++ b/submodules/MaterialProviders @@ -1 +1 @@ -Subproject commit ccd56cfae7c784e3c852d1f4bcc0b7127525f7d8 +Subproject commit 416d8e30852666de86c92965abfb805564da230c