diff options
| author | Eran Messeri <eranm@google.com> | 2020-07-24 13:46:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-24 13:46:52 +0000 |
| commit | ff5a28d95833d9d1ad50b71ca8a3eb4a11c44981 (patch) | |
| tree | b6c34b9c5526025196caa8e11d57b35b61d9a45a | |
| parent | 9e963a6ab5fd6b23a17426dcad784afee94fc777 (diff) | |
| parent | 4e3c9a1d659c86878dbb10d3d1e420718365ab5a (diff) | |
Merge "Fix Keymaster VTS unique attestation failure" am: 3e4d8d0856 am: b0f932739a am: 4e3c9a1d65
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1372156
Change-Id: If6a4892eb9a26fa4e407d67f5e067c8624271c7f
| -rw-r--r-- | keymaster/4.1/vts/functional/DeviceUniqueAttestationTest.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/keymaster/4.1/vts/functional/DeviceUniqueAttestationTest.cpp b/keymaster/4.1/vts/functional/DeviceUniqueAttestationTest.cpp index 495de0f97d..728a523d65 100644 --- a/keymaster/4.1/vts/functional/DeviceUniqueAttestationTest.cpp +++ b/keymaster/4.1/vts/functional/DeviceUniqueAttestationTest.cpp @@ -212,9 +212,11 @@ TEST_P(DeviceUniqueAttestationTest, NonStrongBoxOnly) { EXPECT_EQ(ErrorCode::UNIMPLEMENTED, convert(AttestKey( AuthorizationSetBuilder() + .Authorization(TAG_DEVICE_UNIQUE_ATTESTATION) .Authorization(TAG_ATTESTATION_CHALLENGE, HidlBuf("challenge")) .Authorization(TAG_ATTESTATION_APPLICATION_ID, HidlBuf("foo")), &cert_chain))); + CheckedDeleteKey(); } TEST_P(DeviceUniqueAttestationTest, Rsa) { |