From 9fb5607114355c625aa61893badc9acd9e6440ae Mon Sep 17 00:00:00 2001 From: Janis Danisevskis Date: Wed, 18 Nov 2020 12:27:40 -0800 Subject: [PATCH] Keystore 2.0 SPI: Fix installation of legacy Keystore provider Priviously we installed the legacy keystore SPI by the name KeyStore.AndroidKeyStore and set an alias to KeyStore.AndroidKeyStoreLegacy. This conflicted with with the Keystore provider which also registers as KeyStore.AndroidKeyStore. This patch registers the old provider only by the name KeyStore.AndroidKeyStore. Test: CtsLibcoreTestCases:libcore.java.security.ProviderTest#test_Provider_Properties Also, the device boots. Change-Id: I38a248a996839f397bdcae30fd1b03a883209df2 --- .../android/security/keystore/AndroidKeyStoreProvider.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keystore/java/android/security/keystore/AndroidKeyStoreProvider.java b/keystore/java/android/security/keystore/AndroidKeyStoreProvider.java index 5867ef6eaea5f..b1b6306e0cf62 100644 --- a/keystore/java/android/security/keystore/AndroidKeyStoreProvider.java +++ b/keystore/java/android/security/keystore/AndroidKeyStoreProvider.java @@ -83,8 +83,7 @@ public class AndroidKeyStoreProvider extends Provider { boolean supports3DES = "true".equals(android.os.SystemProperties.get(DESEDE_SYSTEM_PROPERTY)); // java.security.KeyStore - put("KeyStore.AndroidKeyStore", PACKAGE_NAME + ".AndroidKeyStoreSpi"); - put("Alg.Alias.KeyStore.AndroidKeyStoreLegacy", "AndroidKeyStore"); + put("KeyStore." + providerName, PACKAGE_NAME + ".AndroidKeyStoreSpi"); // java.security.KeyPairGenerator put("KeyPairGenerator.EC", PACKAGE_NAME + ".AndroidKeyStoreKeyPairGeneratorSpi$EC");