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

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

Merge "Revert "Added check for misprovisioned Pixel 2 device.""

parents d9d2d7c3 74e5dc00

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

+1 −34
Original line number Diff line number Diff line
@@ -22,14 +22,12 @@ import android.annotation.RequiresPermission; 
import android.annotation.SystemApi;

import android.annotation.TestApi;

import android.content.Context;

import android.content.res.Resources;

import android.os.Build;

import android.security.KeyStore;

import android.security.keymaster.KeymasterArguments;

import android.security.keymaster.KeymasterCertificateChain;

import android.security.keymaster.KeymasterDefs;

import android.telephony.TelephonyManager;

import android.text.TextUtils;

import android.util.ArraySet;



import java.io.ByteArrayInputStream;
@@ -126,37 +124,6 @@ public abstract class AttestationUtils { 
    @NonNull public static KeymasterArguments prepareAttestationArguments(Context context,

            @NonNull int[] idTypes, @NonNull byte[] attestationChallenge) throws

            DeviceIdAttestationException {

        return prepareAttestationArguments(context, idTypes,attestationChallenge, Build.BRAND);

    }



    /**

     * Prepares Keymaster Arguments with attestation data for misprovisioned Pixel 2 device.

     * See http://go/keyAttestationFailure and http://b/69471841 for more info.

     * @hide should only be used by KeyChain.

     */

    @NonNull public static KeymasterArguments prepareAttestationArgumentsIfMisprovisioned(

            Context context, @NonNull int[] idTypes, @NonNull byte[] attestationChallenge) throws

            DeviceIdAttestationException {

        Resources resources = context.getResources();

        String misprovisionedBrand = resources.getString(

                com.android.internal.R.string.config_misprovisionedBrandValue);

        if (!TextUtils.isEmpty(misprovisionedBrand) && !isPotentiallyMisprovisionedDevice(context)){

            return null;

        }

        return prepareAttestationArguments(

                context, idTypes, attestationChallenge, misprovisionedBrand);

    }



    @NonNull private static boolean isPotentiallyMisprovisionedDevice(Context context) {

        Resources resources = context.getResources();

        String misprovisionedModel = resources.getString(

                com.android.internal.R.string.config_misprovisionedDeviceModel);

        return (Build.MODEL.equals(misprovisionedModel));

    }



    @NonNull private static KeymasterArguments prepareAttestationArguments(Context context,

            @NonNull int[] idTypes, @NonNull byte[] attestationChallenge, String brand) throws

            DeviceIdAttestationException {

        // Check method arguments, retrieve requested device IDs and prepare attestation arguments.

        if (attestationChallenge == null) {

            throw new NullPointerException("Missing attestation challenge");
@@ -213,7 +180,7 @@ public abstract class AttestationUtils { 
            }

        }

        attestArgs.addBytes(KeymasterDefs.KM_TAG_ATTESTATION_ID_BRAND,

                brand.getBytes(StandardCharsets.UTF_8));

                Build.BRAND.getBytes(StandardCharsets.UTF_8));

        attestArgs.addBytes(KeymasterDefs.KM_TAG_ATTESTATION_ID_DEVICE,

                Build.DEVICE.getBytes(StandardCharsets.UTF_8));

        attestArgs.addBytes(KeymasterDefs.KM_TAG_ATTESTATION_ID_PRODUCT,