Skip to content

Commit 037add2

Browse files
mwcwmwcw
committed
Wired PacketCiphers into BaseBlockCipher.
Some changes to instance creation. Added back logic for GCM key reuse that matches normal non packet GCM implementation. Initial logic for the detection of a use case for a packet cipher. Needs specific provider level tests.
1 parent bee2100 commit 037add2

21 files changed

+1122
-819
lines changed

‎core/src/main/java/org/bouncycastle/crypto/AESPacketCipherEngine.java

+294-306
Large diffs are not rendered by default.

‎core/src/main/java/org/bouncycastle/crypto/NativeServices.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ public interface NativeServices
1515
String AES_CTR = "AES/CTR";
1616
String AES_CCM = "AES/CCM";
1717

18-
String AES_CBC_PC = "AES/CBC PC";
19-
String AES_CCM_PC = "AES/CCM PC";
20-
String AES_CFB_PC = "AES/CFB PC";
21-
String AES_CTR_PC = "AES/CTR PC";
22-
String AES_GCM_PC = "AES/GCM PC";
23-
String AES_GCMSIV_PC = "AES/GCMSIV PC";
18+
String AES_CBC_PC = "AES/CBC-PC";
19+
String AES_CCM_PC = "AES/CCM-PC";
20+
String AES_CFB_PC = "AES/CFB-PC";
21+
String AES_CTR_PC = "AES/CTR-PC";
22+
String AES_GCM_PC = "AES/GCM-PC";
23+
String AES_GCMSIV_PC = "AES/GCMSIV-PC";
2424
String SHA2 = "SHA2";
2525
String MULACC = "MULACC";
2626

