diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-23 17:53:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-04-23 17:53:34 +0000 |
| commit | 06df6d84eb5a53d8f98ef10bd54e1e30eb22ae43 (patch) | |
| tree | c728a577e2c41f7a677aab811d96050d51dca3f2 /keystore/java | |
| parent | 0e41945e3aa639a1b0b3387313f7a7fb4eaba1ce (diff) | |
| parent | 70cf430ede6a658fa4117bb06054141ba7ca5e20 (diff) | |
Merge "Keystore 2.0 SPI: Fix engineDoFinal with null input."
Diffstat (limited to 'keystore/java')
| -rw-r--r-- | keystore/java/android/security/keystore2/AndroidKeyStoreCipherSpiBase.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/keystore/java/android/security/keystore2/AndroidKeyStoreCipherSpiBase.java b/keystore/java/android/security/keystore2/AndroidKeyStoreCipherSpiBase.java index 9d8a5effc2d7..e808c5cc51bd 100644 --- 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) { |