commit 49dfc58d6c4c66f5d0b0d06f0161da4e602a1293
author android-build-team Robot <android-build-team-robot@google.com> Thu Jun 07 07:20:36 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Jun 07 07:20:36 2018 +0000
tree 6dbc19849752c206e135ab59349ebb1cc62bb435
parent e905f21888c21a7910e175587607a5cec15d0a89
parent c6d9000526f463bc109964b73ed751ae09fc2da7

Snap for 4826885 from c6d9000526f463bc109964b73ed751ae09fc2da7 to pi-release

Change-Id: I7c8d9782e2620113c8fb9ea1907fd981e761006e

contexts/keymaster2_passthrough_context.cpp

diff --git a/contexts/keymaster2_passthrough_context.cpp b/contexts/keymaster2_passthrough_context.cpp
index fe904ea..678eaaa 100644
--- a/contexts/keymaster2_passthrough_context.cpp
+++ b/contexts/keymaster2_passthrough_context.cpp
@@ -69,10 +69,10 @@
 keymaster_error_t Keymaster2PassthroughContext::ParseKeyBlob(const KeymasterKeyBlob& blob,
         const AuthorizationSet& additional_params, UniquePtr<Key>* key) const {
     keymaster_key_characteristics_t characteristics = {};
-    KeymasterBlob clientId;
-    KeymasterBlob applicationData;
-    KeymasterBlob* clientIdPtr = &clientId;
-    KeymasterBlob* applicationDataPtr = &applicationData;
+    keymaster_blob_t clientId;
+    keymaster_blob_t applicationData;
+    keymaster_blob_t* clientIdPtr = &clientId;
+    keymaster_blob_t* applicationDataPtr = &applicationData;
     if (!additional_params.GetTagValue(TAG_APPLICATION_ID, clientIdPtr)) {
         clientIdPtr = nullptr;
     }