commit e95af920f9f385f850ab6324a69ffde533fe4242
author android-build-team Robot <android-build-team-robot@google.com> Sat Jun 27 01:02:30 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sat Jun 27 01:02:30 2020 +0000
tree 80641c5a501175c0baa9522a74f46aa3fd43d64f
parent d6a44c742057809c97ba0b45c3a5c19a9c71c77c
parent 3f4723dce080b20200a935a4cef1ec4824ed8434

Snap for 6634012 from 3f4723dce080b20200a935a4cef1ec4824ed8434 to rvc-release

Change-Id: I6b70de2c0a86bb0e5f33e0377b64b7865299c831

nugget/proto/nugget/app/protoapi/testing_api.proto

diff --git a/nugget/proto/nugget/app/protoapi/testing_api.proto b/nugget/proto/nugget/app/protoapi/testing_api.proto
index e88fb37..c1c271f 100644
--- a/nugget/proto/nugget/app/protoapi/testing_api.proto
+++ b/nugget/proto/nugget/app/protoapi/testing_api.proto
@@ -46,6 +46,7 @@
   kCavpEcdsaPkvTest = 22;
   kCavpEcdsaSigGenTest = 23;
   kCavpEcdsaSigVerTest = 24;
+  kCavpCmacGenTest = 25;
 }
 
 // TODO remove this when oneof support is added to nanopb
@@ -69,6 +70,7 @@
   kCavpEcdsaPkvTestResult = 16;
   kCavpEcdsaSigGenTestResult = 17;
   kCavpEcdsaSigVerTestResult = 18;
+  kCavpCmacGenTestResult = 19;
 }
 
 message AesCbcEncryptTest {
@@ -137,6 +139,7 @@
   DcryptError result_code = 1;
   bytes text = 2;
   bytes tag = 3;
+  uint32 success = 4;
 }
 
 enum CavpShaAlgorithm {
@@ -319,6 +322,20 @@
   bool result = 2;
 }
 
+message CavpCmacGenTest {
+  uint32 offset = 1;
+  uint32 key_size = 2;
+  uint32 mac_len = 3;
+  uint32 total_len = 4;
+  bytes key = 5;
+  bytes msg = 6;
+}
+
+message CavpCmacGenTestResult {
+  DcryptError result_code = 1;
+  bytes mac = 2;
+}
+
 message TrngTest {
   uint32 number_of_bytes = 1;
 }