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

Commit 30f2961c authored by Eran Messeri's avatar Eran Messeri Committed by Android (Google) Code Review
Browse files

Merge "Wire individual attestation"

parents ef055fc6 c5450766

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

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ public final class KeymasterDefs { 
    public static final int KM_TAG_ATTESTATION_ID_MEID = KM_BYTES | 715;

    public static final int KM_TAG_ATTESTATION_ID_MANUFACTURER = KM_BYTES | 716;

    public static final int KM_TAG_ATTESTATION_ID_MODEL = KM_BYTES | 717;

    public static final int KM_TAG_DEVICE_UNIQUE_ATTESTATION = KM_BOOL | 720;



    public static final int KM_TAG_ASSOCIATED_DATA = KM_BYTES | 1000;

    public static final int KM_TAG_NONCE = KM_BYTES | 1001;

keystore/java/android/security/keystore/AttestationUtils.java

+1 −4
Original line number Diff line number Diff line
@@ -204,10 +204,7 @@ public abstract class AttestationUtils { 
                    break;

                }

                case USE_INDIVIDUAL_ATTESTATION: {

                    //TODO: Add the Keymaster tag for requesting the use of individual

                    //attestation certificate, which should be

                    //KeymasterDefs.KM_TAG_DEVICE_UNIQUE_ATTESTATION

                    attestArgs.addBoolean(720);

                    attestArgs.addBoolean(KeymasterDefs.KM_TAG_DEVICE_UNIQUE_ATTESTATION);

                    break;

                }

                default: