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

Commit 1cc41688 authored by David Drysdale's avatar David Drysdale
Browse files

KeyMint VTS: catch empty cert chains 

Explicitly detect empty cert chains returned by GenerateKey rather
than crashing when trying to dereference the first entry.

Bug: 195605180
Test: VtsAidlKeyMintTargetTest
Merged-In: Idad2703b458952ff599c6ccdd04a941aef7aedde
Change-Id: Idad2703b458952ff599c6ccdd04a941aef7aedde
Ignore-AOSP-First: already merged in aosp/master
parent b2239ad4

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));