diff options
Diffstat (limited to 'identity/aidl/vts/VtsAttestationTests.cpp')
-rw-r--r-- | identity/aidl/vts/VtsAttestationTests.cpp | 46 |
1 files changed, 8 insertions, 38 deletions
diff --git a/identity/aidl/vts/VtsAttestationTests.cpp b/identity/aidl/vts/VtsAttestationTests.cpp index 673d08bb42..5529853009 100644 --- a/identity/aidl/vts/VtsAttestationTests.cpp +++ b/identity/aidl/vts/VtsAttestationTests.cpp @@ -29,7 +29,6 @@ #include <future> #include <map> -#include "VtsAttestationParserSupport.h" #include "VtsIdentityTestUtils.h" namespace android::hardware::identity { @@ -44,7 +43,6 @@ using ::android::sp; using ::android::String16; using ::android::binder::Status; -using test_utils::AttestationCertificateParser; using test_utils::setupWritableCredential; using test_utils::validateAttestationCertificate; @@ -61,38 +59,12 @@ class VtsAttestationTests : public testing::TestWithParam<std::string> { sp<IIdentityCredentialStore> credentialStore_; }; -TEST_P(VtsAttestationTests, verifyAttestationWithNonemptyChallengeEmptyId) { - Status result; - - HardwareInformation hwInfo; - ASSERT_TRUE(credentialStore_->getHardwareInformation(&hwInfo).isOk()); - - sp<IWritableIdentityCredential> writableCredential; - ASSERT_TRUE(setupWritableCredential(writableCredential, credentialStore_)); - - string challenge = "NotSoRandomChallenge"; - vector<uint8_t> attestationChallenge(challenge.begin(), challenge.end()); - vector<Certificate> attestationCertificate; - vector<uint8_t> attestationApplicationId = {}; - - result = writableCredential->getAttestationCertificate( - attestationApplicationId, attestationChallenge, &attestationCertificate); - - ASSERT_TRUE(result.isOk()) << result.exceptionCode() << "; " << result.exceptionMessage() - << endl; - - EXPECT_TRUE(validateAttestationCertificate(attestationCertificate, attestationChallenge, - attestationApplicationId, hwInfo)); -} - TEST_P(VtsAttestationTests, verifyAttestationWithNonemptyChallengeNonemptyId) { Status result; - HardwareInformation hwInfo; - ASSERT_TRUE(credentialStore_->getHardwareInformation(&hwInfo).isOk()); - sp<IWritableIdentityCredential> writableCredential; - ASSERT_TRUE(setupWritableCredential(writableCredential, credentialStore_)); + ASSERT_TRUE(setupWritableCredential(writableCredential, credentialStore_, + false /* testCredential */)); string challenge = "NotSoRandomChallenge1NotSoRandomChallenge1NotSoRandomChallenge1"; vector<uint8_t> attestationChallenge(challenge.begin(), challenge.end()); @@ -106,18 +78,16 @@ TEST_P(VtsAttestationTests, verifyAttestationWithNonemptyChallengeNonemptyId) { ASSERT_TRUE(result.isOk()) << result.exceptionCode() << "; " << result.exceptionMessage() << endl; - EXPECT_TRUE(validateAttestationCertificate(attestationCertificate, attestationChallenge, - attestationApplicationId, hwInfo)); + validateAttestationCertificate(attestationCertificate, attestationChallenge, + attestationApplicationId, false); } TEST_P(VtsAttestationTests, verifyAttestationWithVeryShortChallengeAndId) { Status result; - HardwareInformation hwInfo; - ASSERT_TRUE(credentialStore_->getHardwareInformation(&hwInfo).isOk()); - sp<IWritableIdentityCredential> writableCredential; - ASSERT_TRUE(setupWritableCredential(writableCredential, credentialStore_)); + ASSERT_TRUE(setupWritableCredential(writableCredential, credentialStore_, + false /* testCredential */)); string challenge = "c"; vector<uint8_t> attestationChallenge(challenge.begin(), challenge.end()); @@ -131,8 +101,8 @@ TEST_P(VtsAttestationTests, verifyAttestationWithVeryShortChallengeAndId) { ASSERT_TRUE(result.isOk()) << result.exceptionCode() << "; " << result.exceptionMessage() << endl; - EXPECT_TRUE(validateAttestationCertificate(attestationCertificate, attestationChallenge, - attestationApplicationId, hwInfo)); + validateAttestationCertificate(attestationCertificate, attestationChallenge, + attestationApplicationId, false); } GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(VtsAttestationTests); |