diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-09-23 10:23:21 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-09-23 10:23:21 +0000 |
| commit | 7434fc8193bbd9530f4ceddefce65cc1aa87c00d (patch) | |
| tree | 427eda775c48afa86bf2219797d8a8c19fe43b0d | |
| parent | e31c6f2b6121e220b291850e5bae3d835ecaf663 (diff) | |
| parent | dbea77ebb5345c9ce1d84db198ae78d7b1536fe5 (diff) | |
| download | security-android13-mainline-scheduling-release.tar.gz | |
Snap for 9098257 from dbea77ebb5345c9ce1d84db198ae78d7b1536fe5 to mainline-scheduling-releaseaml_sch_331113000aml_sch_331111000android13-mainline-scheduling-release
Change-Id: Ie48d88a21ec2412594bc2ff60087e864665d0d25
| -rw-r--r-- | keystore2/src/attestation_key_utils.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/keystore2/src/attestation_key_utils.rs b/keystore2/src/attestation_key_utils.rs index 8354ba5c..34089425 100644 --- a/keystore2/src/attestation_key_utils.rs +++ b/keystore2/src/attestation_key_utils.rs @@ -59,8 +59,11 @@ pub fn get_attest_key_info( db: &mut KeystoreDB, ) -> Result<Option<AttestationKeyInfo>> { let challenge_present = params.iter().any(|kp| kp.tag == Tag::ATTESTATION_CHALLENGE); + let is_device_unique_attestation = + params.iter().any(|kp| kp.tag == Tag::DEVICE_UNIQUE_ATTESTATION); match attest_key_descriptor { - None if challenge_present => rem_prov_state + // Do not select an RKP key if DEVICE_UNIQUE_ATTESTATION is present. + None if challenge_present && !is_device_unique_attestation => rem_prov_state .get_remotely_provisioned_attestation_key_and_certs(key, caller_uid, params, db) .context(concat!( "In get_attest_key_and_cert_chain: ", |