Skip to content

Confirmation token HAL changes#17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
subrahmanyaman merged 1 commit into from
Dec 23, 2021
+6 −2
Merged

Confirmation token HAL changes #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion HAL/JavacardKeyMintOperation.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,6 +78,7 @@ ScopedAStatus JavacardKeyMintOperation::finish(
const optional<vector<uint8_t>>& /*confirmationToken*/, vector<uint8_t>* output) {
HardwareAuthToken aToken = authToken.value_or(HardwareAuthToken());
TimeStampToken tToken = timestampToken.value_or(TimeStampToken());
const vector<uint8_t> confToken = confirmationToken.value_or(vector<uint8_t>());
const vector<uint8_t> inData = input.value_or(vector<uint8_t>());
DataView view = {.buffer = {}, .data = inData, .start = 0, .length = inData.size()};
const vector<uint8_t> sign = signature.value_or(vector<uint8_t>());
Expand All@@ -92,7 +93,7 @@ ScopedAStatus JavacardKeyMintOperation::finish(
}
}
vector<uint8_t> remaining = popNextChunk(view, view.length);
return km_utils::kmError2ScopedAStatus(sendFinish(remaining, sign, aToken, tToken, *output));
return km_utils::kmError2ScopedAStatus(sendFinish(remaining, sign, aToken, tToken, confToken, *output));
}

ScopedAStatus JavacardKeyMintOperation::abort() {
Expand DownExpand Up@@ -262,13 +263,16 @@ keymaster_error_t JavacardKeyMintOperation::sendFinish(const vector<uint8_t>& da
const vector<uint8_t>& sign,
const HardwareAuthToken& authToken,
const TimeStampToken& timestampToken,
const vector<uint8_t>& confToken,
vector<uint8_t>& output) {
cppbor::Array request;
request.add(Uint(opHandle_));
request.add(Bstr(data));
request.add(Bstr(sign));
cbor_.addHardwareAuthToken(request, authToken);
cbor_.addTimeStampToken(request, timestampToken);
request.add(Bstr(confToken));

auto [item, err] = card_->sendRequest(Instruction::INS_FINISH_OPERATION_CMD, request);
if (err != KM_ERROR_OK) {
return err;
Expand Down
2 changes: 1 addition & 1 deletion HAL/JavacardKeyMintOperation.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -98,7 +98,7 @@ class JavacardKeyMintOperation : public BnKeyMintOperation {

keymaster_error_t sendFinish(const vector<uint8_t>& data, const vector<uint8_t>& signature,
const HardwareAuthToken& authToken,
const TimeStampToken& timestampToken, vector<uint8_t>& output);
const TimeStampToken& timestampToken, const vector<uint8_t>& confToken, vector<uint8_t>& output);

keymaster_error_t sendUpdate(const vector<uint8_t>& data, const HardwareAuthToken& authToken,
const TimeStampToken& timestampToken, vector<uint8_t>& output);
Expand Down