Loading keystore/java/android/security/keystore2/AndroidKeyStoreProvider.java +9 −1 Original line number Diff line number Diff line Loading @@ -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; Loading Loading @@ -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(); Loading Loading
keystore/java/android/security/keystore2/AndroidKeyStoreProvider.java +9 −1 Original line number Diff line number Diff line Loading @@ -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; Loading Loading @@ -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(); Loading