Skip to content

Handled attest key purpose validation in generate key and import key#24

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
Jan 14, 2022
Merged

Handled attest key purpose validation in generate key and import key #24

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
17 changes: 17 additions & 0 deletions Applet/src/com/android/javacard/keymaster/KMKeymasterApplet.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3082,6 +3082,14 @@ private void processImportKeyCmd(APDU apdu) {
}

private void validateImportKey(short params, short keyFmt){
short attKeyPurpose =
KMKeyParameters.findTag(KMType.ENUM_ARRAY_TAG, KMType.PURPOSE, params);
// ATTEST_KEY cannot be combined with any other purpose.
if (attKeyPurpose != KMType.INVALID_VALUE
&& KMEnumArrayTag.cast(attKeyPurpose).contains(KMType.ATTEST_KEY)
&& KMEnumArrayTag.cast(attKeyPurpose).length() > 1) {
KMException.throwIt(KMError.INCOMPATIBLE_PURPOSE);
}
// Rollback protection not supported
KMTag.assertAbsence(params, KMType.BOOL_TAG, KMType.ROLLBACK_RESISTANCE, KMError.ROLLBACK_RESISTANCE_UNAVAILABLE);
// As per specification, Early boot keys may not be imported at all, if Tag::EARLY_BOOT_ONLY is
Expand DownExpand Up@@ -3513,6 +3521,15 @@ private void processGenerateKey(APDU apdu) {
// As per specification Early boot keys may be created after early boot ended.
// Algorithm must be present
KMTag.assertPresence(data[KEY_PARAMETERS], KMType.ENUM_TAG, KMType.ALGORITHM, KMError.INVALID_ARGUMENT);

short attKeyPurpose =
KMKeyParameters.findTag(KMType.ENUM_ARRAY_TAG, KMType.PURPOSE, data[KEY_PARAMETERS]);
// ATTEST_KEY cannot be combined with any other purpose.
if (attKeyPurpose != KMType.INVALID_VALUE
&& KMEnumArrayTag.cast(attKeyPurpose).contains(KMType.ATTEST_KEY)
&& KMEnumArrayTag.cast(attKeyPurpose).length() > 1) {
KMException.throwIt(KMError.INCOMPATIBLE_PURPOSE);
}
short alg = KMEnumTag.getValue(KMType.ALGORITHM, data[KEY_PARAMETERS]);
// Check algorithm and dispatch to appropriate handler.
switch (alg) {
Expand Down