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

Commit a8a4cb00 authored by Shawn Willden's avatar Shawn Willden Committed by Automerger Merge Worker
Browse files

Merge changes Ic8949e22,Ia3a6363d am: da2b9ae9 am: 8226694f 

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

Change-Id: I1e13b6c6ca3a8a1dac8e1e89f9ceaa03986a0900
parents f15bc0f9 8226694f

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

+3 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ TEST_P(AttestKeyTest, AllRsaSizes) { 
                                             {} /* attestation signing key */, &attest_key.keyBlob,

                                             &attest_key_characteristics, &attest_key_cert_chain));



        ASSERT_GT(attest_key_cert_chain.size(), 0);

        EXPECT_EQ(attest_key_cert_chain.size(), 1);

        EXPECT_TRUE(IsSelfSigned(attest_key_cert_chain)) << "Failed on size " << size;
@@ -549,6 +550,7 @@ TEST_P(AttestKeyTest, AllEcCurves) { 
                                             {} /* attestation siging key */, &attest_key.keyBlob,

                                             &attest_key_characteristics, &attest_key_cert_chain));



        ASSERT_GT(attest_key_cert_chain.size(), 0);

        EXPECT_EQ(attest_key_cert_chain.size(), 1);

        EXPECT_TRUE(IsSelfSigned(attest_key_cert_chain)) << "Failed on curve " << curve;
@@ -632,6 +634,7 @@ TEST_P(AttestKeyTest, AttestWithNonAttestKey) { 
                    {} /* attestation siging key */, &non_attest_key.keyBlob,

                    &non_attest_key_characteristics, &non_attest_key_cert_chain));



    ASSERT_GT(non_attest_key_cert_chain.size(), 0);

    EXPECT_EQ(non_attest_key_cert_chain.size(), 1);

    EXPECT_TRUE(IsSelfSigned(non_attest_key_cert_chain));

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

+2 −2
Original line number Diff line number Diff line
@@ -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);

}



/*