Skip to content

Commit f1824fe

Browse files
author
gefeili
committed
Fix the bugs in ElephantEngine
1 parent 429e64d commit f1824fe

File tree

3 files changed

+39
-22
lines changed

3 files changed

+39
-22
lines changed

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

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ public void init(boolean forEncryption, CipherParameters params)
320320
this.getAlgorithmName(), 128, params, Utils.getPurpose(forEncryption)));
321321
initialised = true;
322322
m_state = forEncryption ? State.EncInit : State.DecInit;
323-
inputMessage = new byte[BLOCK_SIZE + (forEncryption ? 0 : CRYPTO_ABYTES)];
323+
inputMessage = new byte[BLOCK_SIZE * 2 + (forEncryption ? 0 : CRYPTO_ABYTES)];
324324
reset(false);
325325
}
326326

@@ -372,12 +372,19 @@ public int processBytes(byte[] input, int inOff, int len, byte[] output, int out
372372
int nb_it = Math.max(nblocks_c + 1, nblocks_ad - 1);
373373
byte[] tempInput = new byte[Math.max(nblocks_c, 1) * BLOCK_SIZE];
374374
System.arraycopy(inputMessage, 0, tempInput, 0, inputOff);
375-
System.arraycopy(input, inOff, tempInput, inputOff, Math.min(len, tempInput.length));
375+
System.arraycopy(input, inOff, tempInput, inputOff, Math.min(len, tempInput.length - inputOff));
376376
int rv = processBytes(tempInput, output, outOff, nb_it, nblocks_m, nblocks_c, mlen, nblocks_ad, false);
377-
int copyLen = rv - inputOff;
378-
inputOff = inputOff + len - rv;
379-
System.arraycopy(input, inOff + copyLen, inputMessage, 0, inputOff);
380-
377+
if (rv >= inputOff)
378+
{
379+
int copyLen = rv - inputOff;
380+
inputOff = inputOff + len - rv;
381+
System.arraycopy(input, inOff + copyLen, inputMessage, 0, inputOff);
382+
}
383+
else
384+
{
385+
System.arraycopy(input, inOff + rv, inputMessage, inputOff, len - rv);
386+
inputOff += len - rv;
387+
}
381388
messageLen += rv;
382389
return rv;
383390
}
@@ -455,10 +462,17 @@ public int getUpdateOutputSize(int len)
455462
case EncAad:
456463
case EncData:
457464
case EncInit:
465+
{
458466
int total = inputOff + len;
459467
return total - total % BLOCK_SIZE;
468+
}
469+
case DecAad:
460470
case DecData:
461-
return inputOff + len;
471+
case DecInit:
472+
{
473+
int total = Math.max(0, inputOff + len - CRYPTO_ABYTES);
474+
return total - total % BLOCK_SIZE;
475+
}
462476
}
463477
return Math.max(0, len + inputOff - CRYPTO_ABYTES);
464478
}
@@ -527,7 +541,7 @@ public int getIVBytesSize()
527541

528542
public int getBlockSize()
529543
{
530-
return CRYPTO_ABYTES;
544+
return BLOCK_SIZE;
531545
}
532546

