diff options
| author | Eran Messeri <eranm@google.com> | 2020-08-06 08:23:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-06 08:23:21 +0000 |
| commit | 1c845757f2196d18ab2ed67d93de94390e43c69a (patch) | |
| tree | ec3922bbc6c63ed62d487da1a06dec74a87dbfaa | |
| parent | 62576bd239eb58c5561949e83cde18409cad2e0e (diff) | |
| parent | 51914eb0eb6cdf0c197f141fe1be6a1f7c931c14 (diff) | |
| download | platform_hardware_interfaces-1c845757f2196d18ab2ed67d93de94390e43c69a.tar.gz platform_hardware_interfaces-1c845757f2196d18ab2ed67d93de94390e43c69a.tar.bz2 platform_hardware_interfaces-1c845757f2196d18ab2ed67d93de94390e43c69a.zip | |
Merge "Fix Keymaster VTS unique attestation failure" am: 3e4d8d0856 am: b0f932739a am: 6a1198e166 am: 51914eb0eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12306609
Change-Id: Ifd50b6e0e7bc115bee6d910b732d617c12e87cf1
| -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) { |