commit 06df6d84eb5a53d8f98ef10bd54e1e30eb22ae43
author Treehugger Robot <treehugger-gerrit@google.com> Fri Apr 23 17:53:34 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 23 17:53:34 2021 +0000
tree c728a577e2c41f7a677aab811d96050d51dca3f2
parent 0e41945e3aa639a1b0b3387313f7a7fb4eaba1ce
parent 70cf430ede6a658fa4117bb06054141ba7ca5e20

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

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

diff --git a/keystore/java/android/security/keystore2/AndroidKeyStoreCipherSpiBase.java b/keystore/java/android/security/keystore2/AndroidKeyStoreCipherSpiBase.java
index 9d8a5ef..e808c5c 100644
--- a/keystore/java/android/security/keystore2/AndroidKeyStoreCipherSpiBase.java
+++ b/keystore/java/android/security/keystore2/AndroidKeyStoreCipherSpiBase.java
@@ -579,7 +579,11 @@
     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) {