Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Keystore: Attestation fix in non AOSP builds" am: 538cb6588f

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

Change-Id: I283dc1dfa48022d4cde2db56e40f64883ae209ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-02-06 21:49:28 +00:00
committed by Automerger Merge Worker
parent 5623990f16 538cb6588f
commit e023873bab
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
keystore/java/android/security/keystore2/AndroidKeyStoreKeyPairGeneratorSpi.java
View File

@@ -801,7 +801,8 @@ public abstract class AndroidKeyStoreKeyPairGeneratorSpi extends KeyPairGenerato
)); ));
if (mSpec.isDevicePropertiesAttestationIncluded()) { if (mSpec.isDevicePropertiesAttestationIncluded()) {
final String platformReportedBrand = TextUtils.isEmpty(Build.BRAND_FOR_ATTESTATION) final String platformReportedBrand =
isPropertyEmptyOrUnknown(Build.BRAND_FOR_ATTESTATION)
? Build.BRAND : Build.BRAND_FOR_ATTESTATION; ? Build.BRAND : Build.BRAND_FOR_ATTESTATION;
params.add(KeyStore2ParameterUtils.makeBytes( params.add(KeyStore2ParameterUtils.makeBytes(
KeymasterDefs.KM_TAG_ATTESTATION_ID_BRAND, KeymasterDefs.KM_TAG_ATTESTATION_ID_BRAND,
@@ -812,8 +813,8 @@ public abstract class AndroidKeyStoreKeyPairGeneratorSpi extends KeyPairGenerato
Build.DEVICE.getBytes(StandardCharsets.UTF_8) Build.DEVICE.getBytes(StandardCharsets.UTF_8)
)); ));
final String platformReportedProduct = final String platformReportedProduct =
TextUtils.isEmpty(Build.PRODUCT_FOR_ATTESTATION) ? Build.PRODUCT : isPropertyEmptyOrUnknown(Build.PRODUCT_FOR_ATTESTATION)
Build.PRODUCT_FOR_ATTESTATION; ? Build.PRODUCT : Build.PRODUCT_FOR_ATTESTATION;
params.add(KeyStore2ParameterUtils.makeBytes( params.add(KeyStore2ParameterUtils.makeBytes(
KeymasterDefs.KM_TAG_ATTESTATION_ID_PRODUCT, KeymasterDefs.KM_TAG_ATTESTATION_ID_PRODUCT,
platformReportedProduct.getBytes(StandardCharsets.UTF_8) platformReportedProduct.getBytes(StandardCharsets.UTF_8)
@@ -822,7 +823,8 @@ public abstract class AndroidKeyStoreKeyPairGeneratorSpi extends KeyPairGenerato
KeymasterDefs.KM_TAG_ATTESTATION_ID_MANUFACTURER, KeymasterDefs.KM_TAG_ATTESTATION_ID_MANUFACTURER,
Build.MANUFACTURER.getBytes(StandardCharsets.UTF_8) Build.MANUFACTURER.getBytes(StandardCharsets.UTF_8)
)); ));
final String platformReportedModel = TextUtils.isEmpty(Build.MODEL_FOR_ATTESTATION) final String platformReportedModel =
isPropertyEmptyOrUnknown(Build.MODEL_FOR_ATTESTATION)
? Build.MODEL : Build.MODEL_FOR_ATTESTATION; ? Build.MODEL : Build.MODEL_FOR_ATTESTATION;
params.add(KeyStore2ParameterUtils.makeBytes( params.add(KeyStore2ParameterUtils.makeBytes(
KeymasterDefs.KM_TAG_ATTESTATION_ID_MODEL, KeymasterDefs.KM_TAG_ATTESTATION_ID_MODEL,
@@ -1227,4 +1229,8 @@ public abstract class AndroidKeyStoreKeyPairGeneratorSpi extends KeyPairGenerato
result.retainAll(authorizedKeymasterKeyDigests); result.retainAll(authorizedKeymasterKeyDigests);
return result; return result;
} }
private boolean isPropertyEmptyOrUnknown(String property) {
return TextUtils.isEmpty(property) || property.equals(Build.UNKNOWN);
}
} }