533547
private void checkAad()
@@ -622,10 +636,11 @@ private int processBytes(byte[] m, byte[] output, int outOff, int nb_it, int nbl
622636
int rv = 0;
623637
byte[] outputMessage = new byte[BLOCK_SIZE];
624638
int i;
639+
int mlen_remaining = mlen;
625640
for (i = nb_its; i < nb_it; ++i)
626641
{
627642
int r_size = (i == nblocks_m - 1) ? mlen - i * BLOCK_SIZE : BLOCK_SIZE;
628-
if (!isDofinal && (r_size % BLOCK_SIZE != 0 || mlen <= i * BLOCK_SIZE))
643+
if (!isDofinal && (mlen <= i * BLOCK_SIZE || r_size % BLOCK_SIZE != 0))
629644
{
630645
break;
631646
}
@@ -655,6 +670,7 @@ private int processBytes(byte[] m, byte[] output, int outOff, int nb_it, int nbl
655670

656671
outOff += r_size;
657672
rv += r_size;
673+
mlen_remaining -= r_size;
658674
}
659675
if (i > 0 && i <= nblocks_c)
660676
{

‎core/src/test/java/org/bouncycastle/crypto/test/CipherTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -208,11 +208,11 @@ static void checkAEADCipherOutputSize(int keySize, int ivSize, int blockSize, in
208208
Assert.assertEquals(plaintext.length + tagSize, len + cipher.getOutputSize(plaintext.length - tmpLength));
209209
Assert.assertEquals(plaintext.length, len + cipher.getUpdateOutputSize(plaintext.length - tmpLength) + tmpLength);
210210
//during the encrypt process of the second block
211-
len += cipher.processBytes(plaintext, tmpLength , blockSize, ciphertext, len);
211+
len += cipher.processBytes(plaintext, tmpLength, blockSize, ciphertext, len);
212212
Assert.assertEquals(plaintext.length + tagSize, len + cipher.getOutputSize(plaintext.length - tmpLength - blockSize));
213213
Assert.assertEquals(plaintext.length, len + cipher.getUpdateOutputSize(plaintext.length - tmpLength - blockSize) + tmpLength);
214214
//process the remaining bytes
215-
len += cipher.processBytes(plaintext, tmpLength + blockSize , blockSize, ciphertext, len);
215+
len += cipher.processBytes(plaintext, tmpLength + blockSize, blockSize, ciphertext, len);
216216
Assert.assertEquals(plaintext.length + tagSize, len + cipher.getOutputSize(0));
217217
Assert.assertEquals(plaintext.length, len + cipher.getUpdateOutputSize(0) + tmpLength);
218218
//process doFinal
@@ -228,13 +228,13 @@ static void checkAEADCipherOutputSize(int keySize, int ivSize, int blockSize, in
228228
Assert.assertEquals(plaintext.length, len + cipher.getOutputSize(ciphertext.length - tmpLength));
229229
Assert.assertEquals(plaintext.length, len + cipher.getUpdateOutputSize(ciphertext.length - tmpLength) + tmpLength);
230230
//during the encrypt process of the second block
231-
len += cipher.processBytes(ciphertext, tmpLength , blockSize, plaintext, len);
231+
len += cipher.processBytes(ciphertext, tmpLength, blockSize, plaintext, len);
232232
Assert.assertEquals(plaintext.length, len + cipher.getOutputSize(ciphertext.length - tmpLength - blockSize));
233233
Assert.assertEquals(plaintext.length, len + cipher.getUpdateOutputSize(ciphertext.length - tmpLength - blockSize) + tmpLength);
234234
//process the remaining bytes
235-
len += cipher.processBytes(ciphertext, tmpLength + blockSize , blockSize + tagSize, plaintext, len);
235+
len += cipher.processBytes(ciphertext, tmpLength + blockSize, blockSize + tagSize, plaintext, len);
236236
Assert.assertEquals(plaintext.length, len + cipher.getOutputSize(0));
237-
Assert.assertEquals(plaintext.length, len + cipher.getUpdateOutputSize(0) + tmpLength);
237+
Assert.assertEquals(plaintext.length, len + cipher.getUpdateOutputSize(0) + tmpLength);
238238
//process doFinal
239239
len += cipher.doFinal(plaintext, len);
240240
Assert.assertEquals(len, plaintext.length);

‎core/src/test/java/org/bouncycastle/crypto/test/ElephantTest.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,13 @@ public String getName()
2828
public void performTest()
2929
throws Exception
3030
{
31-
// CipherTest.checkAEADCipherOutputSize(16, 12, 20, 8, new ElephantEngine(ElephantEngine.ElephantParameters.elephant160));
32-
// CipherTest.checkAEADCipherOutputSize(16, 12, 22, 8, new ElephantEngine(ElephantEngine.ElephantParameters.elephant176));
33-
// CipherTest.checkAEADCipherOutputSize(16, 12, 25, 8, new ElephantEngine(ElephantEngine.ElephantParameters.elephant200));
34-
//testVectors(ElephantEngine.ElephantParameters.elephant160, "v160_2");
31+
CipherTest.checkAEADCipherOutputSize(16, 12, 20, 8, new ElephantEngine(ElephantEngine.ElephantParameters.elephant160));
32+
CipherTest.checkAEADCipherOutputSize(16, 12, 22, 8, new ElephantEngine(ElephantEngine.ElephantParameters.elephant176));
33+
CipherTest.checkAEADCipherOutputSize(16, 12, 25, 16, new ElephantEngine(ElephantEngine.ElephantParameters.elephant200));
34+
// //testVectors(ElephantEngine.ElephantParameters.elephant160, "v160_2");
35+
ElephantEngine elephant = new ElephantEngine(ElephantEngine.ElephantParameters.elephant200);
36+
testExceptions(elephant, elephant.getKeyBytesSize(), elephant.getIVBytesSize(), elephant.getBlockSize());
37+
testParameters(elephant, 16, 12, 16);
3538
CipherTest.checkCipher(10, 12, 40, 128, new CipherTest.Instace()
3639
{
3740
@Override
@@ -60,9 +63,6 @@ public AEADCipher CreateInstace()
6063
testVectors(ElephantEngine.ElephantParameters.elephant160, "v160");
6164
testVectors(ElephantEngine.ElephantParameters.elephant176, "v176");
6265

63-
ElephantEngine elephant = new ElephantEngine(ElephantEngine.ElephantParameters.elephant200);
64-
testExceptions(elephant, elephant.getKeyBytesSize(), elephant.getIVBytesSize(), elephant.getBlockSize());
65-
testParameters(elephant, 16, 12, 16);
6666

6767
elephant = new ElephantEngine(ElephantEngine.ElephantParameters.elephant160);
6868
testExceptions(elephant, elephant.getKeyBytesSize(), elephant.getIVBytesSize(), elephant.getBlockSize());
@@ -236,6 +236,7 @@ private void testExceptions(AEADCipher aeadBlockCipher, int keysize, int ivsize,
236236
}
237237

238238
aeadBlockCipher.init(true, params);
239+
c1 = new byte[aeadBlockCipher.getOutputSize(0)];
239240
try
240241
{
241242
aeadBlockCipher.doFinal(c1, m.length);
@@ -402,7 +403,7 @@ private void testExceptions(AEADCipher aeadBlockCipher, int keysize, int ivsize,
402403
aeadBlockCipher.doFinal(c8, offset);
403404

404405
// random split for several times
405-
for (int split = 0; split < blocksize * 3; ++split)
406+
for (int split = 25; split < blocksize * 3; ++split)
406407
{
407408
aeadBlockCipher.init(true, params);
408409
aeadBlockCipher.processAADBytes(aad2, 0, aad2.length);

0 commit comments

Comments
 (0)