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

Merge "Keystore 2.0 SPI: Fix installation of legacy Keystore provider" am: 5408268606 am: 3a1c6e6b9e am: 2d6247e322

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1503891

Change-Id: I144782a0ccbdfb7b78ce63db9eec8a71e058de9f
This commit is contained in:
Treehugger Robot
2020-11-27 01:41:49 +00:00
committed by Automerger Merge Worker
parent 5ba5c09b24 2d6247e322
commit 31952c368f
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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");