Merge "Add attestation key to generate/import messages"

This commit is contained in:
Treehugger Robot 2021-01-30 00:05:40 +00:00 committed by Gerrit Code Review
commit bd90bfabb2
2 changed files with 2 additions and 2 deletions

View file

@ -276,7 +276,7 @@ Return<void> TrustyKeymaster3Device::importKey(const hidl_vec<KeyParameter>& par
ImportKeyRequest request(impl_->message_version());
request.key_description.Reinitialize(KmParamSet(params));
request.key_format = legacy_enum_conversion(keyFormat);
request.SetKeyMaterial(keyData.data(), keyData.size());
request.key_data = KeymasterKeyBlob(keyData.data(), keyData.size());
ImportKeyResponse response(impl_->message_version());
impl_->ImportKey(request, &response);

View file

@ -391,7 +391,7 @@ Return<void> TrustyKeymaster4Device::importKey(const hidl_vec<KeyParameter>& par
ImportKeyRequest request(impl_->message_version());
request.key_description.Reinitialize(KmParamSet(params));
request.key_format = legacy_enum_conversion(keyFormat);
request.SetKeyMaterial(keyData.data(), keyData.size());
request.key_data = KeymasterKeyBlob(keyData.data(), keyData.size());
ImportKeyResponse response(impl_->message_version());
impl_->ImportKey(request, &response);