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

Commit 69946003 authored by Brian Murray's avatar Brian Murray Committed by Automerger Merge Worker
Browse files

Merge "Avoid SIGSEGV if attest key generation fails." am: 14604af9 am: b07682e3 am: 7f3d0074 

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

Change-Id: If0291eba3edee3982b68288c459568a587c59938
parents ad7aa264 7f3d0074

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