commit 7f3d007475326b73d282de88988e4e4d93c943c8
author Brian Murray <brianjmurray@google.com> Wed Dec 08 23:22:09 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Dec 08 23:22:09 2021 +0000
tree ffcb1a9a64780d23622000308a875668299e259c
parent 077566d063014bb8a2e0d11316d3f66dfe903582
parent b07682e3db24c69f0d1e7c27154359435c8c161d

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

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