Skip to content

Jc keymaster 41 android 11 #62

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
BKSSMVenkateswarlu merged 3 commits into from
Mar 24, 2021
Merged

Jc keymaster 41 android 11 #62

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d388973
Renamed the keyRequiresUpgrade function with a meaningful name
Mar 22, 2021
e5fd227
Merge pull request #24 from BKSSMVenkateswarlu/jc_keymaster_41_androi…
mdwivedi Mar 23, 2021
af03ef0
Merge pull request #61 from divegeek/jc_keymaster_41_android_11
BKSSMVenkateswarlu Mar 24, 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
14 changes: 7 additions & 7 deletions 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 @@ -1096,7 +1096,7 @@ private void processComputeSharedHmacCmd(APDU apdu) {
sendOutgoing(apdu);
}

private boolean keyRequiresUpgrade(short tag, short systemParam) {
private boolean isKeyUpgradeRequired(short tag, short systemParam) {
// validate the tag and check if key needs upgrade.
tmpVariables[0] = KMKeyParameters.findTag(KMType.UINT_TAG, tag, data[HW_PARAMETERS]);
tmpVariables[0] = KMIntegerTag.cast(tmpVariables[0]).getValue();
Expand Down Expand Up @@ -1148,14 +1148,14 @@ private void processUpgradeKeyCmd(APDU apdu) {
}
// parse existing key blob
parseEncryptedKeyBlob(scratchPad);
boolean keyRequiresUpgrade = false;
boolean isKeyUpgradeRequired = false;
// Check if key requires upgrade.
keyRequiresUpgrade |= keyRequiresUpgrade(KMType.OS_VERSION, repository.getOsVersion());
keyRequiresUpgrade |= keyRequiresUpgrade(KMType.OS_PATCH_LEVEL, repository.getOsPatch());
keyRequiresUpgrade |= keyRequiresUpgrade(KMType.VENDOR_PATCH_LEVEL, repository.getVendorPatchLevel());
keyRequiresUpgrade |= keyRequiresUpgrade(KMType.BOOT_PATCH_LEVEL, repository.getBootPatchLevel());
isKeyUpgradeRequired |= isKeyUpgradeRequired(KMType.OS_VERSION, repository.getOsVersion());
isKeyUpgradeRequired |= isKeyUpgradeRequired(KMType.OS_PATCH_LEVEL, repository.getOsPatch());
isKeyUpgradeRequired |= isKeyUpgradeRequired(KMType.VENDOR_PATCH_LEVEL, repository.getVendorPatchLevel());
isKeyUpgradeRequired |= isKeyUpgradeRequired(KMType.BOOT_PATCH_LEVEL, repository.getBootPatchLevel());

if (keyRequiresUpgrade) {
if (isKeyUpgradeRequired) {
// copy origin
data[ORIGIN] = KMEnumTag.getValue(KMType.ORIGIN, data[HW_PARAMETERS]);
// create new key blob with current os version etc.
Expand Down