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

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

Change-Id: Ie7e1c93d8b4b0084971f35ca25520f3d70cd67e0
This commit is contained in:
Brian Murray
2021-12-08 23:16:51 +00:00
committed by Automerger Merge Worker

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