Merge "Keystore 2.0 SPI: Fix engineDoFinal with null input." (06df6d84) · Commits · e / os / android_frameworks_base

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

+5 −1

Original line number	Original line	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)		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)