From 0b66a19bdd9af4e2ae35b6026fa6e40c15474d49 Mon Sep 17 00:00:00 2001 From: Janis Danisevskis Date: Thu, 18 Mar 2021 08:52:58 -0700 Subject: Keystore 2.0: No longer install the legacy provider. The legacy provider is obsolete now that all calling code has been fixed. Bug: 183100147 Bug: 183093711 Bug: 171305684 Test: N/A Merged-In: I0d71d3c9cdd586a508827eb26120c872cb8643ea Change-Id: I0d71d3c9cdd586a508827eb26120c872cb8643ea --- .../java/android/security/keystore2/AndroidKeyStoreProvider.java | 8 -------- 1 file changed, 8 deletions(-) (limited to 'keystore') diff --git a/keystore/java/android/security/keystore2/AndroidKeyStoreProvider.java b/keystore/java/android/security/keystore2/AndroidKeyStoreProvider.java index fa852e33a1d8..ba6d22f681ce 100644 --- a/keystore/java/android/security/keystore2/AndroidKeyStoreProvider.java +++ b/keystore/java/android/security/keystore2/AndroidKeyStoreProvider.java @@ -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); } } -- cgit v1.2.3