From 74161ce87e1c671ef2506be1263e2aa9dfc65a7c Mon Sep 17 00:00:00 2001 From: nagendra modadugu Date: Wed, 2 Jan 2019 11:54:54 -0800 Subject: keymaster: add creation_time to generate/import Allow the host to specify the current time when sending generate/import requests. Bug: 122184852 Test: pending Change-Id: I687c04d76d8f466bdda27a2390ef21118e05408d --- nugget/proto/nugget/app/keymaster/keymaster.proto | 3 +++ 1 file changed, 3 insertions(+) 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. -- cgit v1.2.3