diff options
| author | nagendra modadugu <ngm@google.com> | 2019-02-22 17:26:04 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-02-22 17:26:04 -0800 |
| commit | f9e2bacd51d540cfbb8846e14fb52e3e1b73fe78 (patch) | |
| tree | 74cfd947f3bc5024e11fb0b520bb606e63f459bf | |
| parent | 4e74bb6b34599ef45ec379aea07c856666f39b83 (diff) | |
| parent | 9ab430c300a5b90e85f9d975b4bfb1eb76556a76 (diff) | |
| download | generic-f9e2bacd51d540cfbb8846e14fb52e3e1b73fe78.tar.gz | |
[DO NOT MERGE] Merge remote-tracking branch 'goog/upstream-pixel18' into ngm-ota-rc11
am: 9ab430c300
Change-Id: Iad4d76ae987f20756d85eca3b1f66aaa72b563d3
| -rw-r--r-- | nugget/proto/nugget/app/keymaster/keymaster.proto | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/nugget/proto/nugget/app/keymaster/keymaster.proto b/nugget/proto/nugget/app/keymaster/keymaster.proto index ceb96a5..8dac4e8 100644 --- a/nugget/proto/nugget/app/keymaster/keymaster.proto +++ b/nugget/proto/nugget/app/keymaster/keymaster.proto @@ -134,6 +134,7 @@ message AddRngEntropyResponse { // GenerateKey message GenerateKeyRequest { KeyParameters params = 1; + uint64 creation_time_ms = 2; // Rough current time (ms since epoch). } message GenerateKeyResponse { ErrorCode error_code = 1; @@ -158,6 +159,7 @@ message ImportKeyRequest { RSAKey rsa = 2; ECKey ec = 3; SymmetricKey symmetric_key = 4; + uint64 creation_time_ms = 5; // Rough current time (ms since epoch). }; message ImportKeyResponse { ErrorCode error_code = 1; @@ -314,6 +316,7 @@ message ImportWrappedKeyRequest { bytes gcm_tag = 7; // Fixed sized array. KeyBlob wrapping_key_blob = 8; bytes masking_key = 9; // Fixed sized array. + uint64 creation_time_ms = 10; // Rough current time (ms since epoch). } // ImportWrappedKey returns a ImportKeyResponse. |