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

Merge "Insert Android Keystore JCA Provider at the correct position." am: 887d348d7e

Browse Source 
am: 5995579f5f

* commit '5995579f5ff1511f4a089dd0537cd634fb615465':
  Insert Android Keystore JCA Provider at the correct position.
This commit is contained in:
Alex Klyubin
2015-11-16 20:31:36 +00:00
committed by android-build-merger
parent 2fba776ee0 5995579f5f
commit 00245ffce4
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -97,20 +97,21 @@ public class AndroidKeyStoreProvider extends Provider {
*/ */
public static void install() { public static void install() {
Provider[] providers = Security.getProviders(); Provider[] providers = Security.getProviders();
int bcProviderPosition = -1; int bcProviderIndex = -1;
for (int position = 0; position < providers.length; position++) { for (int i = 0; i < providers.length; i++) {
Provider provider = providers[position]; Provider provider = providers[i];
if ("BC".equals(provider.getName())) { if ("BC".equals(provider.getName())) {
bcProviderPosition = position; bcProviderIndex = i;
break; break;
} }
} }
Security.addProvider(new AndroidKeyStoreProvider()); Security.addProvider(new AndroidKeyStoreProvider());
Provider workaroundProvider = new AndroidKeyStoreBCWorkaroundProvider(); Provider workaroundProvider = new AndroidKeyStoreBCWorkaroundProvider();
if (bcProviderPosition != -1) { if (bcProviderIndex != -1) {
// Bouncy Castle provider found -- install the workaround provider above it. // Bouncy Castle provider found -- install the workaround provider above it.
Security.insertProviderAt(workaroundProvider, bcProviderPosition); // insertProviderAt uses 1-based positions.
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.