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

Commit aa8a7584 authored by Brian J Murray's avatar Brian J Murray
Browse files

Avoid SIGSEGV if attest key generation fails. 



Add an explicit check that `attested_key_cert_chain.size() > 0`.

Bug: 209672758
Test: atest 'PerInstance/AttestKeyTest#AllEcCurves/1_android_hardware_security_keymint_IKeyMintDevice_strongbox'

Signed-off-by: default avatarBrian J Murray <brianjmurray@google.com>
Change-Id: I4f7cb4fb1a30f26e6ef15c54714699f6ae91ba36
parent 4c12800d

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

+2 −0
Original line number Diff line number Diff line
@@ -583,6 +583,7 @@ TEST_P(AttestKeyTest, AllEcCurves) { 
                              attest_key, &attested_key_blob, &attested_key_characteristics,

                              &attested_key_cert_chain));



        ASSERT_GT(attested_key_cert_chain.size(), 0);

        CheckedDeleteKey(&attested_key_blob);



        AuthorizationSet hw_enforced = HwEnforcedAuthorizations(attested_key_characteristics);
@@ -612,6 +613,7 @@ TEST_P(AttestKeyTest, AllEcCurves) { 
                              attest_key, &attested_key_blob, &attested_key_characteristics,

                              &attested_key_cert_chain));



        ASSERT_GT(attested_key_cert_chain.size(), 0);

        CheckedDeleteKey(&attested_key_blob);

        CheckedDeleteKey(&attest_key.keyBlob);