Merge "Keystore 2.0 SPI: Fix engineDoFinal with null input."

2021-04-23 17:53:34 +00:00
parent 0e41945e3a 70cf430ede
commit 06df6d84eb
1 changed files with 5 additions and 1 deletions
--- a/keystore/java/android/security/keystore2/AndroidKeyStoreCipherSpiBase.java
+++ b/keystore/java/android/security/keystore2/AndroidKeyStoreCipherSpiBase.java
@@ -579,7 +579,11 @@ abstract class AndroidKeyStoreCipherSpiBase extends CipherSpi implements KeyStor
    protected final byte[] engineDoFinal(byte[] input, int inputOffset, int inputLen)
            throws IllegalBlockSizeException, BadPaddingException {
        if (mCipher != null) {
-            return mCipher.doFinal(input, inputOffset, inputLen);
+            if (input == null && inputLen == 0) {
+                return mCipher.doFinal();
+            } else {
+                return mCipher.doFinal(input, inputOffset, inputLen);
+            }
        }

        if (mCachedException != null) {