diff options
| author | Shawn Willden <swillden@google.com> | 2015-07-20 09:10:32 -0600 |
|---|---|---|
| committer | Shawn Willden <swillden@google.com> | 2015-07-28 12:57:24 -0600 |
| commit | 5cf45028751471f79d9f8a390f64fe9412acd53a (patch) | |
| tree | a08170f7f0934dacfcb8b550fba63528e7e6cf03 /include | |
| parent | 3ac35814df71dce203c9b3cc1a937b178f7dc9c7 (diff) | |
| download | keymaster-5cf45028751471f79d9f8a390f64fe9412acd53a.tar.gz | |
Make NONE mean NONE only (not ANY)
KM_DIGEST_NONE and KM_PAD_NONE have implicit meanings of "any digest"
and "any padding", respectively, as well as the expected meanings of "no
digest" and "no padding". This CL changes that so they mean only "no
digest" and "no padding".
Bug: 22556114
Change-Id: I7b0b4c079067d85ba1aa39ae7edf0c6b17a9a500
Diffstat (limited to 'include')
| -rw-r--r-- | include/keymaster/soft_keymaster_device.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/include/keymaster/soft_keymaster_device.h b/include/keymaster/soft_keymaster_device.h index f2ffb68..86ad260 100644 --- a/include/keymaster/soft_keymaster_device.h +++ b/include/keymaster/soft_keymaster_device.h @@ -70,7 +70,8 @@ class SoftKeymasterDevice { private: void initialize(keymaster0_device_t* keymaster0_device); - static void StoreDefaultNewKeyParams(AuthorizationSet* auth_set); + static void StoreDefaultNewKeyParams(keymaster_algorithm_t algorithm, + AuthorizationSet* auth_set); static keymaster_error_t GetPkcs8KeyAlgorithm(const uint8_t* key, size_t key_length, keymaster_algorithm_t* algorithm); @@ -159,12 +160,10 @@ class SoftKeymasterDevice { const keymaster_key_param_set_t* in_params, keymaster_key_param_set_t* out_params, keymaster_operation_handle_t* operation_handle); - static keymaster_error_t update(const keymaster1_device_t* dev, - keymaster_operation_handle_t operation_handle, - const keymaster_key_param_set_t* in_params, - const keymaster_blob_t* input, size_t* input_consumed, - keymaster_key_param_set_t* out_params, - keymaster_blob_t* output); + static keymaster_error_t + update(const keymaster1_device_t* dev, keymaster_operation_handle_t operation_handle, + const keymaster_key_param_set_t* in_params, const keymaster_blob_t* input, + size_t* input_consumed, keymaster_key_param_set_t* out_params, keymaster_blob_t* output); static keymaster_error_t finish(const keymaster1_device_t* dev, keymaster_operation_handle_t operation_handle, const keymaster_key_param_set_t* in_params, const keymaster_blob_t* signature, |