diff options
| author | Scott Lobdell <slobdell@google.com> | 2022-04-08 23:25:05 +0000 |
|---|---|---|
| committer | Scott Lobdell <slobdell@google.com> | 2022-04-08 23:36:15 +0000 |
| commit | 9051e9b8460571e92d870afd584e06e1621800f7 (patch) | |
| tree | d73bd6911bec74bc7f3ddb6c377aab00601b73f1 /security/keymint/aidl/vts/functional/KeyMintTest.cpp | |
| parent | cb23b25a3c51a69bb3727606b0b3a9aa5e82a144 (diff) | |
| parent | 1ff356435d7d006e1606ff3dc13c8d597c6117c9 (diff) | |
Merge TP1A.220404.001
Change-Id: I3bce78ab5d441ef9e6c038cf7ebea0adcc41d47e
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 3aa09fafe8..e73f46c21f 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); |