diff options
Diffstat (limited to 'security/keymint/aidl/vts/functional/DeviceUniqueAttestationTest.cpp')
| -rw-r--r-- | security/keymint/aidl/vts/functional/DeviceUniqueAttestationTest.cpp | 35 |
1 files changed, 27 insertions, 8 deletions
diff --git a/security/keymint/aidl/vts/functional/DeviceUniqueAttestationTest.cpp b/security/keymint/aidl/vts/functional/DeviceUniqueAttestationTest.cpp index 79716b1354..1dc5df3429 100644 --- a/security/keymint/aidl/vts/functional/DeviceUniqueAttestationTest.cpp +++ b/security/keymint/aidl/vts/functional/DeviceUniqueAttestationTest.cpp @@ -52,8 +52,9 @@ class DeviceUniqueAttestationTest : public KeyMintAidlTestBase { EXPECT_TRUE(ChainSignaturesAreValid(cert_chain_, /* strict_issuer_check= */ false)); AuthorizationSet sw_enforced = SwEnforcedAuthorizations(key_characteristics); - EXPECT_TRUE(verify_attestation_record("challenge", "foo", sw_enforced, hw_enforced, - SecLevel(), cert_chain_[0].encodedCertificate)); + EXPECT_TRUE(verify_attestation_record(AidlVersion(), "challenge", "foo", sw_enforced, + hw_enforced, SecLevel(), + cert_chain_[0].encodedCertificate)); } }; @@ -64,7 +65,9 @@ class DeviceUniqueAttestationTest : public KeyMintAidlTestBase { * attestation. */ TEST_P(DeviceUniqueAttestationTest, RsaNonStrongBoxUnimplemented) { - if (SecLevel() == SecurityLevel::STRONGBOX) return; + if (SecLevel() == SecurityLevel::STRONGBOX) { + GTEST_SKIP() << "Test not applicable to StrongBox device"; + } vector<uint8_t> key_blob; vector<KeyCharacteristics> key_characteristics; @@ -77,6 +80,7 @@ TEST_P(DeviceUniqueAttestationTest, RsaNonStrongBoxUnimplemented) { .Padding(PaddingMode::RSA_PKCS1_1_5_SIGN) .Authorization(TAG_INCLUDE_UNIQUE_ID) .Authorization(TAG_CREATION_DATETIME, 1619621648000) + .SetDefaultValidity() .AttestationChallenge("challenge") .AttestationApplicationId("foo") .Authorization(TAG_DEVICE_UNIQUE_ATTESTATION), @@ -92,7 +96,9 @@ TEST_P(DeviceUniqueAttestationTest, RsaNonStrongBoxUnimplemented) { * attestation. */ TEST_P(DeviceUniqueAttestationTest, EcdsaNonStrongBoxUnimplemented) { - if (SecLevel() == SecurityLevel::STRONGBOX) return; + if (SecLevel() == SecurityLevel::STRONGBOX) { + GTEST_SKIP() << "Test not applicable to StrongBox device"; + } vector<uint8_t> key_blob; vector<KeyCharacteristics> key_characteristics; @@ -104,6 +110,7 @@ TEST_P(DeviceUniqueAttestationTest, EcdsaNonStrongBoxUnimplemented) { .Digest(Digest::SHA_2_256) .Authorization(TAG_INCLUDE_UNIQUE_ID) .Authorization(TAG_CREATION_DATETIME, 1619621648000) + .SetDefaultValidity() .AttestationChallenge("challenge") .AttestationApplicationId("foo") .Authorization(TAG_DEVICE_UNIQUE_ATTESTATION), @@ -119,7 +126,9 @@ TEST_P(DeviceUniqueAttestationTest, EcdsaNonStrongBoxUnimplemented) { * attestation correctly, if implemented. */ TEST_P(DeviceUniqueAttestationTest, RsaDeviceUniqueAttestation) { - if (SecLevel() != SecurityLevel::STRONGBOX) return; + if (SecLevel() != SecurityLevel::STRONGBOX) { + GTEST_SKIP() << "Test not applicable to non-StrongBox device"; + } vector<uint8_t> key_blob; vector<KeyCharacteristics> key_characteristics; @@ -132,6 +141,7 @@ TEST_P(DeviceUniqueAttestationTest, RsaDeviceUniqueAttestation) { .Padding(PaddingMode::RSA_PKCS1_1_5_SIGN) .Authorization(TAG_INCLUDE_UNIQUE_ID) .Authorization(TAG_CREATION_DATETIME, 1619621648000) + .SetDefaultValidity() .AttestationChallenge("challenge") .AttestationApplicationId("foo") .Authorization(TAG_DEVICE_UNIQUE_ATTESTATION), @@ -177,7 +187,9 @@ TEST_P(DeviceUniqueAttestationTest, RsaDeviceUniqueAttestation) { * attestation correctly, if implemented. */ TEST_P(DeviceUniqueAttestationTest, EcdsaDeviceUniqueAttestation) { - if (SecLevel() != SecurityLevel::STRONGBOX) return; + if (SecLevel() != SecurityLevel::STRONGBOX) { + GTEST_SKIP() << "Test not applicable to non-StrongBox device"; + } vector<uint8_t> key_blob; vector<KeyCharacteristics> key_characteristics; @@ -188,6 +200,7 @@ TEST_P(DeviceUniqueAttestationTest, EcdsaDeviceUniqueAttestation) { .Digest(Digest::SHA_2_256) .Authorization(TAG_INCLUDE_UNIQUE_ID) .Authorization(TAG_CREATION_DATETIME, 1619621648000) + .SetDefaultValidity() .AttestationChallenge("challenge") .AttestationApplicationId("foo") .Authorization(TAG_DEVICE_UNIQUE_ATTESTATION), @@ -230,7 +243,9 @@ TEST_P(DeviceUniqueAttestationTest, EcdsaDeviceUniqueAttestation) { * local device. */ TEST_P(DeviceUniqueAttestationTest, EcdsaDeviceUniqueAttestationID) { - if (SecLevel() != SecurityLevel::STRONGBOX) return; + if (SecLevel() != SecurityLevel::STRONGBOX) { + GTEST_SKIP() << "Test not applicable to non-StrongBox device"; + } // Collection of valid attestation ID tags. auto attestation_id_tags = AuthorizationSetBuilder(); @@ -253,6 +268,7 @@ TEST_P(DeviceUniqueAttestationTest, EcdsaDeviceUniqueAttestationID) { .Digest(Digest::SHA_2_256) .Authorization(TAG_INCLUDE_UNIQUE_ID) .Authorization(TAG_CREATION_DATETIME, 1619621648000) + .SetDefaultValidity() .AttestationChallenge("challenge") .AttestationApplicationId("foo") .Authorization(TAG_DEVICE_UNIQUE_ATTESTATION); @@ -298,7 +314,9 @@ TEST_P(DeviceUniqueAttestationTest, EcdsaDeviceUniqueAttestationID) { * don't match the local device. */ TEST_P(DeviceUniqueAttestationTest, EcdsaDeviceUniqueAttestationMismatchID) { - if (SecLevel() != SecurityLevel::STRONGBOX) return; + if (SecLevel() != SecurityLevel::STRONGBOX) { + GTEST_SKIP() << "Test not applicable to non-StrongBox device"; + } // Collection of invalid attestation ID tags. auto attestation_id_tags = @@ -323,6 +341,7 @@ TEST_P(DeviceUniqueAttestationTest, EcdsaDeviceUniqueAttestationMismatchID) { .Digest(Digest::SHA_2_256) .Authorization(TAG_INCLUDE_UNIQUE_ID) .Authorization(TAG_CREATION_DATETIME, 1619621648000) + .SetDefaultValidity() .AttestationChallenge("challenge") .AttestationApplicationId("foo") .Authorization(TAG_DEVICE_UNIQUE_ATTESTATION); |