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

Rename data version#120

Merged
mdwivedi merged 2 commits into from
Apr 27, 2022
Merged

Rename data version #120

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a9043b
Merge pull request #58 from divegeek/Javacard_KeyMint_100_master
subrahmanyaman Apr 26, 2022
ca1b195
Rename "CURRENT_PACKAGE_VERSION" variable to "KM_PERSISTENT_DATA_STOR…
subrahmanyaman Apr 27, 2022
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
8 changes: 4 additions & 4 deletions Applet/AndroidSEProvider/src/com/android/javacard/keymaster/KMAndroidSEApplet.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,7 @@ public class KMAndroidSEApplet extends KMKeymasterApplet implements OnUpgradeLis
// Magic number version
private static final byte KM_MAGIC_NUMBER = (byte) 0x82;
// MSB byte is for Major version and LSB byte is for Minor version.
private static final short CURRENT_PACKAGE_VERSION = 0x0100;
private static final short KM_PERSISTENT_DATA_STORAGE_VERSION = 0x0100;

private static final byte KM_BEGIN_STATE = 0x00;
private static final byte ILLEGAL_STATE = KM_BEGIN_STATE + 1;
Expand DownExpand Up@@ -79,7 +79,7 @@ public class KMAndroidSEApplet extends KMKeymasterApplet implements OnUpgradeLis
KMAndroidSEApplet() {
super(new KMAndroidSEProvider());
if (!UpgradeManager.isUpgrading()) {
packageVersion = CURRENT_PACKAGE_VERSION;
packageVersion = KM_PERSISTENT_DATA_STORAGE_VERSION;
}
}

Expand DownExpand Up@@ -448,8 +448,8 @@ private boolean isUpgradeAllowed(short version) {
boolean upgradeAllowed = false;
short oldMajorVersion = (short) ((version >> 8) & 0x00FF);
short oldMinorVersion = (short) (version & 0x00FF);
short currentMajorVersion = (short) (CURRENT_PACKAGE_VERSION >> 8 & 0x00FF);
short currentMinorVersion = (short) (CURRENT_PACKAGE_VERSION & 0x00FF);
short currentMajorVersion = (short) (KM_PERSISTENT_DATA_STORAGE_VERSION >> 8 & 0x00FF);
short currentMinorVersion = (short) (KM_PERSISTENT_DATA_STORAGE_VERSION & 0x00FF);
// Downgrade of the Applet is not allowed.
// Upgrade is not allowed to a next version which is not immediate.
if ((short) (currentMajorVersion - oldMajorVersion) == 1) {
Expand Down