diff options
| author | Eran Messeri <eranm@google.com> | 2022-03-31 13:47:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-03-31 13:47:42 +0000 |
| commit | 1b7abc43b633b47612d48c01cb995262fcc1107b (patch) | |
| tree | 5ace759f227e207da9b97c2185132e006e4a332f /security/keymint/aidl/vts/functional/KeyMintTest.cpp | |
| parent | 0dac5667f56d63dae0a0f428ca666b18d4f14017 (diff) | |
| parent | 88ad1890367281ce0387b2ab7631e451e1c463fd (diff) | |
Merge "KeyMint: Device IDs attestation based on verion."
Diffstat (limited to 'security/keymint/aidl/vts/functional/KeyMintTest.cpp')
| -rw-r--r-- | security/keymint/aidl/vts/functional/KeyMintTest.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/keymint/aidl/vts/functional/KeyMintTest.cpp b/security/keymint/aidl/vts/functional/KeyMintTest.cpp index d8502e43cc..3b75c50acd 100644 --- a/security/keymint/aidl/vts/functional/KeyMintTest.cpp +++ b/security/keymint/aidl/vts/functional/KeyMintTest.cpp @@ -1986,8 +1986,8 @@ TEST_P(NewKeyGenerationTest, EcdsaAttestationIdTags) { if (SecLevel() == SecurityLevel::STRONGBOX) { if (result == ErrorCode::ATTESTATION_KEYS_NOT_PROVISIONED) return; } - if (result == ErrorCode::CANNOT_ATTEST_IDS) { - // Device ID attestation is optional; KeyMint may not support it at all. + if (result == ErrorCode::CANNOT_ATTEST_IDS && !isDeviceIdAttestationRequired()) { + // ID attestation was optional till api level 32, from api level 33 it is mandatory. continue; } ASSERT_EQ(result, ErrorCode::OK); |