diff options
| author | Eran Messeri <eranm@google.com> | 2022-03-31 14:27:32 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-31 14:27:32 +0000 |
| commit | 8adaed5f628c339bb5b9d3a0ea9b73ac57ce9ccd (patch) | |
| tree | a6689145488e20123c600924e137170ded60cd9d /security/keymint/aidl/vts/functional/KeyMintTest.cpp | |
| parent | 4e90fa8ecd40bf30b7ba5b450687090e7071ca20 (diff) | |
| parent | d8fdf0b80433dd6c7b5de0128195c84b26ac66dc (diff) | |
Merge "KeyMint: Device IDs attestation based on verion." am: 1b7abc43b6 am: d8fdf0b804
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2028224
Change-Id: I6a50f6d5abc485cb4fb38df7383a5cc83ad20a86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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); |