commit 339ca6d55340b8545bd7f160691a36e9a52c194f
author Android Build Role Account android-build-prod <android-build-team-robot@google.com> Mon Jun 01 22:02:59 2020 +0000
committer Android Build Role Account android-build-prod <android-build-team-robot@google.com> Mon Jun 01 22:02:59 2020 +0000
tree 10d1321b1e3b115d5beaa7eaeb5cea206f2ca55d
parent 96355662957bc763f6ba0624ca52efe32ef6fd60
parent ad0e2d4a4f3651ac74e698887cbc6fb800c8d646

Snap for 6548157 from ad0e2d4a4f3651ac74e698887cbc6fb800c8d646 to r-keystone-qcom-release

Change-Id: Iae360715d06e51d2619853519af7d0aab4cd6553

wifi/keystore/1.0/default/keystore.cpp

diff --git a/wifi/keystore/1.0/default/keystore.cpp b/wifi/keystore/1.0/default/keystore.cpp
index 411c1a7..467741f 100644
--- a/wifi/keystore/1.0/default/keystore.cpp
+++ b/wifi/keystore/1.0/default/keystore.cpp
@@ -89,7 +89,7 @@
     bssl::UniquePtr<X509> cert(d2i_X509_bio(cert_bio.get(), nullptr));
     if (!cert) {
         LOG(ERROR) << AT << "Could not create cert from BIO";
-        return {};
+        return cert_bytes;
     }
     bssl::UniquePtr<BIO> pem_bio(BIO_new(BIO_s_mem()));
     if (!PEM_write_bio_X509(pem_bio.get(), cert.get())) {