From 8eaf505702d0c050a67493943cdaa6ea7c48547b Mon Sep 17 00:00:00 2001 From: BKSSM Venkateswarlu Date: Tue, 22 Sep 2020 19:29:50 +0530 Subject: [PATCH] For verifyAuthorizations API, StrongBox implementations must return ErrorCode::UNIMPLEMENTED. --- .../4.1/JavacardKeymaster4Device.cpp | 26 ++----------------- 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/HAL/keymaster/4.1/JavacardKeymaster4Device.cpp b/HAL/keymaster/4.1/JavacardKeymaster4Device.cpp index 4204a8d7..c2775de6 100644 --- a/HAL/keymaster/4.1/JavacardKeymaster4Device.cpp +++ b/HAL/keymaster/4.1/JavacardKeymaster4Device.cpp @@ -676,31 +676,9 @@ Return JavacardKeymaster4Device::computeSharedHmac(const hidl_vec JavacardKeymaster4Device::verifyAuthorization(uint64_t operationHandle, const hidl_vec& parametersToVerify, const HardwareAuthToken& authToken, verifyAuthorization_cb _hidl_cb) { - cppbor::Array array; - std::unique_ptr item; - std::vector cborOutData; - ErrorCode errorCode = ErrorCode::UNKNOWN_ERROR; +Return JavacardKeymaster4Device::verifyAuthorization(uint64_t , const hidl_vec& , const HardwareAuthToken& , verifyAuthorization_cb _hidl_cb) { VerificationToken verificationToken; - - /* Convert input data to cbor format */ - array.add(operationHandle); - cborConverter_.addKeyparameters(array, parametersToVerify); - cborConverter_.addHardwareAuthToken(array, authToken); - std::vector cborData = array.encode(); - - errorCode = sendData(Instruction::INS_VERIFY_AUTHORIZATION_CMD, cborData, cborOutData); - - if((errorCode == ErrorCode::OK) && (cborData.size() > 2)) { - //Skip last 2 bytes in cborData, it contains status. - std::tie(item, errorCode) = cborConverter_.decodeData(std::vector(cborOutData.begin(), cborOutData.end()-2), - true); - if (item != nullptr) { - if(!cborConverter_.getVerificationToken(item, 1, verificationToken)) - errorCode = ErrorCode::UNKNOWN_ERROR; - } - } - _hidl_cb(errorCode, verificationToken); + _hidl_cb(ErrorCode::UNIMPLEMENTED, verificationToken); return Void(); }