commit 3f4723dce080b20200a935a4cef1ec4824ed8434
author josephjang <josephjang@google.com> Fri Jun 26 07:26:28 2020 +0800
committer Jing-yan, Jang <josephjang@google.com> Thu Jun 25 23:30:07 2020 +0000
tree 80641c5a501175c0baa9522a74f46aa3fd43d64f
parent d5592ac11221ee4b2ce614f0b485702b5384e371
parent 07c55ee687b92319c5fba114b844fe5564211c5f

Merge remote-tracking branch 'goog/upstream-master' into josephjang-nos-merge-upstream

* goog/upstream-master:
  CAVP: CMAC protos
  CAVP: Add CMAC proto, GCM success field

Bug: 159947154
Bug: 159911243
Bug: 159911616
Change-Id: I74d55e37d1f73a3775b10d1e964a5ff6f7705c29

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;
 }