diff options
author | Shawn Willden <swillden@google.com> | 2018-01-19 13:32:42 -0700 |
---|---|---|
committer | Shawn Willden <swillden@google.com> | 2018-01-19 16:59:54 -0700 |
commit | 3c665a20c7a63fc601b5d21d8bf7a1b5567ffa6f (patch) | |
tree | 38ccab8c68ead9f3d2eeef014547e8060e67cbea | |
parent | 7efc77216ead495bcfe4504be9040cb8a8b284ca (diff) | |
download | keymaster-3c665a20c7a63fc601b5d21d8bf7a1b5567ffa6f.tar.gz |
Add additional parameters to importWrappedKey
Bug: 31675676
Test: local unit tests and VtsHalKeymasterV4_0TargetTest
Change-Id: Ia865b035604b3d42ab5b3de6f22b2fac8400ddbf
-rw-r--r-- | android_keymaster/android_keymaster.cpp | 17 | ||||
-rw-r--r-- | android_keymaster/android_keymaster_messages.cpp | 8 | ||||
-rw-r--r-- | include/keymaster/android_keymaster_messages.h | 2 | ||||
-rw-r--r-- | ng/AndroidKeymaster4Device.cpp | 12 | ||||
-rw-r--r-- | ng/include/AndroidKeymaster4Device.h | 2 |
5 files changed, 32 insertions, 9 deletions
diff --git a/android_keymaster/android_keymaster.cpp b/android_keymaster/android_keymaster.cpp index 395ffa5..bbcc011 100644 --- a/android_keymaster/android_keymaster.cpp +++ b/android_keymaster/android_keymaster.cpp @@ -486,10 +486,23 @@ void AndroidKeymaster::ImportWrappedKey(const ImportWrappedKeyRequest& request, return; } + int sid_idx = key_description.find(TAG_USER_SECURE_ID); + if (sid_idx != -1) { + uint8_t sids = key_description[sid_idx].long_integer; + if (!key_description.erase(sid_idx)) { + response->error = KM_ERROR_UNKNOWN_ERROR; + return; + } + if (sids & HW_AUTH_PASSWORD) { + key_description.push_back(TAG_USER_SECURE_ID, request.password_sid); + } + if (sids & HW_AUTH_FINGERPRINT) { + key_description.push_back(TAG_USER_SECURE_ID, request.biometric_sid); + } + } + keymaster_algorithm_t algorithm; - key_description.GetTagValue(TAG_ALGORITHM, &algorithm); KeyFactory* factory = 0; - if (!key_description.GetTagValue(TAG_ALGORITHM, &algorithm) || !(factory = context_->GetKeyFactory(algorithm))) { response->error = KM_ERROR_UNSUPPORTED_ALGORITHM; diff --git a/android_keymaster/android_keymaster_messages.cpp b/android_keymaster/android_keymaster_messages.cpp index ac00a0b..dd5c8d3 100644 --- a/android_keymaster/android_keymaster_messages.cpp +++ b/android_keymaster/android_keymaster_messages.cpp @@ -642,14 +642,18 @@ uint8_t* ImportWrappedKeyRequest::Serialize(uint8_t* buf, const uint8_t* end) co serialize_key_blob(wrapped_key, buf, end); serialize_key_blob(wrapping_key, buf, end); serialize_key_blob(masking_key, buf, end); - return additional_params.Serialize(buf, end); + buf = additional_params.Serialize(buf, end); + buf = append_uint64_to_buf(buf, end, password_sid); + return append_uint64_to_buf(buf, end, biometric_sid); } bool ImportWrappedKeyRequest::Deserialize(const uint8_t** buf_ptr, const uint8_t* end) { return deserialize_key_blob(&wrapped_key, buf_ptr, end) && deserialize_key_blob(&wrapping_key, buf_ptr, end) && deserialize_key_blob(&masking_key, buf_ptr, end) && - additional_params.Deserialize(buf_ptr, end); + additional_params.Deserialize(buf_ptr, end) && + copy_uint64_from_buf(buf_ptr, end, &password_sid) && + copy_uint64_from_buf(buf_ptr, end, &biometric_sid); } void ImportWrappedKeyRequest::SetWrappedMaterial(const void* key_material, size_t length) { diff --git a/include/keymaster/android_keymaster_messages.h b/include/keymaster/android_keymaster_messages.h index 348d085..1ac6fbd 100644 --- a/include/keymaster/android_keymaster_messages.h +++ b/include/keymaster/android_keymaster_messages.h @@ -789,6 +789,8 @@ struct ImportWrappedKeyRequest : public KeymasterMessage { KeymasterKeyBlob wrapping_key; KeymasterKeyBlob masking_key; AuthorizationSet additional_params; + uint64_t password_sid; + uint64_t biometric_sid; }; struct ImportWrappedKeyResponse : public KeymasterResponse { diff --git a/ng/AndroidKeymaster4Device.cpp b/ng/AndroidKeymaster4Device.cpp index 141005a..1a78013 100644 --- a/ng/AndroidKeymaster4Device.cpp +++ b/ng/AndroidKeymaster4Device.cpp @@ -331,16 +331,18 @@ Return<void> AndroidKeymaster4Device::importKey(const hidl_vec<KeyParameter>& pa return Void(); } -Return<void> AndroidKeymaster4Device::importWrappedKey(const hidl_vec<uint8_t>& wrappedKeyData, - const hidl_vec<uint8_t>& wrappingKeyBlob, - const hidl_vec<uint8_t>& maskingKey, - importWrappedKey_cb _hidl_cb) { +Return<void> AndroidKeymaster4Device::importWrappedKey( + const hidl_vec<uint8_t>& wrappedKeyData, const hidl_vec<uint8_t>& wrappingKeyBlob, + const hidl_vec<uint8_t>& maskingKey, const hidl_vec<KeyParameter>& unwrappingParams, + uint64_t passwordSid, uint64_t biometricSid, importWrappedKey_cb _hidl_cb) { ImportWrappedKeyRequest request; request.SetWrappedMaterial(wrappedKeyData.data(), wrappedKeyData.size()); request.SetWrappingMaterial(wrappingKeyBlob.data(), wrappingKeyBlob.size()); request.SetMaskingKeyMaterial(maskingKey.data(), maskingKey.size()); - // TODO(franksalim): set request.additional_params when wrapping key params are allowed + request.additional_params.Reinitialize(KmParamSet(unwrappingParams)); + request.password_sid = passwordSid; + request.biometric_sid = biometricSid; ImportWrappedKeyResponse response; impl_->ImportWrappedKey(request, &response); diff --git a/ng/include/AndroidKeymaster4Device.h b/ng/include/AndroidKeymaster4Device.h index d6fbd15..bb71146 100644 --- a/ng/include/AndroidKeymaster4Device.h +++ b/ng/include/AndroidKeymaster4Device.h @@ -69,6 +69,8 @@ class AndroidKeymaster4Device : public IKeymasterDevice { Return<void> importWrappedKey(const hidl_vec<uint8_t>& wrappedKeyData, const hidl_vec<uint8_t>& wrappingKeyBlob, const hidl_vec<uint8_t>& maskingKey, + const hidl_vec<KeyParameter>& unwrappingParams, + uint64_t passwordSid, uint64_t biometricSid, importWrappedKey_cb _hidl_cb) override; Return<void> exportKey(KeyFormat exportFormat, const hidl_vec<uint8_t>& keyBlob, const hidl_vec<uint8_t>& clientId, const hidl_vec<uint8_t>& appData, |