Merge "Avoid SIGSEGV if attest key generation fails." am: 14604af9d1 am: b07682e3db

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

Change-Id: I49f0f1d6daea48ac0a92bedb0bf3db8f4ff4e87c
This commit is contained in:
Brian Murray 2021-12-08 23:22:09 +00:00 committed by Automerger Merge Worker
commit 7f3d007475

View file

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