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

Commit 2cd7673d authored by Alex Klyubin's avatar Alex Klyubin
Browse files

Switch from getSpi to getCurrentSpi. 

Crypto primitives' getSpi has a side-effect which modifies the state
of the primitive: it selects an SPI implementation if it hasn't been
selected yet (e.g., Cipher.getInstance("AES") doesn't select an SPI
implementation until Cipher.init). The new method getCurrentSpi has
no side-effects: it simply returns null if no SPI implementation is
selected. The switch to getCurrentSpi lets us avoid side-effects and
throw a more pertinent exception when no SPI is yet selected.

(cherry-picked from bdc1382a)

Bug: 18088752
Change-Id: Ib369c7e988329315075aa4e18f720d86f3d96a93
parent beda8613

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

+7 −4
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ public class AndroidKeyStoreProvider extends Provider { 
     *

     * @throws IllegalArgumentException if the provided primitive is not supported or is not backed

     *         by AndroidKeyStore provider.

     * @throws IllegalStateException if the provided primitive is not initialized.

     */

    public static long getKeyStoreOperationHandle(Object cryptoPrimitive) {

        if (cryptoPrimitive == null) {
@@ -118,15 +119,17 @@ public class AndroidKeyStoreProvider extends Provider { 
        }

        Object spi;

        if (cryptoPrimitive instanceof Mac) {

            spi = ((Mac) cryptoPrimitive).getSpi();

            spi = ((Mac) cryptoPrimitive).getCurrentSpi();

        } else if (cryptoPrimitive instanceof Cipher) {

            spi = ((Cipher) cryptoPrimitive).getSpi();

            spi = ((Cipher) cryptoPrimitive).getCurrentSpi();

        } else {

            throw new IllegalArgumentException("Unsupported crypto primitive: " + cryptoPrimitive);

        }

        if (!(spi instanceof KeyStoreCryptoOperation)) {

        if (spi == null) {

            throw new IllegalStateException("Crypto primitive not initialized");

        } else if (!(spi instanceof KeyStoreCryptoOperation)) {

            throw new IllegalArgumentException(

                    "Crypto primitive not backed by AndroidKeyStore: " + cryptoPrimitive

                    "Crypto primitive not backed by AndroidKeyStore provider: " + cryptoPrimitive

                    + ", spi: " + spi);

        }

        return ((KeyStoreCryptoOperation) spi).getOperationHandle();