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

Commit 614b39f3 authored by Alex Klyubin's avatar Alex Klyubin Committed by Android (Google) Code Review
Browse files

Merge "Refactor Android Keystore CipherSpi base class." into mnc-dev

parents c1862737 7cbcfd4f

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

+5 −5
Original line number Diff line number Diff line
@@ -77,17 +77,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) {