Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Treehugger Robot
2021-04-23 17:53:34 +00:00
committed by Gerrit Code Review
parent 0e41945e3a 70cf430ede
commit 06df6d84eb
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
keystore/java/android/security/keystore2/AndroidKeyStoreCipherSpiBase.java
View File

@@ -579,8 +579,12 @@ abstract class AndroidKeyStoreCipherSpiBase extends CipherSpi implements KeyStor
protected final byte[] engineDoFinal(byte[] input, int inputOffset, int inputLen) protected final byte[] engineDoFinal(byte[] input, int inputOffset, int inputLen)
throws IllegalBlockSizeException, BadPaddingException { throws IllegalBlockSizeException, BadPaddingException {
if (mCipher != null) { if (mCipher != null) {
if (input == null && inputLen == 0) {
return mCipher.doFinal();
} else {
return mCipher.doFinal(input, inputOffset, inputLen); return mCipher.doFinal(input, inputOffset, inputLen);
} }
}
if (mCachedException != null) { if (mCachedException != null) {
throw (IllegalBlockSizeException) throw (IllegalBlockSizeException)