| commit | 3478647654a4b772bc66b4e40b501405591817a7 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Apr 09 06:53:51 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 09 06:53:51 2021 +0000 |
| tree | 01ce1cc0900212784c443c7b36e0472758e71960 | |
| parent | 7c01b0cd3b4f94dbca308ce18ce7e6efade9603c [diff] | |
| parent | f44834ab2854ccdcbbd6f96196706c43cdf5e0ac [diff] |
Merge "Handle keystore keys that are missing certificates." am: f44834ab28 Original change: https://android-review.googlesource.com/c/platform/system/security/+/1670632 Change-Id: I7db0fe415f6bb638263e1e56c4be33f530871fee
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"; + } }