Skip to content

Commit c75eaf3

Browse files
mwcwmwcw
committed
Post review modifications for intel code base.
Added zeroisation function.
1 parent 2ee4a73 commit c75eaf3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+734
-1817
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public int getOutputSize(boolean encryption, CipherParameters parameters, int le
3333
@Override
3434
public int processPacket(boolean encryption, CipherParameters parameters, byte[] input, int inOff, int len,
3535
byte[] output, int outOff)
36-
throws PacketCipherException
36+
throws PacketCipherException
3737
{
3838
byte[] iv;
3939
byte[] key;
@@ -68,7 +68,7 @@ public int processPacket(boolean encryption, CipherParameters parameters, byte[]
6868
int result;
6969
try
7070
{
71-
result = processPacket(encryption, key, key.length, iv, iv.length, input, inOff, len, output, outOff,
71+
result = processPacket(encryption, key, iv, input, inOff, len, output, outOff,
7272
outLen);
7373
}
7474
catch (Exception e)
@@ -80,7 +80,7 @@ public int processPacket(boolean encryption, CipherParameters parameters, byte[]
8080

8181
static native int getOutputSize(int len);
8282

83-
static native int processPacket(boolean encryption, byte[] key, int keyLen, byte[] nonce, int nonLen, byte[] in,
83+
static native int processPacket(boolean encryption, byte[] key, byte[] nonce, byte[] in,
8484
int inOff, int inLen, byte[] out, int outOff, int outLen);
8585

8686
@Override

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,11 @@ else if (params instanceof ParametersWithIV)
6767
private static int processAEADPacketCipher(boolean forEncryption, byte[] input, int inOff, int len, byte[] output, int outOff, byte[] initialAssociatedText, byte[] key, byte[] nonce, int macSize)
6868
throws PacketCipherException
6969
{
70-
final int iatLen = initialAssociatedText != null ? initialAssociatedText.length : 0;
7170
final int outLen = output != null ? output.length-outOff : 0;
7271
int result;
7372
try
7473
{
75-
result = processPacket(forEncryption, key, key.length, nonce, nonce.length, initialAssociatedText, iatLen,
74+
result = processPacket(forEncryption, key, nonce, initialAssociatedText,
7675
macSize, input, inOff, len, output, outOff, outLen);
7776
}
7877
catch (Exception e)
@@ -84,8 +83,8 @@ private static int processAEADPacketCipher(boolean forEncryption, byte[] input,
8483

8584
static native int getOutputSize(boolean encryption, int len, int macSize);
8685

87-
static native int processPacket(boolean encryption, byte[] key, int keyLen, byte[] nonce, int nonLen, byte[] aad,
88-
int aadLen, int macSize, byte[] in, int inOff, int inLen, byte[] out, int outOff, int outLen);
86+
static native int processPacket(boolean encryption, byte[] key, byte[] nonce, byte[] aad,
87+
int macSize, byte[] in, int inOff, int inLen, byte[] out, int outOff, int outLen);
8988

9089
@Override
9190
public String toString()

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public int processPacket(boolean encryption, CipherParameters parameters, byte[]
5050
int result;
5151
try
5252
{
53-
result = processPacket(encryption, key, key.length, iv, iv.length, input, inOff, len, output, outOff, output.length-outOff);
53+
result = processPacket(encryption, key, iv, input, inOff, len, output, outOff, output.length-outOff);
5454
}
5555
catch (Exception e)
5656
{
@@ -61,7 +61,7 @@ public int processPacket(boolean encryption, CipherParameters parameters, byte[]
6161

6262
static native int getOutputSize(int len);
6363

64-
static native int processPacket(boolean encryption, byte[] key, int keyLen, byte[] nonce, int nonceLen, byte[] in,
64+
static native int processPacket(boolean encryption, byte[] key, byte[] nonce, byte[] in,
6565
int inOff, int inLen, byte[] out, int outOff, int outLen);
6666

6767
@Override

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

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import org.bouncycastle.util.Arrays;
88

99
public class AESNativeCTRPacketCipher
10-
implements AESCTRModePacketCipher
10+
implements AESCTRModePacketCipher
1111
{
1212

1313

@@ -23,16 +23,17 @@ public int getOutputSize(boolean encryption, CipherParameters parameters, int le
2323
}
2424

2525
@Override
26-
public int processPacket(boolean encryption, CipherParameters parameters, byte[] input, int inOff, int len, byte[] output, int outOff)
27-
throws PacketCipherException
26+
public int processPacket(boolean encryption, CipherParameters parameters, byte[] input, int inOff, int len,
27+
byte[] output, int outOff)
28+
throws PacketCipherException
2829
{
2930
byte[] iv;
3031
byte[] key;
3132
if (parameters instanceof ParametersWithIV)
3233
{
33-
ParametersWithIV ivParam = (ParametersWithIV)parameters;
34+
ParametersWithIV ivParam = (ParametersWithIV) parameters;
3435
iv = Arrays.clone(ivParam.getIV());
35-
KeyParameter keyParameter = (KeyParameter)ivParam.getParameters();
36+
KeyParameter keyParameter = (KeyParameter) ivParam.getParameters();
3637
if (keyParameter == null)
3738
{
3839
throw PacketCipherException.from(new IllegalStateException(ExceptionMessages.CTR_CIPHER_UNITIALIZED));
@@ -46,7 +47,7 @@ public int processPacket(boolean encryption, CipherParameters parameters, byte[]
4647
int result;
4748
try
4849
{
49-
result = processPacket(encryption, key, key.length, iv, iv.length, input, inOff, len, output, outOff, output.length-outOff);
50+
result = processPacket(encryption, key, iv, input, inOff, len, output, outOff, output.length - outOff);
5051
}
5152
catch (Exception e)
5253
{
@@ -57,7 +58,9 @@ public int processPacket(boolean encryption, CipherParameters parameters, byte[]
5758

5859
static native int getOutputSize(int len);
5960

60-
static native int processPacket(boolean encryption, byte[] key, int keyLen, byte[] nonce, int nonceLen, byte[] in, int inOff, int inLen, byte[] out, int outOff, int outLen);
61+
static native int processPacket(boolean encryption, byte[] key, byte[] nonce, byte[] in, int inOff, int inLen,
62+
byte[] out, int outOff, int outLen);
63+
6164
@Override
6265
public String toString()
6366
{

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,12 @@ else if (params instanceof ParametersWithIV)
9696
throw PacketCipherException.from(e);
9797
}
9898

99-
int iatLen = initialAssociatedText != null ? initialAssociatedText.length : 0;
99+
100100
int outLen = output != null ? output.length - outOff : 0;
101101
int result;
102102
try
103103
{
104-
result = processPacket(encryption, key, key.length, nonce, nonce.length, initialAssociatedText, iatLen,
104+
result = processPacket(encryption, key, nonce, initialAssociatedText,
105105
macSize, input, inOff, len, output, outOff, outLen);
106106
}
107107
catch (Exception e)
@@ -113,8 +113,8 @@ else if (params instanceof ParametersWithIV)
113113

114114
static native int getOutputSize(boolean encryption, int len, int macSize);
115115

116-
static native int processPacket(boolean encryption, byte[] key, int keyLen, byte[] nonce, int nonLen, byte[] aad,
117-
int aadLen, int macSize, byte[] in, int inOff, int inLen, byte[] out, int outOff,
116+
static native int processPacket(boolean encryption, byte[] key, byte[] nonce, byte[] aad,
117+
int macSize, byte[] in, int inOff, int inLen, byte[] out, int outOff,
118118
int outLen);
119119

120120
@Override

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@ else if (params instanceof ParametersWithIV)
5353
{
5454
throw PacketCipherException.from(new IllegalArgumentException(ExceptionMessages.GCM_SIV_INVALID_PARAMETER));
5555
}
56-
int iatLen = initialAssociatedText != null ? initialAssociatedText.length : 0;
56+
5757
int outLen = output != null ? output.length - outOff : 0;
5858
int result;
5959
try
6060
{
61-
result = processPacket(encryption, key, key.length, nonce, nonce.length, initialAssociatedText, iatLen,
61+
result = processPacket(encryption, key, nonce, initialAssociatedText,
6262
input, inOff, len, output, outOff, outLen);
6363
}
6464
catch (Exception e)
@@ -71,9 +71,9 @@ else if (params instanceof ParametersWithIV)
7171
static native int getOutputSize(boolean encryption, int len);
7272

7373
static native int processPacket(boolean encryption,
74-
byte[] key, int keyLen,
75-
byte[] nonce, int nonceLen,
76-
byte[] aad, int aadLen,
74+
byte[] key,
75+
byte[] nonce,
76+
byte[] aad,
7777
byte[] in, int inOff, int inLen,
7878
byte[] out, int outOff, int outLen);
7979

‎core/src/test/java/org/bouncycastle/crypto/engines/GCMSIVNativeLimitTest.java

Lines changed: 37 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ public class GCMSIVNativeLimitTest extends TestCase
99
{
1010

1111
@Test
12-
public void testInitNative() throws Exception
12+
public void testInitNative()
13+
throws Exception
1314
{
1415
if (!isNativeVariant())
1516
{
@@ -153,7 +154,8 @@ public void testInitNative() throws Exception
153154
}
154155

155156
@Test
156-
public void testUpdateAADBytes() throws Exception
157+
public void testUpdateAADBytes()
158+
throws Exception
157159
{
158160

159161
if (!isNativeVariant())
@@ -341,7 +343,8 @@ public void testUpdateAADBytes() throws Exception
341343

342344

343345
@Test
344-
public void testDoFinal() throws Exception
346+
public void testDoFinal()
347+
throws Exception
345348
{
346349

347350
if (!isNativeVariant())
@@ -358,7 +361,7 @@ public void testDoFinal() throws Exception
358361

359362
{
360363
initNative(ref, true, new byte[16], new byte[12], null);
361-
doFinal(ref, null,0, new byte[1], 1);
364+
doFinal(ref, null, 0, new byte[1], 1);
362365
fail();
363366
}
364367
catch (Exception ex)
@@ -382,7 +385,7 @@ public void testDoFinal() throws Exception
382385

383386
{
384387
initNative(ref, true, new byte[16], new byte[12], null);
385-
doFinal(ref, new byte[1],-1, new byte[1], 1);
388+
doFinal(ref, new byte[1], -1, new byte[1], 1);
386389
fail();
387390
}
388391
catch (Exception ex)
@@ -407,7 +410,7 @@ public void testDoFinal() throws Exception
407410

408411
{
409412
initNative(ref, true, new byte[16], new byte[12], null);
410-
doFinal(ref, new byte[1],2, new byte[1], 1);
413+
doFinal(ref, new byte[1], 2, new byte[1], 1);
411414
fail();
412415
}
413416
catch (Exception ex)
@@ -428,11 +431,10 @@ public void testDoFinal() throws Exception
428431
{
429432
long ref = makeInstance();
430433
try
431-
432434
{
433435
initNative(ref, true, new byte[16], new byte[12], null);
434-
test_set_max_dl(ref,2);
435-
doFinal(ref, new byte[3],3, new byte[1], 1);
436+
test_set_max_dl(ref, 2);
437+
doFinal(ref, new byte[3], 3, new byte[1], 1);
436438
fail();
437439
}
438440
catch (Exception ex)
@@ -449,15 +451,32 @@ public void testDoFinal() throws Exception
449451
};
450452

451453

452-
new AESNativeGCMSIV() // output null
454+
new AESNativeGCMSIV() // input passes checkStatus
453455
{
454456
{
455457
long ref = makeInstance();
456458
try
459+
{
460+
initNative(ref, true, new byte[16], new byte[12], null);
461+
test_set_max_dl(ref, 2);
462+
doFinal(ref, new byte[3], 2, new byte[32], 0);
463+
}
464+
finally
465+
{
466+
dispose(ref);
467+
}
468+
}
469+
};
470+
457471

472+
new AESNativeGCMSIV() // output null
473+
{
474+
{
475+
long ref = makeInstance();
476+
try
458477
{
459478
initNative(ref, true, new byte[16], new byte[12], null);
460-
doFinal(ref, new byte[3], 3,null, 0);
479+
doFinal(ref, new byte[3], 3, null, 0);
461480
fail();
462481
}
463482
catch (Exception ex)
@@ -479,10 +498,9 @@ public void testDoFinal() throws Exception
479498
{
480499
long ref = makeInstance();
481500
try
482-
483501
{
484502
initNative(ref, true, new byte[16], new byte[12], null);
485-
doFinal(ref, new byte[3],3, new byte[0], -1);
503+
doFinal(ref, new byte[3], 3, new byte[0], -1);
486504
fail();
487505
}
488506
catch (Exception ex)
@@ -506,7 +524,7 @@ public void testDoFinal() throws Exception
506524

507525
{
508526
initNative(ref, true, new byte[16], new byte[12], null);
509-
doFinal(ref, new byte[3],3, new byte[0], 1);
527+
doFinal(ref, new byte[3], 3, new byte[0], 1);
510528
fail();
511529
}
512530
catch (Exception ex)
@@ -531,7 +549,7 @@ public void testDoFinal() throws Exception
531549

532550
{
533551
initNative(ref, true, new byte[16], new byte[12], null);
534-
doFinal(ref, new byte[1],1, new byte[0], 0);
552+
doFinal(ref, new byte[1], 1, new byte[0], 0);
535553
fail();
536554
}
537555
catch (Exception ex)
@@ -555,7 +573,7 @@ public void testDoFinal() throws Exception
555573

556574
{
557575
initNative(ref, true, new byte[16], new byte[12], null);
558-
doFinal(ref, new byte[1],1, new byte[1], 1);
576+
doFinal(ref, new byte[1], 1, new byte[1], 1);
559577
fail();
560578
}
561579
catch (Exception ex)
@@ -579,7 +597,7 @@ public void testDoFinal() throws Exception
579597

580598
{
581599
initNative(ref, true, new byte[16], new byte[12], null);
582-
doFinal(ref, new byte[2],2, new byte[1], 0);
600+
doFinal(ref, new byte[2], 2, new byte[1], 0);
583601
fail();
584602
}
585603
catch (Exception ex)
@@ -604,7 +622,7 @@ public void testDoFinal() throws Exception
604622

605623
{
606624
initNative(ref, false, new byte[16], new byte[12], null);
607-
doFinal(ref, new byte[15],15, new byte[1], 1);
625+
doFinal(ref, new byte[15], 15, new byte[1], 1);
608626
fail();
609627
}
610628
catch (Exception ex)
@@ -620,7 +638,6 @@ public void testDoFinal() throws Exception
620638
};
621639

622640

623-
624641
new AESNativeGCMSIV() // too short decryption
625642
{
626643
{
@@ -629,7 +646,7 @@ public void testDoFinal() throws Exception
629646

630647
{
631648
initNative(ref, false, new byte[16], new byte[12], null);
632-
doFinal(ref, new byte[17],17, new byte[0], 0);
649+
doFinal(ref, new byte[17], 17, new byte[0], 0);
633650
fail();
634651
}
635652
catch (Exception ex)

0 commit comments

Comments
 (0)