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

Commit 6f06dae1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Keystore 2.0: Fix diagnosing invalid key in CipherSpiBase." am: be1b1d55 am: 1ade004e 

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

Change-Id: Ibf882ed499ada52633ce22b88c1af931f9064ce3
parents d27fb109 1ade004e

keystore/java/android/security/keystore2/AndroidKeyStoreCipherSpiBase.java

+9 −6
Original line number Diff line number Diff line
@@ -123,8 +123,9 @@ abstract class AndroidKeyStoreCipherSpiBase extends CipherSpi implements KeyStor 
            throws InvalidKeyException {

        resetAll();



        if (!(key instanceof AndroidKeyStorePrivateKey

                || key instanceof AndroidKeyStoreSecretKey)) {

        // Public key operations get diverted to the default provider.

        if (opmode == Cipher.ENCRYPT_MODE

                && (key instanceof PrivateKey || key instanceof PublicKey)) {

            try {

                mCipher = Cipher.getInstance(getTransform());

                String transform = getTransform();
@@ -184,8 +185,9 @@ abstract class AndroidKeyStoreCipherSpiBase extends CipherSpi implements KeyStor 
            SecureRandom random) throws InvalidKeyException, InvalidAlgorithmParameterException {

        resetAll();



        if (!(key instanceof AndroidKeyStorePrivateKey

                || key instanceof AndroidKeyStoreSecretKey)) {

        // Public key operations get diverted to the default provider.

        if (opmode == Cipher.ENCRYPT_MODE

                && (key instanceof PrivateKey || key instanceof PublicKey)) {

            try {

                mCipher = Cipher.getInstance(getTransform());

                mCipher.init(opmode, key, params, random);
@@ -213,8 +215,9 @@ abstract class AndroidKeyStoreCipherSpiBase extends CipherSpi implements KeyStor 
            SecureRandom random) throws InvalidKeyException, InvalidAlgorithmParameterException {

        resetAll();



        if (!(key instanceof AndroidKeyStorePrivateKey

                || key instanceof AndroidKeyStoreSecretKey)) {

        // Public key operations get diverted to the default provider.

        if (opmode == Cipher.ENCRYPT_MODE

                && (key instanceof PrivateKey || key instanceof PublicKey)) {

            try {

                mCipher = Cipher.getInstance(getTransform());

                mCipher.init(opmode, key, params, random);