Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dfce78b0 authored by David Drysdale's avatar David Drysdale Committed by Automerger Merge Worker
Browse files

Merge "KeyMint VTS: use GTEST_SKIP for optional fn" am: c8520ad8 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1853955

Change-Id: I11357774749b08daef27dfb147e859325f53633d
parents af6f2a06 c8520ad8

security/keymint/aidl/vts/functional/DeviceUniqueAttestationTest.cpp

+18 −6
Original line number Diff line number Diff line
@@ -64,7 +64,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;
@@ -91,7 +93,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;
@@ -117,7 +121,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;
@@ -174,7 +180,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;
@@ -226,7 +234,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();
@@ -292,7 +302,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 =

security/keymint/aidl/vts/functional/KeyMintTest.cpp

+112 −79
Original line number Diff line number Diff line
@@ -1840,7 +1840,9 @@ TEST_P(NewKeyGenerationTest, EcdsaInvalidSize) { 
 * INVALID_ARGUMENT.

 */

TEST_P(NewKeyGenerationTest, EcdsaMismatchKeySize) {

    if (SecLevel() == SecurityLevel::STRONGBOX) return;

    if (SecLevel() == SecurityLevel::STRONGBOX) {

        GTEST_SKIP() << "Test not applicable to StrongBox device";

    }



    auto result = GenerateKey(AuthorizationSetBuilder()

                                      .Authorization(TAG_ALGORITHM, Algorithm::EC)
@@ -2067,7 +2069,9 @@ TEST_P(NewKeyGenerationTest, HmacCheckMinMacLengths) { 
 * Verifies that keymint rejects HMAC key generation with multiple specified digest algorithms.

 */

TEST_P(NewKeyGenerationTest, HmacMultipleDigests) {

    if (SecLevel() == SecurityLevel::STRONGBOX) return;

    if (SecLevel() == SecurityLevel::STRONGBOX) {

        GTEST_SKIP() << "Test not applicable to StrongBox device";

    }



    ASSERT_EQ(ErrorCode::UNSUPPORTED_DIGEST,

              GenerateKey(AuthorizationSetBuilder()
@@ -2291,7 +2295,9 @@ TEST_P(SigningOperationsTest, RsaPaddingNoneDoesNotAllowOther) { 
 * presented.

 */

TEST_P(SigningOperationsTest, NoUserConfirmation) {

    if (SecLevel() == SecurityLevel::STRONGBOX) return;

    if (SecLevel() == SecurityLevel::STRONGBOX) {

        GTEST_SKIP() << "Test not applicable to StrongBox device";

    }

    ASSERT_EQ(ErrorCode::OK, GenerateKey(AuthorizationSetBuilder()

                                                 .RsaSigningKey(1024, 65537)

                                                 .Digest(Digest::NONE)
@@ -2381,7 +2387,9 @@ TEST_P(SigningOperationsTest, RsaPkcs1NoDigestTooLong) { 
 * for a 1024-bit key.

 */

TEST_P(SigningOperationsTest, RsaPssSha512TooSmallKey) {

    if (SecLevel() == SecurityLevel::STRONGBOX) return;

    if (SecLevel() == SecurityLevel::STRONGBOX) {

        GTEST_SKIP() << "Test not applicable to StrongBox device";

    }

    ASSERT_EQ(ErrorCode::OK, GenerateKey(AuthorizationSetBuilder()

                                                 .RsaSigningKey(1024, 65537)

                                                 .Digest(Digest::SHA_2_512)
@@ -3200,7 +3208,9 @@ TEST_P(ImportKeyTest, EcdsaP256SEC1Success) { 
 * Verifies that importing and using an ECDSA P-521 key pair works correctly.

 */

TEST_P(ImportKeyTest, Ecdsa521Success) {

    if (SecLevel() == SecurityLevel::STRONGBOX) return;

    if (SecLevel() == SecurityLevel::STRONGBOX) {

        GTEST_SKIP() << "Test not applicable to StrongBox device";

    }

    ASSERT_EQ(ErrorCode::OK, ImportKey(AuthorizationSetBuilder()

                                               .Authorization(TAG_NO_AUTH_REQUIRED)

                                               .EcdsaSigningKey(EcCurve::P_521)
@@ -3909,7 +3919,9 @@ TEST_P(EncryptionOperationsTest, RsaOaepInvalidPadding) { 
 * with a different digest than was used to encrypt.

 */

TEST_P(EncryptionOperationsTest, RsaOaepDecryptWithWrongDigest) {

    if (SecLevel() == SecurityLevel::STRONGBOX) return;

    if (SecLevel() == SecurityLevel::STRONGBOX) {

        GTEST_SKIP() << "Test not applicable to StrongBox device";

    }



    ASSERT_EQ(ErrorCode::OK, GenerateKey(AuthorizationSetBuilder()

                                                 .Authorization(TAG_NO_AUTH_REQUIRED)
@@ -5780,7 +5792,9 @@ typedef KeyMintAidlTestBase MaxOperationsTest; 
 * Verifies that the max uses per boot tag works correctly with AES keys.

 */

TEST_P(MaxOperationsTest, TestLimitAes) {

    if (SecLevel() == SecurityLevel::STRONGBOX) return;

    if (SecLevel() == SecurityLevel::STRONGBOX) {

        GTEST_SKIP() << "Test not applicable to StrongBox device";

    }



    ASSERT_EQ(ErrorCode::OK, GenerateKey(AuthorizationSetBuilder()

                                                 .Authorization(TAG_NO_AUTH_REQUIRED)
@@ -5807,7 +5821,9 @@ TEST_P(MaxOperationsTest, TestLimitAes) { 
 * Verifies that the max uses per boot tag works correctly with RSA keys.

 */

TEST_P(MaxOperationsTest, TestLimitRsa) {

    if (SecLevel() == SecurityLevel::STRONGBOX) return;

    if (SecLevel() == SecurityLevel::STRONGBOX) {

        GTEST_SKIP() << "Test not applicable to StrongBox device";

    }



    ASSERT_EQ(ErrorCode::OK, GenerateKey(AuthorizationSetBuilder()

                                                 .Authorization(TAG_NO_AUTH_REQUIRED)
@@ -5838,7 +5854,9 @@ typedef KeyMintAidlTestBase UsageCountLimitTest; 
 * Verifies that the usage count limit tag = 1 works correctly with AES keys.

 */

TEST_P(UsageCountLimitTest, TestSingleUseAes) {

    if (SecLevel() == SecurityLevel::STRONGBOX) return;

    if (SecLevel() == SecurityLevel::STRONGBOX) {

        GTEST_SKIP() << "Test not applicable to StrongBox device";

    }



    ASSERT_EQ(ErrorCode::OK, GenerateKey(AuthorizationSetBuilder()

                                                 .Authorization(TAG_NO_AUTH_REQUIRED)
@@ -5882,7 +5900,9 @@ TEST_P(UsageCountLimitTest, TestSingleUseAes) { 
 * Verifies that the usage count limit tag > 1 works correctly with AES keys.

 */

TEST_P(UsageCountLimitTest, TestLimitedUseAes) {

    if (SecLevel() == SecurityLevel::STRONGBOX) return;

    if (SecLevel() == SecurityLevel::STRONGBOX) {

        GTEST_SKIP() << "Test not applicable to StrongBox device";

    }



    ASSERT_EQ(ErrorCode::OK, GenerateKey(AuthorizationSetBuilder()

                                                 .Authorization(TAG_NO_AUTH_REQUIRED)
@@ -5927,7 +5947,9 @@ TEST_P(UsageCountLimitTest, TestLimitedUseAes) { 
 * Verifies that the usage count limit tag = 1 works correctly with RSA keys.

 */

TEST_P(UsageCountLimitTest, TestSingleUseRsa) {

    if (SecLevel() == SecurityLevel::STRONGBOX) return;

    if (SecLevel() == SecurityLevel::STRONGBOX) {

        GTEST_SKIP() << "Test not applicable to StrongBox device";

    }



    ASSERT_EQ(ErrorCode::OK, GenerateKey(AuthorizationSetBuilder()

                                                 .Authorization(TAG_NO_AUTH_REQUIRED)
@@ -5971,7 +5993,9 @@ TEST_P(UsageCountLimitTest, TestSingleUseRsa) { 
 * Verifies that the usage count limit tag > 1 works correctly with RSA keys.

 */

TEST_P(UsageCountLimitTest, TestLimitUseRsa) {

    if (SecLevel() == SecurityLevel::STRONGBOX) return;

    if (SecLevel() == SecurityLevel::STRONGBOX) {

        GTEST_SKIP() << "Test not applicable to StrongBox device";

    }



    ASSERT_EQ(ErrorCode::OK, GenerateKey(AuthorizationSetBuilder()

                                                 .Authorization(TAG_NO_AUTH_REQUIRED)
@@ -6018,7 +6042,9 @@ TEST_P(UsageCountLimitTest, TestLimitUseRsa) { 
 * in hardware.

 */

TEST_P(UsageCountLimitTest, TestSingleUseKeyAndRollbackResistance) {

    if (SecLevel() == SecurityLevel::STRONGBOX) return;

    if (SecLevel() == SecurityLevel::STRONGBOX) {

        GTEST_SKIP() << "Test not applicable to StrongBox device";

    }



    auto error = GenerateKey(AuthorizationSetBuilder()

                                     .RsaSigningKey(2048, 65537)
@@ -6027,10 +6053,12 @@ TEST_P(UsageCountLimitTest, TestSingleUseKeyAndRollbackResistance) { 
                                     .Authorization(TAG_NO_AUTH_REQUIRED)

                                     .Authorization(TAG_ROLLBACK_RESISTANCE)

                                     .SetDefaultValidity());

    ASSERT_TRUE(error == ErrorCode::ROLLBACK_RESISTANCE_UNAVAILABLE || error == ErrorCode::OK);

    if (error == ErrorCode::ROLLBACK_RESISTANCE_UNAVAILABLE) {

        GTEST_SKIP() << "Rollback resistance not supported";

    }



    if (error == ErrorCode::OK) {

    // Rollback resistance is supported by KeyMint, verify it is enforced in hardware.

    ASSERT_EQ(ErrorCode::OK, error);

    AuthorizationSet hardwareEnforced(SecLevelAuthorizations());

    ASSERT_TRUE(hardwareEnforced.Contains(TAG_ROLLBACK_RESISTANCE));

    ASSERT_EQ(ErrorCode::OK, DeleteKey());
@@ -6059,7 +6087,6 @@ TEST_P(UsageCountLimitTest, TestSingleUseKeyAndRollbackResistance) { 
    // must be invalidated from secure storage (such as RPMB partition).

    EXPECT_EQ(ErrorCode::INVALID_KEY_BLOB, Begin(KeyPurpose::SIGN, params));

}

}



INSTANTIATE_KEYMINT_AIDL_TEST(UsageCountLimitTest);
@@ -6135,10 +6162,12 @@ TEST_P(KeyDeletionTest, DeleteKey) { 
                                     .Authorization(TAG_NO_AUTH_REQUIRED)

                                     .Authorization(TAG_ROLLBACK_RESISTANCE)

                                     .SetDefaultValidity());

    ASSERT_TRUE(error == ErrorCode::ROLLBACK_RESISTANCE_UNAVAILABLE || error == ErrorCode::OK);

    if (error == ErrorCode::ROLLBACK_RESISTANCE_UNAVAILABLE) {

        GTEST_SKIP() << "Rollback resistance not supported";

    }



    // Delete must work if rollback protection is implemented

    if (error == ErrorCode::OK) {

    ASSERT_EQ(ErrorCode::OK, error);

    AuthorizationSet hardwareEnforced(SecLevelAuthorizations());

    ASSERT_TRUE(hardwareEnforced.Contains(TAG_ROLLBACK_RESISTANCE));
@@ -6153,7 +6182,6 @@ TEST_P(KeyDeletionTest, DeleteKey) { 
    AbortIfNeeded();

    key_blob_ = AidlBuf();

}

}



/**

 * KeyDeletionTest.DeleteInvalidKey
@@ -6169,10 +6197,12 @@ TEST_P(KeyDeletionTest, DeleteInvalidKey) { 
                                     .Authorization(TAG_NO_AUTH_REQUIRED)

                                     .Authorization(TAG_ROLLBACK_RESISTANCE)

                                     .SetDefaultValidity());

    ASSERT_TRUE(error == ErrorCode::ROLLBACK_RESISTANCE_UNAVAILABLE || error == ErrorCode::OK);

    if (error == ErrorCode::ROLLBACK_RESISTANCE_UNAVAILABLE) {

        GTEST_SKIP() << "Rollback resistance not supported";

    }



    // Delete must work if rollback protection is implemented

    if (error == ErrorCode::OK) {

    ASSERT_EQ(ErrorCode::OK, error);

    AuthorizationSet enforced(SecLevelAuthorizations());

    ASSERT_TRUE(enforced.Contains(TAG_ROLLBACK_RESISTANCE));
@@ -6184,7 +6214,6 @@ TEST_P(KeyDeletionTest, DeleteInvalidKey) { 


    ASSERT_EQ(ErrorCode::OK, DeleteKey());

}

}



/**

 * KeyDeletionTest.DeleteAllKeys
@@ -6198,7 +6227,10 @@ TEST_P(KeyDeletionTest, DeleteInvalidKey) { 
 * credentials stored in Keystore/Keymint.

 */

TEST_P(KeyDeletionTest, DeleteAllKeys) {

    if (!arm_deleteAllKeys) return;

    if (!arm_deleteAllKeys) {

        GTEST_SKIP() << "Option --arm_deleteAllKeys not set";

        return;

    }

    auto error = GenerateKey(AuthorizationSetBuilder()

                                     .RsaSigningKey(2048, 65537)

                                     .Digest(Digest::NONE)
@@ -6206,10 +6238,12 @@ TEST_P(KeyDeletionTest, DeleteAllKeys) { 
                                     .Authorization(TAG_NO_AUTH_REQUIRED)

                                     .Authorization(TAG_ROLLBACK_RESISTANCE)

                                     .SetDefaultValidity());

    ASSERT_TRUE(error == ErrorCode::ROLLBACK_RESISTANCE_UNAVAILABLE || error == ErrorCode::OK);

    if (error == ErrorCode::ROLLBACK_RESISTANCE_UNAVAILABLE) {

        GTEST_SKIP() << "Rollback resistance not supported";

    }



    // Delete must work if rollback protection is implemented

    if (error == ErrorCode::OK) {

    ASSERT_EQ(ErrorCode::OK, error);

    AuthorizationSet hardwareEnforced(SecLevelAuthorizations());

    ASSERT_TRUE(hardwareEnforced.Contains(TAG_ROLLBACK_RESISTANCE));
@@ -6225,7 +6259,6 @@ TEST_P(KeyDeletionTest, DeleteAllKeys) { 
    AbortIfNeeded();

    key_blob_ = AidlBuf();

}

}



INSTANTIATE_KEYMINT_AIDL_TEST(KeyDeletionTest);