Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8be20396 authored by Janis Danisevskis's avatar Janis Danisevskis Committed by Automerger Merge Worker
Browse files

Merge "Keystore 2.0: No longer install the legacy provider." into sc-dev am: bdf4a4c4 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13919866

Change-Id: Ie6a4d525e4e9ecb5ada1023c1d0490ffbcf8cba0
parents fadcece4 bdf4a4c4

keystore/java/android/security/keystore2/AndroidKeyStoreProvider.java

+0 −8
Original line number Original line Diff line number Diff line
@@ -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);

        }

        }

    }

    }