diff options
| author | josephjang <josephjang@google.com> | 2020-06-26 18:44:47 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-26 18:44:47 +0000 |
| commit | 9109bb5d4593c461232ea31496afd1b915e6a448 (patch) | |
| tree | 80641c5a501175c0baa9522a74f46aa3fd43d64f | |
| parent | 611c3cc6fcdd3c4743e9a2dac4616cd40fb22f70 (diff) | |
| parent | 3f4723dce080b20200a935a4cef1ec4824ed8434 (diff) | |
| download | generic-9109bb5d4593c461232ea31496afd1b915e6a448.tar.gz | |
Merge remote-tracking branch 'goog/upstream-master' into josephjang-nos-merge-upstream am: 3f4723dce0
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/11999722
Change-Id: I509cecd229deeca7126ca097085e40f6f4589893
| -rw-r--r-- | nugget/proto/nugget/app/protoapi/testing_api.proto | 17 |
1 files changed, 17 insertions, 0 deletions
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 @@ enum OneofTestParametersCase { kCavpEcdsaPkvTest = 22; kCavpEcdsaSigGenTest = 23; kCavpEcdsaSigVerTest = 24; + kCavpCmacGenTest = 25; } // TODO remove this when oneof support is added to nanopb @@ -69,6 +70,7 @@ enum OneofTestResultsCase { kCavpEcdsaPkvTestResult = 16; kCavpEcdsaSigGenTestResult = 17; kCavpEcdsaSigVerTestResult = 18; + kCavpCmacGenTestResult = 19; } message AesCbcEncryptTest { @@ -137,6 +139,7 @@ message CavpAesGcmTestResult { DcryptError result_code = 1; bytes text = 2; bytes tag = 3; + uint32 success = 4; } enum CavpShaAlgorithm { @@ -319,6 +322,20 @@ message CavpEcdsaSigVerTestResult { 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; } |