‎core/src/main/java/org/bouncycastle/crypto/PacketCipherException.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ public class PacketCipherException extends Exception
44
{
55
private final Reason reason;
66

7-
enum Reason
7+
public enum Reason
88
{
99
INVALID_CIPHERTEXT,
1010
OUTPUT_LENGTH,
@@ -46,4 +46,9 @@ public String toString()
4646
{
4747
return reason.toString() + " " + super.toString();
4848
}
49+
50+
public Reason getReason()
51+
{
52+
return reason;
53+
}
4954
}

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

+2-5
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,9 @@
1313
public class AESNativeCBCPacketCipher
1414
implements PacketCipher, AESCBCModePacketCipher
1515
{
16-
public static AESCBCModePacketCipher newInstance()
17-
{
18-
return new AESNativeCBCPacketCipher();
19-
}
2016

21-
private AESNativeCBCPacketCipher()
17+
18+
public AESNativeCBCPacketCipher()
2219
{
2320
}
2421

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

+3-9
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
package org.bouncycastle.crypto.engines;
22

3-
import org.bouncycastle.crypto.CipherParameters;
4-
import org.bouncycastle.crypto.ExceptionMessage;
5-
import org.bouncycastle.crypto.PacketCipher;
6-
import org.bouncycastle.crypto.PacketCipherException;
3+
import org.bouncycastle.crypto.*;
74
import org.bouncycastle.crypto.modes.AESCCMModePacketCipher;
85
import org.bouncycastle.crypto.modes.AESCCMPacketCipher;
96
import org.bouncycastle.crypto.params.AEADParameters;
@@ -13,12 +10,9 @@
1310
public class AESNativeCCMPacketCipher
1411
implements PacketCipher, AESCCMModePacketCipher
1512
{
16-
public static AESCCMModePacketCipher newInstance()
17-
{
18-
return new AESNativeCCMPacketCipher();
19-
}
2013

21-
private AESNativeCCMPacketCipher()
14+
15+
public AESNativeCCMPacketCipher()
2216
{
2317
}
2418

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

+2-5
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,9 @@ public class AESNativeCFBPacketCipher
1111
extends AESPacketCipherEngine
1212
implements AESCFBModePacketCipher
1313
{
14-
public static AESCFBModePacketCipher newInstance()
15-
{
16-
return new AESNativeCFBPacketCipher();
17-
}
1814

19-
private AESNativeCFBPacketCipher()
15+
16+
public AESNativeCFBPacketCipher()
2017
{
2118
}
2219

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

+3-8
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package org.bouncycastle.crypto.engines;
22

3-
import org.bouncycastle.crypto.CipherParameters;
4-
import org.bouncycastle.crypto.AESPacketCipherEngine;
5-
import org.bouncycastle.crypto.PacketCipherException;
3+
import org.bouncycastle.crypto.*;
64
import org.bouncycastle.crypto.modes.AESCTRModePacketCipher;
75
import org.bouncycastle.crypto.params.KeyParameter;
86
import org.bouncycastle.crypto.params.ParametersWithIV;
@@ -12,12 +10,9 @@ public class AESNativeCTRPacketCipher
1210
extends AESPacketCipherEngine
1311
implements AESCTRModePacketCipher
1412
{
15-
public static AESCTRModePacketCipher newInstance()
16-
{
17-
return new AESNativeCTRPacketCipher();
18-
}
1913

20-
private AESNativeCTRPacketCipher()
14+
15+
public AESNativeCTRPacketCipher()
2116
{
2217
}
2318

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

-11
Original file line numberDiff line numberDiff line change
@@ -247,17 +247,6 @@ public int doFinal(byte[] out, int outOff)
247247
throws IllegalStateException, InvalidCipherTextException
248248
{
249249

250-
// if (outOff < 0)
251-
// {
252-
// throw new IllegalArgumentException("outOff is negative");
253-
// }
254-
//
255-
//
256-
// if (outOff > out.length)
257-
// {
258-
// throw new IllegalArgumentException("offset past end of output array");
259-
// }
260-
261250
checkStatus();
262251

263252

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

+64-15
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,23 @@
77
import org.bouncycastle.crypto.params.AEADParameters;
88
import org.bouncycastle.crypto.params.KeyParameter;
99
import org.bouncycastle.crypto.params.ParametersWithIV;
10+
import org.bouncycastle.util.Arrays;
11+
import org.bouncycastle.util.dispose.Disposable;
12+
13+
import javax.security.auth.DestroyFailedException;
14+
import javax.security.auth.Destroyable;
1015

1116
public class AESNativeGCMPacketCipher
12-
extends AESPacketCipherEngine
13-
implements AESGCMModePacketCipher
17+
extends AESPacketCipherEngine
18+
implements AESGCMModePacketCipher, Destroyable
1419
{
15-
public static AESGCMModePacketCipher newInstance()
16-
{
17-
return new AESNativeGCMPacketCipher();
18-
}
1920

20-
private AESNativeGCMPacketCipher()
21+
22+
private byte[] lastKey;
23+
private byte[] lastNonce;
24+
private boolean destroyed;
25+
26+
public AESNativeGCMPacketCipher()
2127
{
2228
}
2329

@@ -27,7 +33,7 @@ public int getOutputSize(boolean encryption, CipherParameters parameters, int le
2733
int macSize;
2834
if (parameters instanceof AEADParameters)
2935
{
30-
AEADParameters param = (AEADParameters)parameters;
36+
AEADParameters param = (AEADParameters) parameters;
3137
int macSizeBits = param.getMacSize();
3238
if (macSizeBits < 32 || macSizeBits > 128 || (macSizeBits & 7) != 0)
3339
{
@@ -48,16 +54,17 @@ else if (parameters instanceof ParametersWithIV)
4854
}
4955

5056
@Override
51-
public int processPacket(boolean encryption, CipherParameters params, byte[] input, int inOff, int len, byte[] output, int outOff)
52-
throws PacketCipherException
57+
public int processPacket(boolean encryption, CipherParameters params, byte[] input, int inOff, int len,
58+
byte[] output, int outOff)
59+
throws PacketCipherException
5360
{
5461
int macSize;
5562
byte[] nonce;
5663
byte[] initialAssociatedText;
5764
byte[] key;
5865
if (params instanceof AEADParameters)
5966
{
60-
AEADParameters param = (AEADParameters)params;
67+
AEADParameters param = (AEADParameters) params;
6168
nonce = param.getNonce();
6269
initialAssociatedText = param.getAssociatedText();
6370

@@ -68,15 +75,40 @@ public int processPacket(boolean encryption, CipherParameters params, byte[] inp
6875
}
6976

7077
macSize = macSizeBits >> 3;
78+
7179
key = param.getKey().getKey();
80+
81+
// This only works if you use the same instance of packet cipher
82+
// It matches the existing behavior of the normal GCM implementation
83+
if (encryption && Arrays.areEqual(key, lastKey) && Arrays.areEqual(nonce, lastNonce))
84+
{
85+
throw new IllegalArgumentException("cannot reuse nonce for GCM encryption");
86+
}
87+
88+
lastKey = Arrays.clone(key);
89+
lastNonce = Arrays.clone(nonce);
90+
91+
7292
}
7393
else if (params instanceof ParametersWithIV)
7494
{
75-
ParametersWithIV param = (ParametersWithIV)params;
95+
ParametersWithIV param = (ParametersWithIV) params;
7696
nonce = param.getIV().clone();
7797
initialAssociatedText = null;
7898
macSize = 16;
79-
key = ((KeyParameter)param.getParameters()).getKey();
99+
100+
key = ((KeyParameter) param.getParameters()).getKey();
101+
102+
// This only works if you use the same instance of packet cipher
103+
// It matches the existing behavior of the normal GCM implementation
104+
if (encryption && Arrays.areEqual(key, lastKey) && Arrays.areEqual(nonce, lastNonce))
105+
{
106+
throw new IllegalArgumentException("cannot reuse nonce for GCM encryption");
107+
}
108+
109+
lastKey = Arrays.clone(key);
110+
lastNonce = Arrays.clone(nonce);
111+
80112
}
81113
else
82114
{
@@ -88,7 +120,7 @@ else if (params instanceof ParametersWithIV)
88120
try
89121
{
90122
result = processPacket(encryption, key, key.length, nonce, nonce.length, initialAssociatedText, iatLen,
91-
macSize, input, inOff, len, output, outOff, outLen);
123+
macSize, input, inOff, len, output, outOff, outLen);
92124
}
93125
catch (Exception e)
94126
{
@@ -100,10 +132,27 @@ else if (params instanceof ParametersWithIV)
100132
static native int getOutputSize(boolean encryption, int len, int macSize);
101133

102134
static native int processPacket(boolean encryption, byte[] key, int keyLen, byte[] nonce, int nonLen, byte[] aad,
103-
int aadLen, int macSize, byte[] in, int inOff, int inLen, byte[] out, int outOff, int outLen);
135+
int aadLen, int macSize, byte[] in, int inOff, int inLen, byte[] out, int outOff,
136+
int outLen);
137+
104138
@Override
105139
public String toString()
106140
{
107141
return "GCM Packet Cipher (Native)";
108142
}
143+
144+
@Override
145+
public void destroy() throws DestroyFailedException
146+
{
147+
Arrays.clear(lastKey);
148+
Arrays.clear(lastNonce);
149+
destroyed = true;
150+
}
151+
152+
@Override
153+
public boolean isDestroyed()
154+
{
155+
return destroyed;
156+
}
157+
109158
}

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

+13-11
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
import org.bouncycastle.crypto.params.ParametersWithIV;
1010

1111
public class AESNativeGCMSIVPacketCipher
12-
extends AESPacketCipherEngine
13-
implements AESGCMSIVModePacketCipher
12+
extends AESPacketCipherEngine
13+
implements AESGCMSIVModePacketCipher
1414
{
1515
public static AESGCMSIVModePacketCipher newInstance()
1616
{
1717
return new AESNativeGCMSIVPacketCipher();
1818
}
1919

20-
private AESNativeGCMSIVPacketCipher()
20+
public AESNativeGCMSIVPacketCipher()
2121
{
2222
}
2323

@@ -28,25 +28,26 @@ public int getOutputSize(boolean encryption, CipherParameters parameters, int le
2828
}
2929

3030
@Override
31-
public int processPacket(boolean encryption, CipherParameters params, byte[] input, int inOff, int len, byte[] output, int outOff)
32-
throws PacketCipherException
31+
public int processPacket(boolean encryption, CipherParameters params, byte[] input, int inOff, int len,
32+
byte[] output, int outOff)
33+
throws PacketCipherException
3334
{
3435
byte[] nonce;
3536
byte[] initialAssociatedText;
3637
byte[] key;
3738
if (params instanceof AEADParameters)
3839
{
39-
AEADParameters param = (AEADParameters)params;
40+
AEADParameters param = (AEADParameters) params;
4041
nonce = param.getNonce();
4142
initialAssociatedText = param.getAssociatedText();
4243
key = param.getKey().getKey();
4344
}
4445
else if (params instanceof ParametersWithIV)
4546
{
46-
ParametersWithIV param = (ParametersWithIV)params;
47+
ParametersWithIV param = (ParametersWithIV) params;
4748
nonce = param.getIV().clone();
4849
initialAssociatedText = null;
49-
key = ((KeyParameter)param.getParameters()).getKey();
50+
key = ((KeyParameter) param.getParameters()).getKey();
5051
}
5152
else
5253
{
@@ -58,7 +59,7 @@ else if (params instanceof ParametersWithIV)
5859
try
5960
{
6061
result = processPacket(encryption, key, key.length, nonce, initialAssociatedText, iatLen,
61-
input, inOff, len, output, outOff, outLen);
62+
input, inOff, len, output, outOff, outLen);
6263
}
6364
catch (Exception e)
6465
{
@@ -69,8 +70,9 @@ else if (params instanceof ParametersWithIV)
6970

7071
static native int getOutputSize(boolean encryption, int len);
7172

72-
static native int processPacket(boolean encryption, byte[] key, int keyLen, byte[] nonce, byte[] aad,
73-
int aadLen, byte[] in, int inOff, int inLen, byte[] out, int outOff, int outLen);
73+
static native int processPacket(boolean encryption, byte[] key, int keyLen, byte[] nonce, byte[] aad,
74+
int aadLen, byte[] in, int inOff, int inLen, byte[] out, int outOff, int outLen);
75+
7476
@Override
7577
public String toString()
7678
{

0 commit comments

Comments
 (0)