Store the key characteristics for operations
Instead of storing the key blob and parsing the characteristics out,
which some implementations might not support, instead call get
characteristics on begin and store that result for subsequent auth
calls.
Change-Id: I75e39ee28cc440e4ed411b2daaa2744085e1aa12
diff --git a/keystore/operation.h b/keystore/operation.h
index 6076836..a312528 100644
--- a/keystore/operation.h
+++ b/keystore/operation.h
@@ -27,6 +27,15 @@
namespace android {
+struct keymaster_key_characteristics_t_Delete {
+ void operator()(keymaster_key_characteristics_t* characteristics) const {
+ keymaster_free_characteristics(characteristics);
+ delete characteristics;
+ }
+};
+typedef std::unique_ptr<keymaster_key_characteristics_t, keymaster_key_characteristics_t_Delete>
+ Unique_keymaster_key_characteristics;
+
/**
* OperationMap handles the translation of keymaster_operation_handle_t's and
* keymaster1_device_t's to opaque binder tokens that can be used to reference
@@ -39,9 +48,10 @@
OperationMap(IBinder::DeathRecipient* deathRecipient);
sp<IBinder> addOperation(keymaster_operation_handle_t handle,
const keymaster1_device_t* dev, sp<IBinder> appToken,
- const keymaster_key_blob_t& key, bool pruneable);
+ keymaster_key_characteristics_t* characteristics, bool pruneable);
bool getOperation(sp<IBinder> token, keymaster_operation_handle_t* outHandle,
- const keymaster1_device_t** outDev, keymaster_key_blob_t* outKey);
+ const keymaster1_device_t** outDev,
+ const keymaster_key_characteristics_t** outCharacteristics);
bool removeOperation(sp<IBinder> token);
bool hasPruneableOperation();
sp<IBinder> getOldestPruneableOperation();
@@ -53,10 +63,10 @@
struct Operation {
Operation();
Operation(keymaster_operation_handle_t handle, const keymaster1_device_t* device,
- const keymaster_key_blob_t& key, sp<IBinder> appToken);
+ keymaster_key_characteristics_t* characteristics, sp<IBinder> appToken);
keymaster_operation_handle_t handle;
const keymaster1_device_t* device;
- keymaster_key_blob_t key;
+ Unique_keymaster_key_characteristics characteristics;
sp<IBinder> appToken;
};
std::map<sp<IBinder>, struct Operation> mMap;