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

Merge "Keystore 2.0: No longer install the legacy provider." am: e72a7b4f1b

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

Change-Id: I41d0972b8ef08cb4d305728940c4ea06d918de08
This commit is contained in:
Treehugger Robot
2021-03-18 22:30:25 +00:00
committed by Automerger Merge Worker
parent 855075a2c2 e72a7b4f1b
commit 02ee21ec65
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -145,23 +145,15 @@ public class AndroidKeyStoreProvider extends Provider {
sInstalled = true; sInstalled = true;
Security.addProvider(new AndroidKeyStoreProvider()); Security.addProvider(new AndroidKeyStoreProvider());
Security.addProvider(
new android.security.keystore.AndroidKeyStoreProvider(
"AndroidKeyStoreLegacy"));
Provider workaroundProvider = new AndroidKeyStoreBCWorkaroundProvider(); Provider workaroundProvider = new AndroidKeyStoreBCWorkaroundProvider();
Provider legacyWorkaroundProvider =
new android.security.keystore.AndroidKeyStoreBCWorkaroundProvider(
"AndroidKeyStoreBCWorkaroundLegacy");
if (bcProviderIndex != -1) { if (bcProviderIndex != -1) {
// Bouncy Castle provider found -- install the workaround provider above it. // Bouncy Castle provider found -- install the workaround provider above it.
// insertProviderAt uses 1-based positions. // insertProviderAt uses 1-based positions.
Security.insertProviderAt(legacyWorkaroundProvider, bcProviderIndex + 1);
Security.insertProviderAt(workaroundProvider, bcProviderIndex + 1); Security.insertProviderAt(workaroundProvider, bcProviderIndex + 1);
} else { } else {
// Bouncy Castle provider not found -- install the workaround provider at lowest // Bouncy Castle provider not found -- install the workaround provider at lowest
// priority. // priority.
Security.addProvider(workaroundProvider); Security.addProvider(workaroundProvider);
Security.addProvider(legacyWorkaroundProvider);
} }
} }