Revert "Delegate auth token parsing to HAL."
This reverts commit 76f21b2676092911ab030c3dde1489902c00ab71.
Reason for revert: b/36637075
Bug: 36637075
Change-Id: Ica737cf96d14086aae7918f8bf2f86a36555d03b
diff --git a/keystore/operation.cpp b/keystore/operation.cpp
index f56e7f8..8c39716 100644
--- a/keystore/operation.cpp
+++ b/keystore/operation.cpp
@@ -117,22 +117,23 @@
}
bool OperationMap::getOperationAuthToken(const sp<IBinder>& token,
- const hidl_vec<uint8_t>** outToken) {
+ const HardwareAuthToken** outToken) {
auto entry = mMap.find(token);
if (entry == mMap.end()) {
return false;
}
- *outToken = &entry->second.authToken;
+ *outToken = entry->second.authToken.get();
return true;
}
bool OperationMap::setOperationAuthToken(const sp<IBinder>& token,
- hidl_vec<uint8_t> authToken) {
+ const HardwareAuthToken* authToken) {
auto entry = mMap.find(token);
if (entry == mMap.end()) {
return false;
}
- entry->second.authToken = std::move(authToken);
+ entry->second.authToken.reset(new HardwareAuthToken);
+ *entry->second.authToken = *authToken;
return true;
}