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." into sc-dev

Browse Source
This commit is contained in:
Janis Danisevskis
2021-03-18 17:54:36 +00:00
committed by Android (Google) Code Review
parent d72020dc42 d2d4c69a66
commit bdf4a4c49b
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;
Security.addProvider(new AndroidKeyStoreProvider());
Security.addProvider(
new android.security.keystore.AndroidKeyStoreProvider(
"AndroidKeyStoreLegacy"));
Provider workaroundProvider = new AndroidKeyStoreBCWorkaroundProvider();
Provider legacyWorkaroundProvider =
new android.security.keystore.AndroidKeyStoreBCWorkaroundProvider(
"AndroidKeyStoreBCWorkaroundLegacy");
if (bcProviderIndex != -1) {
// Bouncy Castle provider found -- install the workaround provider above it.
// insertProviderAt uses 1-based positions.
Security.insertProviderAt(legacyWorkaroundProvider, bcProviderIndex + 1);
Security.insertProviderAt(workaroundProvider, bcProviderIndex + 1);
} else {
// Bouncy Castle provider not found -- install the workaround provider at lowest
// priority.
Security.addProvider(workaroundProvider);
Security.addProvider(legacyWorkaroundProvider);
}
}