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

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

Merge "KeyMint VTS: catch empty cert chains" am: 38fe3c59 am: 675972ef am: 9e1c4c14 

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

Change-Id: I1aeefad9c1ebc54308a994a2b086d4e4aa2c4c63
parents 4e08d0f4 9e1c4c14

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

+3 −0
Original line number Diff line number Diff line
@@ -312,6 +312,7 @@ TEST_P(AttestKeyTest, RsaAttestKeyChaining) { 


        AuthorizationSet hw_enforced = HwEnforcedAuthorizations(attested_key_characteristics);

        AuthorizationSet sw_enforced = SwEnforcedAuthorizations(attested_key_characteristics);

        ASSERT_GT(cert_chain_list[i].size(), 0);

        EXPECT_TRUE(verify_attestation_record("foo", "bar", sw_enforced, hw_enforced, SecLevel(),

                                              cert_chain_list[i][0].encodedCertificate));
@@ -383,6 +384,7 @@ TEST_P(AttestKeyTest, EcAttestKeyChaining) { 


        AuthorizationSet hw_enforced = HwEnforcedAuthorizations(attested_key_characteristics);

        AuthorizationSet sw_enforced = SwEnforcedAuthorizations(attested_key_characteristics);

        ASSERT_GT(cert_chain_list[i].size(), 0);

        EXPECT_TRUE(verify_attestation_record("foo", "bar", sw_enforced, hw_enforced, SecLevel(),

                                              cert_chain_list[i][0].encodedCertificate));
@@ -471,6 +473,7 @@ TEST_P(AttestKeyTest, AlternateAttestKeyChaining) { 


        AuthorizationSet hw_enforced = HwEnforcedAuthorizations(attested_key_characteristics);

        AuthorizationSet sw_enforced = SwEnforcedAuthorizations(attested_key_characteristics);

        ASSERT_GT(cert_chain_list[i].size(), 0);

        EXPECT_TRUE(verify_attestation_record("foo", "bar", sw_enforced, hw_enforced, SecLevel(),

                                              cert_chain_list[i][0].encodedCertificate));