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

Commit 7cbcfd4f authored by Alex Klyubin's avatar Alex Klyubin
Browse files

Refactor Android Keystore CipherSpi base class. 

This makes Android Keystore's CipherSpi base class suitable for
implementing AES and RSA ciphers. Previously, the class was heavily
biased towards only AES.

Bug: 18088752
Change-Id: I6bd1ca54165592d28482e56471dcfe0344337cf4
parent 80370952

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

+5 −5
Original line number Diff line number Diff line
@@ -58,17 +58,17 @@ class AndroidKeyStoreBCWorkaroundProvider extends Provider { 


        // javax.crypto.Cipher

        putSymmetricCipherImpl("AES/ECB/NoPadding",

                PACKAGE_NAME + ".AndroidKeyStoreCipherSpi$AES$ECB$NoPadding");

                PACKAGE_NAME + ".AndroidKeyStoreUnauthenticatedAESCipherSpi$ECB$NoPadding");

        putSymmetricCipherImpl("AES/ECB/PKCS7Padding",

                PACKAGE_NAME + ".AndroidKeyStoreCipherSpi$AES$ECB$PKCS7Padding");

                PACKAGE_NAME + ".AndroidKeyStoreUnauthenticatedAESCipherSpi$ECB$PKCS7Padding");



        putSymmetricCipherImpl("AES/CBC/NoPadding",

                PACKAGE_NAME + ".AndroidKeyStoreCipherSpi$AES$CBC$NoPadding");

                PACKAGE_NAME + ".AndroidKeyStoreUnauthenticatedAESCipherSpi$CBC$NoPadding");

        putSymmetricCipherImpl("AES/CBC/PKCS7Padding",

                PACKAGE_NAME + ".AndroidKeyStoreCipherSpi$AES$CBC$PKCS7Padding");

                PACKAGE_NAME + ".AndroidKeyStoreUnauthenticatedAESCipherSpi$CBC$PKCS7Padding");



        putSymmetricCipherImpl("AES/CTR/NoPadding",

                PACKAGE_NAME + ".AndroidKeyStoreCipherSpi$AES$CTR$NoPadding");

                PACKAGE_NAME + ".AndroidKeyStoreUnauthenticatedAESCipherSpi$CTR$NoPadding");

    }



    private void putMacImpl(String algorithm, String implClass) {