Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "ID attestation: Pass second IMEIs to Keystore" am: bfbf069ee5 am: 19b6eea501 am: 250413b0ea

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2277393

Change-Id: I15b612f0701a2e35474df1a5d0e2061656929224
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Eran Messeri
2022-12-05 18:52:53 +00:00
committed by Automerger Merge Worker
parent e3b11beae8 250413b0ea
commit ecbadfbfe4
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/security/keymaster/KeymasterDefs.java
View File

@@ -126,6 +126,8 @@ public final class KeymasterDefs {
Tag.BOOT_PATCHLEVEL; // KM_UINT | 719;
public static final int KM_TAG_DEVICE_UNIQUE_ATTESTATION =
Tag.DEVICE_UNIQUE_ATTESTATION; // KM_BOOL | 720;
public static final int KM_TAG_ATTESTATION_ID_SECOND_IMEI =
Tag.ATTESTATION_ID_SECOND_IMEI; // KM_BYTES | 723;
public static final int KM_TAG_NONCE = Tag.NONCE; // KM_BYTES | 1001;
public static final int KM_TAG_MAC_LENGTH = Tag.MAC_LENGTH; // KM_UINT | 1003;

8
keystore/java/android/security/keystore2/AndroidKeyStoreKeyPairGeneratorSpi.java
View File

@@ -52,6 +52,7 @@ import android.system.keystore2.KeyEntryResponse;
import android.system.keystore2.KeyMetadata;
import android.system.keystore2.ResponseCode;
import android.telephony.TelephonyManager;
import android.text.TextUtils;
import android.util.ArraySet;
import android.util.Log;
@@ -856,6 +857,13 @@ public abstract class AndroidKeyStoreKeyPairGeneratorSpi extends KeyPairGenerato
KeymasterDefs.KM_TAG_ATTESTATION_ID_IMEI,
imei.getBytes(StandardCharsets.UTF_8)
));
final String secondImei = telephonyService.getImei(1);
if (!TextUtils.isEmpty(secondImei)) {
params.add(KeyStore2ParameterUtils.makeBytes(
KeymasterDefs.KM_TAG_ATTESTATION_ID_SECOND_IMEI,
secondImei.getBytes(StandardCharsets.UTF_8)
));
}
break;
}
case AttestationUtils.ID_TYPE_MEID: {