commit 6e20ea4592bb5b776a73a8dbd93ce2e39f2fa033
author Shawn Willden <swillden@google.com> Mon Dec 21 18:52:34 2020 -0700
committer Shawn Willden <swillden@google.com> Thu Jan 28 06:25:20 2021 -0700
tree a7292e56429046c63bf1933b65a8188999b0be3f
parent c76b9d9ffea4fd5fa37b177143eb9827715f745c

Add attestation key to generate/import messages.

Test: keymaster_tests
Change-Id: I588cb9dc8cd698773fdc7f6ee383c9d64db54093

ng/AndroidKeymaster4Device.cpp

diff --git a/ng/AndroidKeymaster4Device.cpp b/ng/AndroidKeymaster4Device.cpp
index c48b82f..a71948e 100644
--- a/ng/AndroidKeymaster4Device.cpp
+++ b/ng/AndroidKeymaster4Device.cpp
@@ -359,7 +359,7 @@
     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);