diff options
| author | 2023-01-31 19:12:50 +0000 | |
|---|---|---|
| committer | 2023-01-31 19:12:50 +0000 | |
| commit | 96c2a6b2cf78dac27a354191cc4e0cff05f8d7e2 (patch) | |
| tree | f2d677dc5798e98524ce905d576873c275b856af /keystore/java | |
| parent | e001eaf171acb5d3b893e4836358fea84fdafa5a (diff) | |
| parent | ae6d7db49a801ffd2a5b5b004d5c6ac5992ad64a (diff) | |
Merge "Keystore: Attestation fix in AOSP builds" am: ecb4b6d158 am: c17512848d am: ae6d7db49a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2237500
Change-Id: I5e46aa4ad3b0f5492544d8844522697b28e933ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'keystore/java')
| -rw-r--r-- | keystore/java/android/security/keystore2/AndroidKeyStoreKeyPairGeneratorSpi.java | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/keystore/java/android/security/keystore2/AndroidKeyStoreKeyPairGeneratorSpi.java b/keystore/java/android/security/keystore2/AndroidKeyStoreKeyPairGeneratorSpi.java index 2830d7effa99..471504588673 100644 --- a/keystore/java/android/security/keystore2/AndroidKeyStoreKeyPairGeneratorSpi.java +++ b/keystore/java/android/security/keystore2/AndroidKeyStoreKeyPairGeneratorSpi.java @@ -801,25 +801,32 @@ public abstract class AndroidKeyStoreKeyPairGeneratorSpi extends KeyPairGenerato )); if (mSpec.isDevicePropertiesAttestationIncluded()) { + final String platformReportedBrand = TextUtils.isEmpty(Build.BRAND_FOR_ATTESTATION) + ? Build.BRAND : Build.BRAND_FOR_ATTESTATION; params.add(KeyStore2ParameterUtils.makeBytes( KeymasterDefs.KM_TAG_ATTESTATION_ID_BRAND, - Build.BRAND.getBytes(StandardCharsets.UTF_8) + platformReportedBrand.getBytes(StandardCharsets.UTF_8) )); params.add(KeyStore2ParameterUtils.makeBytes( KeymasterDefs.KM_TAG_ATTESTATION_ID_DEVICE, Build.DEVICE.getBytes(StandardCharsets.UTF_8) )); + final String platformReportedProduct = + TextUtils.isEmpty(Build.PRODUCT_FOR_ATTESTATION) ? Build.PRODUCT : + Build.PRODUCT_FOR_ATTESTATION; params.add(KeyStore2ParameterUtils.makeBytes( KeymasterDefs.KM_TAG_ATTESTATION_ID_PRODUCT, - Build.PRODUCT.getBytes(StandardCharsets.UTF_8) + platformReportedProduct.getBytes(StandardCharsets.UTF_8) )); params.add(KeyStore2ParameterUtils.makeBytes( KeymasterDefs.KM_TAG_ATTESTATION_ID_MANUFACTURER, Build.MANUFACTURER.getBytes(StandardCharsets.UTF_8) )); + final String platformReportedModel = TextUtils.isEmpty(Build.MODEL_FOR_ATTESTATION) + ? Build.MODEL : Build.MODEL_FOR_ATTESTATION; params.add(KeyStore2ParameterUtils.makeBytes( KeymasterDefs.KM_TAG_ATTESTATION_ID_MODEL, - Build.MODEL.getBytes(StandardCharsets.UTF_8) + platformReportedModel.getBytes(StandardCharsets.UTF_8) )); } |