commit 031b6050b17358538e27211c0cdb1021235290e5
author Shawn Willden <swillden@google.com> Tue Mar 28 00:40:57 2017 +0000
committer Shawn Willden <swillden@google.com> Tue Mar 28 00:44:17 2017 +0000
tree 822ca844adfaac82da57f56b661e580ceb1aa737
parent 62f63c7ddbd08737e298a97975754225e5da0126

Revert "Add auth token parsing to IKeymasterDevice.hal"

This reverts commit 62f63c7ddbd08737e298a97975754225e5da0126.

Reason for revert: b/36637075

Bug: 36637075
Change-Id: Ie0e8d0b480047a7c68f266e7e5d8a31722f85128

keymaster/3.0/default/KeymasterDevice.cpp

diff --git a/keymaster/3.0/default/KeymasterDevice.cpp b/keymaster/3.0/default/KeymasterDevice.cpp
index b2baa2b..720b946 100644
--- a/keymaster/3.0/default/KeymasterDevice.cpp
+++ b/keymaster/3.0/default/KeymasterDevice.cpp
@@ -33,8 +33,6 @@
 
 using ::keymaster::SoftKeymasterDevice;
 
-namespace {
-
 class SoftwareOnlyHidlKeymasterEnforcement : public ::keymaster::KeymasterEnforcement {
   public:
     SoftwareOnlyHidlKeymasterEnforcement() : KeymasterEnforcement(64, 64) {}
@@ -62,7 +60,7 @@
     std::unique_ptr<::keymaster::KeymasterEnforcement> enforcement_;
 };
 
-int keymaster0_device_initialize(const hw_module_t* mod, keymaster2_device_t** dev) {
+static int keymaster0_device_initialize(const hw_module_t* mod, keymaster2_device_t** dev) {
     assert(mod->module_api_version < KEYMASTER_MODULE_API_VERSION_1_0);
     ALOGI("Found keymaster0 module %s, version %x", mod->name, mod->module_api_version);
 
@@ -139,7 +137,7 @@
     return rc;
 }
 
-int keymaster2_device_initialize(const hw_module_t* mod, keymaster2_device_t** dev) {
+static int keymaster2_device_initialize(const hw_module_t* mod, keymaster2_device_t** dev) {
     assert(mod->module_api_version >= KEYMASTER_MODULE_API_VERSION_2_0);
     ALOGI("Found keymaster2 module %s, version %x", mod->name, mod->module_api_version);
 
@@ -193,30 +191,6 @@
     }
 }
 
-template <typename IntType, uint32_t byteOrder> struct choose_ntoh;
-
-template <typename IntType> struct choose_ntoh<IntType, __ORDER_LITTLE_ENDIAN__> {
-    inline static IntType ntoh(const IntType& value) {
-        IntType result = 0;
-        const unsigned char* inbytes = reinterpret_cast<const unsigned char*>(&value);
-        unsigned char* outbytes = reinterpret_cast<unsigned char*>(&result);
-        for (int i = sizeof(IntType) - 1; i >= 0; --i) {
-            *(outbytes++) = inbytes[i];
-        }
-        return result;
-    }
-};
-
-template <typename IntType> struct choose_ntoh<IntType, __ORDER_BIG_ENDIAN__> {
-    inline static IntType hton(const IntType& value) { return value; }
-};
-
-template <typename IntType> inline IntType ntoh(const IntType& value) {
-    return choose_ntoh<IntType, __BYTE_ORDER__>::ntoh(value);
-}
-
-}  // anonymous namespace
-
 KeymasterDevice::~KeymasterDevice() {
     if (keymaster_device_) keymaster_device_->common.close(&keymaster_device_->common);
 }
@@ -402,34 +376,6 @@
     return Void();
 }
 
-Return<void> KeymasterDevice::parseHardwareAuthToken(const hidl_vec<uint8_t>& token,
-                                                     parseHardwareAuthToken_cb _hidl_cb) {
-    HardwareAuthTokenInfo parsedToken;
-    if (token.size() != sizeof(hw_auth_token_t)) {
-        ALOGE("Received auth token of length %zu, expected %zu", token.size(),
-              sizeof(hw_auth_token_t));
-        _hidl_cb(ErrorCode::INVALID_ARGUMENT, parsedToken);
-        return Void();
-    }
-
-    const hw_auth_token_t* authToken = reinterpret_cast<const hw_auth_token_t*>(token.data());
-    if (authToken->version != 0) {
-        ALOGE("Auth token version %u, expected version ", authToken->version);
-        _hidl_cb(ErrorCode::INVALID_ARGUMENT, parsedToken);
-        return Void();
-    }
-
-    parsedToken.challenge = authToken->challenge;
-    parsedToken.userId = authToken->user_id;
-    parsedToken.authenticatorId = authToken->authenticator_id;
-    parsedToken.authenticatorType =
-        static_cast<HardwareAuthenticatorType>(ntoh(authToken->authenticator_type));
-    parsedToken.timestamp = ntoh(authToken->timestamp);
-
-    _hidl_cb(ErrorCode::OK, parsedToken);
-    return Void();
-}
-
 Return<ErrorCode> KeymasterDevice::addRngEntropy(const hidl_vec<uint8_t>& data) {
     if (!data.size()) return ErrorCode::OK;
     return legacy_enum_conversion(