From 9db217d874c7aa448315636588c1ae3b39f8f41e Mon Sep 17 00:00:00 2001 From: Prashant Patil Date: Wed, 28 Sep 2022 15:58:07 +0100 Subject: [PATCH] Keystore: Attestation fix in AOSP builds Alternet device properties used for attestation on AOSP and GSI builds. Attestation ids were different in AOSP/GSI builds than provisioned ids in keymint. Hence additional properties used to make these ids identical to provisioned ids. Bug: 110779648 Bug: 259376922 Test: atest VtsAidlKeyMintTargetTest:PerInstance/NewKeyGenerationTest#EcdsaAttestationIdTags/0_android_hardware_security_keymint_IKeyMintDevice_default Test: atest VtsAidlKeyMintTargetTest:PerInstance/NewKeyGenerationTest#EcdsaAttestationIdTags/1_android_hardware_security_keymint_IKeyMintDevice_strongbox Test: atest CtsKeystoreTestCases:android.keystore.cts.KeyAttestationTest CtsKeystoreTestCases:DeviceOwnerKeyManagementTest Change-Id: If6a7afd5c0ae50e1532e8345d5b48c910fd44683 --- aosp_raven.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/aosp_raven.mk b/aosp_raven.mk index 079de8a..6a29283 100644 --- a/aosp_raven.mk +++ b/aosp_raven.mk @@ -18,9 +18,12 @@ $(call inherit-product, device/google/gs101/aosp_common.mk) $(call inherit-product, device/google/raviole/device-raven.mk) PRODUCT_NAME := aosp_raven +PRODUCT_NAME_FOR_ATTESTATION := raven PRODUCT_DEVICE := raven PRODUCT_MODEL := AOSP on Raven +PRODUCT_MODEL_FOR_ATTESTATION := Pixel 6 Pro PRODUCT_BRAND := Android +PRODUCT_BRAND_FOR_ATTESTATION := google PRODUCT_MANUFACTURER := Google PRODUCT_PACKAGES += com.android.vndk.current.on_vendor