Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Handle unparsable public keys" am: b43409fbfc am: a34428066a am: 7650484e3d

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

Change-Id: I82254f6576b4a1bcfc4624ae6039137644094cfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-01-03 16:05:42 +00:00
committed by Automerger Merge Worker
parent 3ad4f200c2 7650484e3d
commit 93bebe4f93
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
keystore/java/android/security/keystore2/AndroidKeyStoreProvider.java
View File

@@ -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();