Skip to content

Keymaster41 Update #77

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
mdwivedi merged 4 commits into from
Dec 8, 2021
Merged

Keymaster41 Update #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5eb4862
Merge pull request #6 from divegeek/Javacard_KM_41_AOSP_UPMERGE_0630
subrahmanyaman Dec 7, 2021
4754863
Updated the README file
subrahmanyaman Dec 7, 2021
8f3df9c
Corrected the isEmpty function
subrahmanyaman Dec 8, 2021
3bf49a6
Removed GP upgrade jar
subrahmanyaman Dec 8, 2021
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
Binary file removed Applet/AndroidSEProvider/lib/gpapi-upgrade.jar
View file
Open in desktop
Binary file not shown.
Binary file removed Applet/JCardSimProvider/lib/gpapi-upgrade.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion Applet/src/com/android/javacard/keymaster/KMKeymasterApplet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1516,7 +1516,7 @@ private boolean isEmpty(byte[] buf, short offset, short len) {
boolean empty = true;
short index = 0;
while (index < len) {
if (buf[index] != 0) {
if (buf[(short) (index + offset)] != 0) {
empty = false;
break;
}
Expand Down
5 changes: 2 additions & 3 deletions HAL/keymaster/4.1/JavacardKeymaster4Device.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ static void clearStrongboxOprHandleEntries(const std::unique_ptr<OperationContex
<< "Secure Element reset or applet upgrade detected. Removing existing operation handles";
auto it = operationTable.begin();
while (it != operationTable.end()) {
if (it->second == OperationType::PRIVATE_OPERATION) { // Strongbox operation
if (it->second == OperationType::PRIVATE_OPERATION) { // Strongbox operation
LOG(INFO) << "operation handle: " << it->first << " is removed";
oprCtx->clearOperationData(it->first);
it = operationTable.erase(it);
Expand Down Expand Up @@ -968,8 +968,7 @@ Return<void> JavacardKeymaster4Device::begin(KeyPurpose purpose, const hidl_vec<
errorCode = handleBeginOperation(purpose, keyBlob, inParams, authToken, outParams,
operationHandle, operType);
if (errorCode == ErrorCode::OK && isOperationHandleExists(operationHandle)) {
LOG(DEBUG) << "Operation handle " << operationHandle
<< "already exists"
LOG(DEBUG) << "Operation handle " << operationHandle << "already exists"
"in the opertion table. so aborting this opertaion.";
// abort the operation.
errorCode = abortOperation(operationHandle, operType);
Expand Down
4 changes: 2 additions & 2 deletions ProvisioningTool/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ paths mentioned in the sample json file.
Usage: construct_apdus options
Valid options are:
-h, --help show the help message and exit.
-v, --km_version version Version of the keymaster (4.1 for keymaster; 5.0 for keymint)
-v, --km_version version Version of the keymaster ((4.0 or 4.1 for respective keymaster version))
-i, --input jsonFile Input json file
-o, --output jsonFile Output json file
</pre>
Expand All @@ -38,7 +38,7 @@ Valid options are:
Usage: provision options
Valid options are:
-h, --help show the help message and exit.
-v, --km_version version Version of the keymaster (4.1 for keymaster; 5.0 for keymint)
-v, --km_version version Version of the keymaster ((4.0 or 4.1 for respective keymaster version))
-i, --input jsonFile Input json file
-s, --provision_stautus Prints the current provision status.
-l, --lock_provision Locks the provision state.
Expand Down