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

Merge "Make getKeyStoreForUid convert uid to namespace." am: fd1b9aa4cd am: 23db5bf15b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2be2dae8b59c099acc340b5589cf15f0a79ddbb4
This commit is contained in:
Pavel Grafov
2021-02-09 22:50:19 +00:00
committed by Automerger Merge Worker
parent be39416ffe 23db5bf15b
commit 89f6fa14e2
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
keystore/java/android/security/keystore/AndroidKeyStoreProvider.java
View File

@@ -434,14 +434,16 @@ public class AndroidKeyStoreProvider extends Provider {
@NonNull @NonNull
public static java.security.KeyStore getKeyStoreForUid(int uid) public static java.security.KeyStore getKeyStoreForUid(int uid)
throws KeyStoreException, NoSuchProviderException { throws KeyStoreException, NoSuchProviderException {
String providerName = PROVIDER_NAME; final java.security.KeyStore.LoadStoreParameter loadParameter;
if (android.security.keystore2.AndroidKeyStoreProvider.isInstalled()) { if (android.security.keystore2.AndroidKeyStoreProvider.isInstalled()) {
providerName = "AndroidKeyStoreLegacy"; loadParameter = new android.security.keystore2.AndroidKeyStoreLoadStoreParameter(
KeyProperties.legacyUidToNamespace(uid));
} else {
loadParameter = new AndroidKeyStoreLoadStoreParameter(uid);
} }
java.security.KeyStore result = java.security.KeyStore result = java.security.KeyStore.getInstance(PROVIDER_NAME);
java.security.KeyStore.getInstance(providerName);
try { try {
result.load(new AndroidKeyStoreLoadStoreParameter(uid)); result.load(loadParameter);
} catch (NoSuchAlgorithmException | CertificateException | IOException e) { } catch (NoSuchAlgorithmException | CertificateException | IOException e) {
throw new KeyStoreException( throw new KeyStoreException(
"Failed to load AndroidKeyStore KeyStore for UID " + uid, e); "Failed to load AndroidKeyStore KeyStore for UID " + uid, e);