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

Commit 38ab78f0 authored by Janis Danisevskis's avatar Janis Danisevskis
Browse files

Keystore 2.0 SPI: AndroidKeyStoreProvider loads keys from Keystore 2.0 

This patch adjusts the AndroidKeyStoreProvider to register all services
with the correct packages names. And the utility functions load key
using the correct Keystore 2.0 methods.

Bug: 159476414
Test: None
Change-Id: I9268fd66d28e89e188e85991bcf90c7f19809232
parent 4545933d

keystore/java/android/security/keystore2/AndroidKeyStoreBCWorkaroundProvider.java

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ class AndroidKeyStoreBCWorkaroundProvider extends Provider { 
    // classes when this provider is instantiated and installed early on during each app's

    // initialization process.



    private static final String PACKAGE_NAME = "android.security.keystore";

    private static final String PACKAGE_NAME = "android.security.keystore2";

    private static final String KEYSTORE_SECRET_KEY_CLASS_NAME =

            PACKAGE_NAME + ".AndroidKeyStoreSecretKey";

    private static final String KEYSTORE_PRIVATE_KEY_CLASS_NAME =

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

+147 −186

File changed.

Preview size limit exceeded, changes collapsed.