diff options
| author | Shawn Willden <swillden@google.com> | 2021-05-04 19:50:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-05-04 19:50:41 +0000 |
| commit | da2b9ae9f86c27aa98dd3c89ed853705b6b6fb8b (patch) | |
| tree | 5706968e366b057395513e5794699c7f4db71e51 /security/keymint/aidl/vts/functional/DeviceUniqueAttestationTest.cpp | |
| parent | 3368b3c6b03cfb81a1df6cd3b626be017452deaa (diff) | |
| parent | ced5c2c23a17b0960f0c0da49132888b4a3f64ab (diff) | |
Merge changes Ic8949e22,Ia3a6363d
* changes:
Update DeviceUniqueAttestationTest to match spec
Make AttestKeyTest not crash if no cert is returned.
Diffstat (limited to 'security/keymint/aidl/vts/functional/DeviceUniqueAttestationTest.cpp')
| -rw-r--r-- | security/keymint/aidl/vts/functional/DeviceUniqueAttestationTest.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/keymint/aidl/vts/functional/DeviceUniqueAttestationTest.cpp b/security/keymint/aidl/vts/functional/DeviceUniqueAttestationTest.cpp index 7009c6ef14..7ed696877d 100644 --- a/security/keymint/aidl/vts/functional/DeviceUniqueAttestationTest.cpp +++ b/security/keymint/aidl/vts/functional/DeviceUniqueAttestationTest.cpp @@ -76,7 +76,7 @@ TEST_P(DeviceUniqueAttestationTest, RsaNonStrongBoxUnimplemented) { .Authorization(TAG_DEVICE_UNIQUE_ATTESTATION), &key_blob, &key_characteristics); - ASSERT_TRUE(result == ErrorCode::UNSUPPORTED_TAG); + ASSERT_EQ(result, ErrorCode::INVALID_ARGUMENT); } /* @@ -102,7 +102,7 @@ TEST_P(DeviceUniqueAttestationTest, EcdsaNonStrongBoxUnimplemented) { .Authorization(TAG_DEVICE_UNIQUE_ATTESTATION), &key_blob, &key_characteristics); - ASSERT_TRUE(result == ErrorCode::UNSUPPORTED_TAG); + ASSERT_EQ(result, ErrorCode::INVALID_ARGUMENT); } /* |