aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoss Kettleson <kettro@google.com>2020-05-13 13:55:00 -0700
committerRoss Kettleson <kettro@google.com>2020-05-13 13:58:44 -0700
commit2e402d69539ca312f253161cc6493ac49e2e235c (patch)
tree5b82e4a4ede1a2f01ec29db16f7317dcd60a47ea
parentb0dbb7cf582406cfeb447c8ff07d1fbcb988413d (diff)
downloadgeneric-2e402d69539ca312f253161cc6493ac49e2e235c.tar.gz
CAVP: Add AES-GCM proto messages
Background: We need a message that we can use to communicate info about GCM New Stuff: * GCM Test and TestResult messages for doing encrypt/decrypt simulultaneously. Notes/Caveats: * There is also a AesGcmEncrypt message already there, but it doesn't let us do decryption, so I'm ditching it. Bug: 156128617 Test: bazel run cavptests Signed-off-by: Ross Kettleson <kettro@google.com> Change-Id: I71a3cf37a94f652140a1631092b2ceaf670792a0
-rw-r--r--nugget/proto/nugget/app/protoapi/testing_api.proto20
1 files changed, 20 insertions, 0 deletions
diff --git a/nugget/proto/nugget/app/protoapi/testing_api.proto b/nugget/proto/nugget/app/protoapi/testing_api.proto
index 8333f42..62d9369 100644
--- a/nugget/proto/nugget/app/protoapi/testing_api.proto
+++ b/nugget/proto/nugget/app/protoapi/testing_api.proto
@@ -32,6 +32,7 @@ enum OneofTestParametersCase {
kAesCavpMctCbcTest = 9;
kAesCavpMctEcbTest = 10;
kAesCavpMctCtrTest = 11;
+ kCavpAesGcmTest = 12;
}
// TODO remove this when oneof support is added to nanopb
@@ -43,6 +44,7 @@ enum OneofTestResultsCase {
kAesCmacTestResult = 4;
kFullStressResult = 5;
kAesCavpTestResult = 6;
+ kCavpAesGcmTestResult = 7;
}
message AesCbcEncryptTest {
@@ -95,6 +97,24 @@ message AesCavpTestResult {
bytes text = 2;
}
+message CavpAesGcmTest {
+ uint32 count = 1;
+ uint32 key_len = 2;
+ uint32 tag_len = 3;
+ CavpEncryptMode encrypt_mode = 4;
+ bytes key = 5;
+ bytes iv = 6;
+ bytes text = 7;
+ bytes aad = 8;
+ bytes tag = 9;
+}
+
+message CavpAesGcmTestResult {
+ DcryptError result_code = 1;
+ bytes text = 2;
+ bytes tag = 3;
+}
+
message TrngTest {
uint32 number_of_bytes = 1;
}