diff options
| author | Brian Orr <brianorr@google.com> | 2021-05-14 18:52:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-05-14 18:52:33 +0000 |
| commit | 7c8e6a102c7b41e35d85931a8aaf445359ccd0c3 (patch) | |
| tree | d5e2627aae2f7c5444d52c9d306604fd54044054 /security/keymint/aidl/vts/functional/DeviceUniqueAttestationTest.cpp | |
| parent | 6c95fc445a4628aefb69f7509d13fd4f2a4716ca (diff) | |
| parent | 0dfa38fb208f76029ddd4d22c3fa5c52a7f0a22a (diff) | |
Merge "Merge SP1A.210510.001 Change-Id: Ibdb729d106274b11a7a8ae5c7366673ab34e637a" into s-keystone-qcom-dev
Diffstat (limited to 'security/keymint/aidl/vts/functional/DeviceUniqueAttestationTest.cpp')
| -rw-r--r-- | security/keymint/aidl/vts/functional/DeviceUniqueAttestationTest.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/security/keymint/aidl/vts/functional/DeviceUniqueAttestationTest.cpp b/security/keymint/aidl/vts/functional/DeviceUniqueAttestationTest.cpp index 7009c6ef14..6f0ee4e74d 100644 --- a/security/keymint/aidl/vts/functional/DeviceUniqueAttestationTest.cpp +++ b/security/keymint/aidl/vts/functional/DeviceUniqueAttestationTest.cpp @@ -70,13 +70,12 @@ TEST_P(DeviceUniqueAttestationTest, RsaNonStrongBoxUnimplemented) { .Digest(Digest::SHA_2_256) .Padding(PaddingMode::RSA_PKCS1_1_5_SIGN) .Authorization(TAG_INCLUDE_UNIQUE_ID) - .Authorization(TAG_NO_AUTH_REQUIRED) .AttestationChallenge("challenge") .AttestationApplicationId("foo") .Authorization(TAG_DEVICE_UNIQUE_ATTESTATION), &key_blob, &key_characteristics); - ASSERT_TRUE(result == ErrorCode::UNSUPPORTED_TAG); + ASSERT_EQ(result, ErrorCode::INVALID_ARGUMENT); } /* @@ -102,7 +101,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); } /* @@ -124,7 +123,6 @@ TEST_P(DeviceUniqueAttestationTest, RsaDeviceUniqueAttestation) { .Digest(Digest::SHA_2_256) .Padding(PaddingMode::RSA_PKCS1_1_5_SIGN) .Authorization(TAG_INCLUDE_UNIQUE_ID) - .Authorization(TAG_NO_AUTH_REQUIRED) .AttestationChallenge("challenge") .AttestationApplicationId("foo") .Authorization(TAG_DEVICE_UNIQUE_ATTESTATION), |