commit f44834ab2854ccdcbbd6f96196706c43cdf5e0ac
author Treehugger Robot <treehugger-gerrit@google.com> Fri Apr 09 06:22:48 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 09 06:22:48 2021 +0000
tree 01ce1cc0900212784c443c7b36e0472758e71960
parent 0b0d11f8ea678dda723563f4357dda0e887058fe
parent f74ca25a63aefea6440c8a7d16df0c240999def1

Merge "Handle keystore keys that are missing certificates."

ondevice-signing/KeystoreKey.cpp

diff --git a/ondevice-signing/KeystoreKey.cpp b/ondevice-signing/KeystoreKey.cpp
index 840b683..9b5e505 100644
--- a/ondevice-signing/KeystoreKey.cpp
+++ b/ondevice-signing/KeystoreKey.cpp
@@ -239,5 +239,10 @@
 }
 
 Result<std::vector<uint8_t>> KeystoreKey::getPublicKey() const {
-    return extractPublicKeyFromX509(mKeyMetadata.certificate.value());
+    auto cert = mKeyMetadata.certificate;
+    if (cert) {
+        return extractPublicKeyFromX509(cert.value());
+    } else {
+        return Error() << "Key did not have a certificate";
+    }
 }