diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-04-23 23:05:16 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-04-23 23:05:16 +0000 |
| commit | 563e52effe663810b8fe87e03e72dfdc01d46889 (patch) | |
| tree | 518373674ff3d5e674c7baeb0aa4e37f233c362d | |
| parent | d6ade4349aaeb0d99f2c8b30eea4f0355dddfb6a (diff) | |
| parent | 14c4a813c15ebf9de2ed99cda07c523620b70f47 (diff) | |
| download | libese-sdk-release.tar.gz | |
Snap for 11754915 from 14c4a813c15ebf9de2ed99cda07c523620b70f47 to sdk-releasesdk-release
Change-Id: I9471b9a89d8df82494455264c7cb1a6db750b5d7
| -rw-r--r-- | ready_se/google/keymint/KM300/Applet/src/com/android/javacard/keymaster/KMKeymasterApplet.java | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/ready_se/google/keymint/KM300/Applet/src/com/android/javacard/keymaster/KMKeymasterApplet.java b/ready_se/google/keymint/KM300/Applet/src/com/android/javacard/keymaster/KMKeymasterApplet.java index abbc860..e122283 100644 --- a/ready_se/google/keymint/KM300/Applet/src/com/android/javacard/keymaster/KMKeymasterApplet.java +++ b/ready_se/google/keymint/KM300/Applet/src/com/android/javacard/keymaster/KMKeymasterApplet.java @@ -4070,17 +4070,6 @@ public class KMKeymasterApplet extends Applet implements AppletEvent, ExtendedLe data[CERTIFICATE] = KMArray.instance((short) 0); // by default the cert is empty. data[ORIGIN] = KMType.IMPORTED; - // ID_IMEI should be present if ID_SECOND_IMEI is present - short attIdTag = - KMKeyParameters.findTag( - KMType.BYTES_TAG, KMType.ATTESTATION_ID_SECOND_IMEI, data[KEY_PARAMETERS]); - if (attIdTag != KMType.INVALID_VALUE) { - KMTag.assertPresence( - data[KEY_PARAMETERS], - KMType.BYTES_TAG, - KMType.ATTESTATION_ID_IMEI, - KMError.CANNOT_ATTEST_IDS); - } importKey(apdu, keyFmt, scratchPad); } @@ -4548,17 +4537,6 @@ public class KMKeymasterApplet extends Applet implements AppletEvent, ExtendedLe KMException.throwIt(KMError.UNSUPPORTED_TAG); } - // ID_IMEI should be present if ID_SECOND_IMEI is present - short attIdTag = - KMKeyParameters.findTag( - KMType.BYTES_TAG, KMType.ATTESTATION_ID_SECOND_IMEI, data[KEY_PARAMETERS]); - if (attIdTag != KMType.INVALID_VALUE) { - KMTag.assertPresence( - data[KEY_PARAMETERS], - KMType.BYTES_TAG, - KMType.ATTESTATION_ID_IMEI, - KMError.CANNOT_ATTEST_IDS); - } short attKeyPurpose = KMKeyParameters.findTag(KMType.ENUM_ARRAY_TAG, KMType.PURPOSE, data[KEY_PARAMETERS]); |