Skip to content

Commit dcaa266

Browse files
ajewellamzajewellamz
authored
chore: bump MPL version (#778)
1 parent 2ea5e47 commit dcaa266

File tree

4 files changed

+140
-61
lines changed

4 files changed

+140
-61
lines changed

‎TestVectors/dafny/TestVectors/test/perf-encrypt-manifest.json‎

Lines changed: 111 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,117 @@
11
{
2-
"manifest": {
3-
"type": "awses-encrypt",
4-
"version": 5
2+
"manifest": {
3+
"type": "awses-encrypt",
4+
"version": 5
5+
},
6+
"client": {
7+
"name": "aws-encryption-sdk-dafny",
8+
"version": "4.1.0"
9+
},
10+
"keys": "file://keys.json",
11+
"plaintexts": {
12+
"large": 1000000,
13+
"giant": 100000000
14+
},
15+
"tests": {
16+
"giant-raw-rsa": {
17+
"encryption-scenario": {
18+
"type": "positive-esdk",
19+
"plaintext": "giant",
20+
"description": "Generated RawRSA rsa-4096",
21+
"algorithmSuiteId": "0146",
22+
"frame-size": 512,
23+
"encryptKeyDescription": {
24+
"type": "raw",
25+
"key": "rsa-4096-public",
26+
"provider-id": "aws-raw-vectors-persistent-rsa-4096",
27+
"encryption-algorithm": "rsa",
28+
"padding-algorithm": "oaep-mgf1",
29+
"padding-hash": "sha384"
30+
},
31+
"decryptKeyDescription": {
32+
"type": "raw",
33+
"key": "rsa-4096-private",
34+
"provider-id": "aws-raw-vectors-persistent-rsa-4096",
35+
"encryption-algorithm": "rsa",
36+
"padding-algorithm": "oaep-mgf1",
37+
"padding-hash": "sha384"
38+
},
39+
"encryption-context": {},
40+
"reproduced-encryption-context": {}
41+
}
542
},
6-
"client": {
7-
"name": "aws-encryption-sdk-dafny",
8-
"version": "4.1.0"
43+
"giant-raw-rsa-tiny-frame": {
44+
"encryption-scenario": {
45+
"type": "positive-esdk",
46+
"plaintext": "large",
47+
"description": "Generated RawRSA rsa-4096",
48+
"algorithmSuiteId": "0146",
49+
"frame-size": 4,
50+
"encryptKeyDescription": {
51+
"type": "raw",
52+
"key": "rsa-4096-public",
53+
"provider-id": "aws-raw-vectors-persistent-rsa-4096",
54+
"encryption-algorithm": "rsa",
55+
"padding-algorithm": "oaep-mgf1",
56+
"padding-hash": "sha384"
57+
},
58+
"decryptKeyDescription": {
59+
"type": "raw",
60+
"key": "rsa-4096-private",
61+
"provider-id": "aws-raw-vectors-persistent-rsa-4096",
62+
"encryption-algorithm": "rsa",
63+
"padding-algorithm": "oaep-mgf1",
64+
"padding-hash": "sha384"
65+
},
66+
"encryption-context": {},
67+
"reproduced-encryption-context": {}
68+
}
969
},
10-
"keys": "file://keys.json",
11-
"plaintexts": {
12-
"large": 1000000,
13-
"giant": 100000000
70+
"giant-raw-aes-256": {
71+
"encryption-scenario": {
72+
"type": "positive-esdk",
73+
"plaintext": "giant",
74+
"description": "Generated RawAES aes-256",
75+
"algorithmSuiteId": "0078",
76+
"frame-size": 512,
77+
"encryptKeyDescription": {
78+
"type": "raw",
79+
"key": "aes-256",
80+
"provider-id": "aws-raw-vectors-persistent-aes-256",
81+
"encryption-algorithm": "aes"
82+
},
83+
"decryptKeyDescription": {
84+
"type": "raw",
85+
"key": "aes-256",
86+
"provider-id": "aws-raw-vectors-persistent-aes-256",
87+
"encryption-algorithm": "aes"
88+
},
89+
"encryption-context": {},
90+
"reproduced-encryption-context": {}
91+
}
1492
},
15-
"tests": {
16-
"giant-raw-aes-256": {
17-
"encryption-scenario": {
18-
"type": "positive-esdk",
19-
"plaintext": "giant",
20-
"description": "Generated RawAES aes-256",
21-
"algorithmSuiteId": "0078",
22-
"frame-size": 512,
23-
"encryptKeyDescription": {
24-
"type": "raw",
25-
"key": "aes-256",
26-
"provider-id": "aws-raw-vectors-persistent-aes-256",
27-
"encryption-algorithm": "aes"
28-
},
29-
"decryptKeyDescription": {
30-
"type": "raw",
31-
"key": "aes-256",
32-
"provider-id": "aws-raw-vectors-persistent-aes-256",
33-
"encryption-algorithm": "aes"
34-
},
35-
"encryption-context": {},
36-
"reproduced-encryption-context": {}
37-
}
38-
},
39-
"giant-raw-aes-256-tiny-frame": {
40-
"encryption-scenario": {
41-
"type": "positive-esdk",
42-
"plaintext": "large",
43-
"description": "Generated RawAES aes-256",
44-
"algorithmSuiteId": "0078",
45-
"frame-size": 4,
46-
"encryptKeyDescription": {
47-
"type": "raw",
48-
"key": "aes-256",
49-
"provider-id": "aws-raw-vectors-persistent-aes-256",
50-
"encryption-algorithm": "aes"
51-
},
52-
"decryptKeyDescription": {
53-
"type": "raw",
54-
"key": "aes-256",
55-
"provider-id": "aws-raw-vectors-persistent-aes-256",
56-
"encryption-algorithm": "aes"
57-
},
58-
"encryption-context": {},
59-
"reproduced-encryption-context": {}
60-
}
61-
}
93+
"giant-raw-aes-256-tiny-frame": {
94+
"encryption-scenario": {
95+
"type": "positive-esdk",
96+
"plaintext": "large",
97+
"description": "Generated RawAES aes-256",
98+
"algorithmSuiteId": "0078",
99+
"frame-size": 4,
100+
"encryptKeyDescription": {
101+
"type": "raw",
102+
"key": "aes-256",
103+
"provider-id": "aws-raw-vectors-persistent-aes-256",
104+
"encryption-algorithm": "aes"
105+
},
106+
"decryptKeyDescription": {
107+
"type": "raw",
108+
"key": "aes-256",
109+
"provider-id": "aws-raw-vectors-persistent-aes-256",
110+
"encryption-algorithm": "aes"
111+
},
112+
"encryption-context": {},
113+
"reproduced-encryption-context": {}
114+
}
62115
}
116+
}
63117
}

‎TestVectors/dafny/TestVectors/test/thousand-encrypt-manifest.json‎

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,33 @@
3535
"reproduced-encryption-context": {}
3636
}
3737
},
38+
"small-rsa-4096": {
39+
"encryption-scenario": {
40+
"type": "positive-esdk",
41+
"plaintext": "small",
42+
"description": "Generated RawRSA rsa-4096",
43+
"algorithmSuiteId": "0146",
44+
"frame-size": 512,
45+
"encryptKeyDescription": {
46+
"type": "raw",
47+
"key": "rsa-4096-public",
48+
"provider-id": "aws-raw-vectors-persistent-rsa-4096",
49+
"encryption-algorithm": "rsa",
50+
"padding-algorithm": "oaep-mgf1",
51+
"padding-hash": "sha512"
52+
},
53+
"decryptKeyDescription": {
54+
"type": "raw",
55+
"key": "rsa-4096-private",
56+
"provider-id": "aws-raw-vectors-persistent-rsa-4096",
57+
"encryption-algorithm": "rsa",
58+
"padding-algorithm": "oaep-mgf1",
59+
"padding-hash": "sha512"
60+
},
61+
"encryption-context": {},
62+
"reproduced-encryption-context": {}
63+
}
64+
},
3865
"small-aws-kms-hierarchy": {
3966
"encryption-scenario": {
4067
"type": "positive-esdk",
@@ -84,4 +111,4 @@
84111
}
85112
}
86113
}
87-
}
114+
}

‎TestVectors/runtimes/python/src/aws_encryption_sdk_test_vectors/internaldafny/extern/wrapped_esdk.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ def Encrypt(self, dafny_encrypt_input):
7070
mkp_flag = False
7171
if "MASTERKEY" in sys.argv:
7272
mkp_flag = True
73-
print("mkp_flag:", mkp_flag)
7473
mkp = None
7574
if native_encrypt_input.keyring is not None:
7675
if mkp_flag:
@@ -127,7 +126,6 @@ def Decrypt(self, dafny_decrypt_input):
127126
mkp_flag = False
128127
if "MASTERKEY" in sys.argv:
129128
mkp_flag = True
130-
print("mkp_flag:", mkp_flag)
131129
native_esdk_input = {}
132130
mkp = None
133131
if native_decrypt_input.keyring is not None:

‎mpl‎

Submodule mpl updated from 515995e to 1c29322

0 commit comments

Comments
 (0)