Resolve merge conflict

Author: gefeili

core/src/main/java/org/bouncycastle/crypto/engines/ElephantEngine.java

@@ -3,7 +3,6 @@
 import java.io.ByteArrayOutputStream;
 import java.util.Arrays;
 
-import org.bouncycastle.crypto.CipherParameters;
 import org.bouncycastle.crypto.DataLengthException;
 import org.bouncycastle.crypto.InvalidCipherTextException;
 import org.bouncycastle.crypto.OutputLengthException;
@@ -318,7 +317,7 @@ public int processBytes(byte[] input, int inOff, int len, byte[] output, int out
 
         if (inputOff + len - (forEncryption ? 0 : MAC_SIZE) >= BLOCK_SIZE)
         {
-            int mlen = inputOff + len - (forEncryption ? 0 : MAC_SIZE);
+            int mlen = inputOff + messageLen + len - (forEncryption ? 0 : MAC_SIZE);
             int adlen = processAADBytes();
             int nblocks_c = 1 + mlen / BLOCK_SIZE;
             int nblocks_m = ((mlen % BLOCK_SIZE) != 0 ? nblocks_c : nblocks_c - 1);
@@ -328,16 +327,17 @@ public int processBytes(byte[] input, int inOff, int len, byte[] output, int out
             System.arraycopy(inputMessage, 0, tempInput, 0, inputOff);
             System.arraycopy(input, inOff, tempInput, inputOff, Math.min(len, tempInput.length - inputOff));
             int rv = processBytes(tempInput, output, outOff, nb_it, nblocks_m, nblocks_c, mlen, nblocks_ad, false);
-            if (rv >= inputOff)
+            int copyLen = rv - inputOff;
+            if (copyLen >= 0)
             {
-                int copyLen = rv - inputOff;
                 inputOff = inputOff + len - rv;
                 System.arraycopy(input, inOff + copyLen, inputMessage, 0, inputOff);
             }
             else
             {
-                System.arraycopy(input, inOff + rv, inputMessage, inputOff, len - rv);
-                inputOff += len - rv;
+                System.arraycopy(inputMessage, inputOff + copyLen, inputMessage, 0, -copyLen);
+                System.arraycopy(input, inOff, inputMessage, -copyLen, len);
+                inputOff = len - copyLen;
             }
             messageLen += rv;
             return rv;