commit d3ed3a207990fa2a1cd2902a07afc9bd3d1f5777
author Shawn Willden <swillden@google.com> Tue Mar 28 00:39:16 2017 +0000
committer Shawn Willden <swillden@google.com> Tue Mar 28 00:44:33 2017 +0000
tree 8fcf2013e1509df4a6e781e7c15396b2643d22bb
parent 76f21b2676092911ab030c3dde1489902c00ab71

Revert "Delegate auth token parsing to HAL."

This reverts commit 76f21b2676092911ab030c3dde1489902c00ab71.

Reason for revert: b/36637075

Bug: 36637075
Change-Id: Ica737cf96d14086aae7918f8bf2f86a36555d03b

keystore/operation.h

diff --git a/keystore/operation.h b/keystore/operation.h
index 9ca0a11..e69b43a 100644
--- a/keystore/operation.h
+++ b/keystore/operation.h
@@ -55,9 +55,9 @@
     size_t getOperationCount() const { return mMap.size(); }
     size_t getPruneableOperationCount() const;
     bool getOperationAuthToken(const android::sp<android::IBinder>& token,
-                               const hidl_vec<uint8_t>** outToken);
+                               const HardwareAuthToken** outToken);
     bool setOperationAuthToken(const android::sp<android::IBinder>& token,
-                               hidl_vec<uint8_t> authToken);
+                               const HardwareAuthToken* authToken);
     android::sp<android::IBinder> getOldestPruneableOperation();
     std::vector<android::sp<android::IBinder>>
     getOperationsForToken(const android::sp<android::IBinder>& appToken);
@@ -76,7 +76,7 @@
         km_device_t device;
         KeyCharacteristics characteristics;
         android::sp<android::IBinder> appToken;
-        hidl_vec<uint8_t> authToken;
+        std::unique_ptr<HardwareAuthToken> authToken;
     };
     std::map<android::sp<android::IBinder>, Operation> mMap;
     std::vector<android::sp<android::IBinder>> mLru;