Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 250413b0 authored by Eran Messeri's avatar Eran Messeri Committed by Automerger Merge Worker
Browse files

Merge "ID attestation: Pass second IMEIs to Keystore" am: bfbf069e am: 19b6eea5 

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



Change-Id: Ide3956fd00b5f7fd6ff3d5fc34dd4e10aa694c1d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9d9b6691 19b6eea5

core/java/android/security/keymaster/KeymasterDefs.java

+2 −0
Original line number Diff line number Diff line
@@ -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;

keystore/java/android/security/keystore2/AndroidKeyStoreKeyPairGeneratorSpi.java

+8 −0
Original line number Diff line number Diff line
@@ -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: {