commit b07682e3db24c69f0d1e7c27154359435c8c161d
author Brian Murray <brianjmurray@google.com> Wed Dec 08 23:16:51 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Dec 08 23:16:51 2021 +0000
tree ca1b701486c1b5e04c9f1995237fa58eff435fa6
parent 0e98c827b82f95879556dfee90a7cc717e814f4b
parent 14604af9d1fc117013324625570950f9bd5557fd

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

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

diff --git a/security/keymint/aidl/vts/functional/AttestKeyTest.cpp b/security/keymint/aidl/vts/functional/AttestKeyTest.cpp
index 64550ef..73c3820 100644
--- a/security/keymint/aidl/vts/functional/AttestKeyTest.cpp
+++ b/security/keymint/aidl/vts/functional/AttestKeyTest.cpp
@@ -583,6 +583,7 @@
                               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 @@
                               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);