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

Commit 70cf430e authored by Janis Danisevskis's avatar Janis Danisevskis Committed by Hasini Gunasinghe
Browse files

Keystore 2.0 SPI: Fix engineDoFinal with null input. 

AndroidKeyStoreCipherSpiBase.engineDoFinal may get called with a null
input argument. In the case where we forward the operation to the
default provider doFinal() needs to be called instead of
doFinal(byte[], int, int).

Bug: 183913233
Test: atest android.keystore.cts.CipherTest#testEncryptsAndDecryptsUsingCipherStreams
Change-Id: Ia3afaf281be7c8e5493ac8e4155a7aa02d1d37f0
parent c66289eb

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

+5 −1
Original line number Diff line number Diff line
@@ -579,8 +579,12 @@ abstract class AndroidKeyStoreCipherSpiBase extends CipherSpi implements KeyStor 
    protected final byte[] engineDoFinal(byte[] input, int inputOffset, int inputLen)

            throws IllegalBlockSizeException, BadPaddingException {

        if (mCipher != null) {

            if (input == null && inputLen == 0) {

                return mCipher.doFinal();

            } else {

                return mCipher.doFinal(input, inputOffset, inputLen);

            }

        }



        if (mCachedException != null) {

            throw (IllegalBlockSizeException)