Skip to content
This repository was archived by the owner on May 24, 2026. It is now read-only.

HAL returns Unimplemented error for Verify authorization #12

Merged
divegeek merged 5 commits into from
Oct 22, 2020
Merged

HAL returns Unimplemented error for Verify authorization #12

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
63449a9
Merge pull request #29 from divegeek/master
BKSSMVenkateswarlu Sep 4, 2020
5c80ef3
Merge pull request #32 from cpathak/master
BKSSMVenkateswarlu Sep 22, 2020
8eaf505
For verifyAuthorizations API, StrongBox implementations must return E…
Sep 22, 2020
8872183
Merge branch 'master' of https://github.com/divegeek/JavaCardKeymaste…
Oct 2, 2020
5254e67
Merge branch 'divegeek-master'
Oct 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 2 additions & 24 deletions HAL/keymaster/4.1/JavacardKeymaster4Device.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -676,31 +676,9 @@ Return<void> JavacardKeymaster4Device::computeSharedHmac(const hidl_vec<HmacShar

}

Return<void> JavacardKeymaster4Device::verifyAuthorization(uint64_t operationHandle, const hidl_vec<KeyParameter>& parametersToVerify, const HardwareAuthToken& authToken, verifyAuthorization_cb _hidl_cb) {
cppbor::Array array;
std::unique_ptr<Item> item;
std::vector<uint8_t> cborOutData;
ErrorCode errorCode = ErrorCode::UNKNOWN_ERROR;
Return<void> JavacardKeymaster4Device::verifyAuthorization(uint64_t , const hidl_vec<KeyParameter>& , 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<uint8_t> 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<uint8_t>(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();
}

Expand Down