Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93bebe4f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Handle unparsable public keys" am: b43409fb am: a3442806 am: 7650484e 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2373248



Change-Id: I82254f6576b4a1bcfc4624ae6039137644094cfe
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3ad4f200 7650484e

keystore/java/android/security/keystore2/AndroidKeyStoreProvider.java

+9 −1
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import java.security.PublicKey; 
import java.security.Security;

import java.security.Signature;

import java.security.UnrecoverableKeyException;

import java.security.cert.X509Certificate;

import java.security.interfaces.ECPublicKey;

import java.security.interfaces.RSAPublicKey;
@@ -221,7 +222,14 @@ public class AndroidKeyStoreProvider extends Provider { 
        }

        final byte[] x509PublicCert = metadata.certificate;



        PublicKey publicKey = AndroidKeyStoreSpi.toCertificate(x509PublicCert).getPublicKey();

        final X509Certificate parsedX509Certificate =

                AndroidKeyStoreSpi.toCertificate(x509PublicCert);

        if (parsedX509Certificate == null) {

            throw new UnrecoverableKeyException("Failed to parse the X.509 certificate containing"

                   + " the public key. This likely indicates a hardware problem.");

        }



        PublicKey publicKey = parsedX509Certificate.getPublicKey();



        String jcaKeyAlgorithm = publicKey.getAlgorithm();