commit 14604af9d1fc117013324625570950f9bd5557fd
author Brian Murray <brianjmurray@google.com> Wed Dec 08 22:59:01 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 08 22:59:01 2021 +0000
tree 161c99b4a371fcd3ada2185ef726cda5462736c2
parent a15bdb94132c5c9bb368507dbdd55427a682869e
parent aa8a75840fd0788ef422d0f40f6bd85c9ce9afe6

Merge "Avoid SIGSEGV if attest key generation fails."

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