Skip to content

chore: bump MPL version #778

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ajewellamz merged 2 commits into from
Apr 17, 2025
Merged

chore: bump MPL version #778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1d125f
chore: bump MPL version
ajewellamz Apr 17, 2025
639d9d5
m
ajewellamz Apr 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
168 changes: 111 additions & 57 deletions TestVectors/dafny/TestVectors/test/perf-encrypt-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,63 +1,117 @@
{
"manifest": {
"type": "awses-encrypt",
"version": 5
"manifest": {
"type": "awses-encrypt",
"version": 5
},
"client": {
"name": "aws-encryption-sdk-dafny",
"version": "4.1.0"
},
"keys": "file://keys.json",
"plaintexts": {
"large": 1000000,
"giant": 100000000
},
"tests": {
"giant-raw-rsa": {
"encryption-scenario": {
"type": "positive-esdk",
"plaintext": "giant",
"description": "Generated RawRSA rsa-4096",
"algorithmSuiteId": "0146",
"frame-size": 512,
"encryptKeyDescription": {
"type": "raw",
"key": "rsa-4096-public",
"provider-id": "aws-raw-vectors-persistent-rsa-4096",
"encryption-algorithm": "rsa",
"padding-algorithm": "oaep-mgf1",
"padding-hash": "sha384"
},
"decryptKeyDescription": {
"type": "raw",
"key": "rsa-4096-private",
"provider-id": "aws-raw-vectors-persistent-rsa-4096",
"encryption-algorithm": "rsa",
"padding-algorithm": "oaep-mgf1",
"padding-hash": "sha384"
},
"encryption-context": {},
"reproduced-encryption-context": {}
}
},
"client": {
"name": "aws-encryption-sdk-dafny",
"version": "4.1.0"
"giant-raw-rsa-tiny-frame": {
"encryption-scenario": {
"type": "positive-esdk",
"plaintext": "large",
"description": "Generated RawRSA rsa-4096",
"algorithmSuiteId": "0146",
"frame-size": 4,
"encryptKeyDescription": {
"type": "raw",
"key": "rsa-4096-public",
"provider-id": "aws-raw-vectors-persistent-rsa-4096",
"encryption-algorithm": "rsa",
"padding-algorithm": "oaep-mgf1",
"padding-hash": "sha384"
},
"decryptKeyDescription": {
"type": "raw",
"key": "rsa-4096-private",
"provider-id": "aws-raw-vectors-persistent-rsa-4096",
"encryption-algorithm": "rsa",
"padding-algorithm": "oaep-mgf1",
"padding-hash": "sha384"
},
"encryption-context": {},
"reproduced-encryption-context": {}
}
},
"keys": "file://keys.json",
"plaintexts": {
"large": 1000000,
"giant": 100000000
"giant-raw-aes-256": {
"encryption-scenario": {
"type": "positive-esdk",
"plaintext": "giant",
"description": "Generated RawAES aes-256",
"algorithmSuiteId": "0078",
"frame-size": 512,
"encryptKeyDescription": {
"type": "raw",
"key": "aes-256",
"provider-id": "aws-raw-vectors-persistent-aes-256",
"encryption-algorithm": "aes"
},
"decryptKeyDescription": {
"type": "raw",
"key": "aes-256",
"provider-id": "aws-raw-vectors-persistent-aes-256",
"encryption-algorithm": "aes"
},
"encryption-context": {},
"reproduced-encryption-context": {}
}
},
"tests": {
"giant-raw-aes-256": {
"encryption-scenario": {
"type": "positive-esdk",
"plaintext": "giant",
"description": "Generated RawAES aes-256",
"algorithmSuiteId": "0078",
"frame-size": 512,
"encryptKeyDescription": {
"type": "raw",
"key": "aes-256",
"provider-id": "aws-raw-vectors-persistent-aes-256",
"encryption-algorithm": "aes"
},
"decryptKeyDescription": {
"type": "raw",
"key": "aes-256",
"provider-id": "aws-raw-vectors-persistent-aes-256",
"encryption-algorithm": "aes"
},
"encryption-context": {},
"reproduced-encryption-context": {}
}
},
"giant-raw-aes-256-tiny-frame": {
"encryption-scenario": {
"type": "positive-esdk",
"plaintext": "large",
"description": "Generated RawAES aes-256",
"algorithmSuiteId": "0078",
"frame-size": 4,
"encryptKeyDescription": {
"type": "raw",
"key": "aes-256",
"provider-id": "aws-raw-vectors-persistent-aes-256",
"encryption-algorithm": "aes"
},
"decryptKeyDescription": {
"type": "raw",
"key": "aes-256",
"provider-id": "aws-raw-vectors-persistent-aes-256",
"encryption-algorithm": "aes"
},
"encryption-context": {},
"reproduced-encryption-context": {}
}
}
"giant-raw-aes-256-tiny-frame": {
"encryption-scenario": {
"type": "positive-esdk",
"plaintext": "large",
"description": "Generated RawAES aes-256",
"algorithmSuiteId": "0078",
"frame-size": 4,
"encryptKeyDescription": {
"type": "raw",
"key": "aes-256",
"provider-id": "aws-raw-vectors-persistent-aes-256",
"encryption-algorithm": "aes"
},
"decryptKeyDescription": {
"type": "raw",
"key": "aes-256",
"provider-id": "aws-raw-vectors-persistent-aes-256",
"encryption-algorithm": "aes"
},
"encryption-context": {},
"reproduced-encryption-context": {}
}
}
}
}
29 changes: 28 additions & 1 deletion TestVectors/dafny/TestVectors/test/thousand-encrypt-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,33 @@
"reproduced-encryption-context": {}
}
},
"small-rsa-4096": {
"encryption-scenario": {
"type": "positive-esdk",
"plaintext": "small",
"description": "Generated RawRSA rsa-4096",
"algorithmSuiteId": "0146",
"frame-size": 512,
"encryptKeyDescription": {
"type": "raw",
"key": "rsa-4096-public",
"provider-id": "aws-raw-vectors-persistent-rsa-4096",
"encryption-algorithm": "rsa",
"padding-algorithm": "oaep-mgf1",
"padding-hash": "sha512"
},
"decryptKeyDescription": {
"type": "raw",
"key": "rsa-4096-private",
"provider-id": "aws-raw-vectors-persistent-rsa-4096",
"encryption-algorithm": "rsa",
"padding-algorithm": "oaep-mgf1",
"padding-hash": "sha512"
},
"encryption-context": {},
"reproduced-encryption-context": {}
}
},
"small-aws-kms-hierarchy": {
"encryption-scenario": {
"type": "positive-esdk",
Expand Down Expand Up @@ -84,4 +111,4 @@
}
}
}
}
}
2 changes: 0 additions & 2 deletions .../runtimes/python/src/aws_encryption_sdk_test_vectors/internaldafny/extern/wrapped_esdk.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ def Encrypt(self, dafny_encrypt_input):
mkp_flag = False
if "MASTERKEY" in sys.argv:
mkp_flag = True
print("mkp_flag:", mkp_flag)
mkp = None
if native_encrypt_input.keyring is not None:
if mkp_flag:
Expand Down Expand Up @@ -127,7 +126,6 @@ def Decrypt(self, dafny_decrypt_input):
mkp_flag = False
if "MASTERKEY" in sys.argv:
mkp_flag = True
print("mkp_flag:", mkp_flag)
native_esdk_input = {}
mkp = None
if native_decrypt_input.keyring is not None:
Expand Down
2 changes: 1 addition & 1 deletion mpl
Open in desktop
Submodule mpl updated from 515995 to 1c2932