diff options
| author | David Drysdale <drysdale@google.com> | 2021-05-20 12:05:26 +0100 |
|---|---|---|
| committer | David Drysdale <drysdale@google.com> | 2021-05-25 11:07:51 +0100 |
| commit | 300b555b6b4008be4dbe53d1a8ce66dcc1696207 (patch) | |
| tree | 85844ebbb19c4b9f9b1bfd1d1e0e3f6865ab1214 /security/keymint/aidl/vts/functional/AttestKeyTest.cpp | |
| parent | 4477ee052ff3ebbb4521c829495105cca226246b (diff) | |
KeyMint VTS: test getKeyCharacteristics()
Bug: 186685601
Bug: 188855306
Test: VtsAidlKeyMintTargetTest
Change-Id: Icf400533b0ded98b9338f2d782d95d90c7efbff4
Diffstat (limited to 'security/keymint/aidl/vts/functional/AttestKeyTest.cpp')
| -rw-r--r-- | security/keymint/aidl/vts/functional/AttestKeyTest.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/security/keymint/aidl/vts/functional/AttestKeyTest.cpp b/security/keymint/aidl/vts/functional/AttestKeyTest.cpp index b8699e9d50..ae2becdf9b 100644 --- a/security/keymint/aidl/vts/functional/AttestKeyTest.cpp +++ b/security/keymint/aidl/vts/functional/AttestKeyTest.cpp @@ -141,11 +141,18 @@ TEST_P(AttestKeyTest, AllRsaSizes) { attest_key, &attested_key_blob, &attested_key_characteristics, &attested_key_cert_chain)); + // The returned key characteristics will include CREATION_DATETIME (checked below) + // in SecurityLevel::KEYSTORE; this will be stripped out in the CheckCharacteristics() + // call below, to match what getKeyCharacteristics() returns (which doesn't include + // any SecurityLevel::KEYSTORE characteristics). + CheckCharacteristics(attested_key_blob, attested_key_characteristics); + CheckedDeleteKey(&attested_key_blob); CheckedDeleteKey(&attest_key.keyBlob); hw_enforced = HwEnforcedAuthorizations(attested_key_characteristics); sw_enforced = SwEnforcedAuthorizations(attested_key_characteristics); + // The client-specified CREATION_DATETIME should be in sw_enforced. // Its presence will also trigger verify_attestation_record() to check that it // is in the attestation extension with a matching value. |