Skip to content

Commit 94607c5

Browse files
peterdettmanpeterdettman
committed
Reformatting in tls
1 parent 9409d79 commit 94607c5

18 files changed

+57
-57
lines changed

‎tls/src/main/java/org/bouncycastle/tls/NamedGroup.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public class NamedGroup
117117
public static final int MLKEM1024 = 0x1024;
118118

119119
/* Names of the actual underlying elliptic curves (not necessarily matching the NamedGroup names). */
120-
private static final String[] CURVE_NAMES = new String[] { "sect163k1", "sect163r1", "sect163r2", "sect193r1",
120+
private static final String[] CURVE_NAMES = new String[]{ "sect163k1", "sect163r1", "sect163r2", "sect193r1",
121121
"sect193r2", "sect233k1", "sect233r1", "sect239k1", "sect283k1", "sect283r1", "sect409k1", "sect409r1",
122122
"sect571k1", "sect571r1", "secp160k1", "secp160r1", "secp160r2", "secp192k1", "secp192r1", "secp224k1",
123123
"secp224r1", "secp256k1", "secp256r1", "secp384r1", "secp521r1", "brainpoolP256r1", "brainpoolP384r1",
@@ -126,7 +126,7 @@ public class NamedGroup
126126
"GostR3410-2001-CryptoPro-C", "Tc26-Gost-3410-12-512-paramSetA", "Tc26-Gost-3410-12-512-paramSetB",
127127
"Tc26-Gost-3410-12-512-paramSetC", "sm2p256v1" };
128128

129-
private static final String[] FINITE_FIELD_NAMES = new String[] { "ffdhe2048", "ffdhe3072", "ffdhe4096",
129+
private static final String[] FINITE_FIELD_NAMES = new String[]{ "ffdhe2048", "ffdhe3072", "ffdhe4096",
130130
"ffdhe6144", "ffdhe8192" };
131131

132132
public static boolean canBeNegotiated(int namedGroup, ProtocolVersion version)

‎tls/src/main/java/org/bouncycastle/tls/SimulatedTlsSRPIdentityManager.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public static SimulatedTlsSRPIdentityManager getRFC5054Default(TlsCrypto crypto,
3636

3737
TlsSRPConfig srpConfig = new TlsSRPConfig();
3838

39-
srpConfig.setExplicitNG(new BigInteger[] { group.getN(), group.getG() });
39+
srpConfig.setExplicitNG(new BigInteger[]{ group.getN(), group.getG() });
4040

4141
return new SimulatedTlsSRPIdentityManager(group, crypto.createSRP6VerifierGenerator(srpConfig), mac);
4242
}

‎tls/src/main/java/org/bouncycastle/tls/TlsDHUtils.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public static int getNamedGroupForDHParameters(BigInteger p, BigInteger g)
101101

102102
public static DHGroup getStandardGroupForDHParameters(BigInteger p, BigInteger g)
103103
{
104-
DHGroup[] standardGroups = new DHGroup[] { DHStandardGroups.rfc7919_ffdhe2048,
104+
DHGroup[] standardGroups = new DHGroup[]{ DHStandardGroups.rfc7919_ffdhe2048,
105105
DHStandardGroups.rfc7919_ffdhe3072, DHStandardGroups.rfc7919_ffdhe4096, DHStandardGroups.rfc7919_ffdhe6144,
106106
DHStandardGroups.rfc7919_ffdhe8192, DHStandardGroups.rfc3526_1536, DHStandardGroups.rfc3526_2048,
107107
DHStandardGroups.rfc3526_3072, DHStandardGroups.rfc3526_4096, DHStandardGroups.rfc3526_6144,

‎tls/src/main/java/org/bouncycastle/tls/crypto/impl/jcajce/srp/SRP6Util.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
class SRP6Util
1010
{
11-
private static final byte[] colon = new byte[] { (byte)':' };
11+
private static final byte[] COLON = new byte[]{ (byte)':' };
1212

1313
private static BigInteger ZERO = BigInteger.valueOf(0);
1414
private static BigInteger ONE = BigInteger.valueOf(1);
@@ -26,7 +26,7 @@ public static BigInteger calculateU(TlsHash digest, BigInteger N, BigInteger A,
2626
public static BigInteger calculateX(TlsHash digest, BigInteger N, byte[] salt, byte[] identity, byte[] password)
2727
{
2828
digest.update(identity, 0, identity.length);
29-
digest.update(colon, 0, 1);
29+
digest.update(COLON, 0, 1);
3030
digest.update(password, 0, password.length);
3131

3232
byte[] output = digest.calculateHash();

‎tls/src/test/java/org/bouncycastle/jsse/provider/test/ECDSACredentialsTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,10 @@ private void implTestECDSACredentials(int port, String protocol, int namedGroup)
126126
X509Certificate caCert = TestUtils.generateRootCert(caKeyPair);
127127

128128
KeyStore serverKs = createKeyStore();
129-
serverKs.setKeyEntry("server", caKeyPair.getPrivate(), keyPass, new X509Certificate[] { caCert });
129+
serverKs.setKeyEntry("server", caKeyPair.getPrivate(), keyPass, new X509Certificate[]{ caCert });
130130

131131
KeyStore clientKs = createKeyStore();
132-
clientKs.setKeyEntry("client", caKeyPair.getPrivate(), keyPass, new X509Certificate[] { caCert });
132+
clientKs.setKeyEntry("client", caKeyPair.getPrivate(), keyPass, new X509Certificate[]{ caCert });
133133

134134
TestProtocolUtil.runClientAndServer(new ECDSAServer(port, protocol, serverKs, keyPass, caCert),
135135
new ECDSAClient(port, protocol, clientKs, keyPass, caCert));

‎tls/src/test/java/org/bouncycastle/jsse/provider/test/KeyManagerFactoryTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ private KeyStore getEcKeyStore(boolean agreement)
199199

200200
ks.load(null, PASSWORD);
201201

202-
ks.setKeyEntry("test", ePair.getPrivate(), PASSWORD, new Certificate[] { eCert, iCert });
202+
ks.setKeyEntry("test", ePair.getPrivate(), PASSWORD, new Certificate[]{ eCert, iCert });
203203

204204
ks.setCertificateEntry("root", rCert);
205205

@@ -230,7 +230,7 @@ private KeyStore getRsaKeyStore(boolean encryption)
230230

231231
ks.load(null, PASSWORD);
232232

233-
ks.setKeyEntry("test", ePair.getPrivate(), PASSWORD, new Certificate[] { eCert, iCert });
233+
ks.setKeyEntry("test", ePair.getPrivate(), PASSWORD, new Certificate[]{ eCert, iCert });
234234

235235
ks.setCertificateEntry("root", rCert);
236236

@@ -248,14 +248,14 @@ private void implTestKeyManager(BCX509ExtendedKeyManager manager, String keyType
248248
BCX509Key key = manager.chooseServerKeyBC(new String[]{ keyType }, null, null);
249249
assertNotNull(key);
250250

251-
alias = manager.chooseServerAlias(keyType, new Principal[] { new X500Principal("CN=TLS Test") }, null);
251+
alias = manager.chooseServerAlias(keyType, new Principal[]{ new X500Principal("CN=TLS Test") }, null);
252252
assertNull(alias);
253253

254-
key = manager.chooseServerKeyBC(new String[]{ keyType }, new Principal[] { new X500Principal("CN=TLS Test") },
254+
key = manager.chooseServerKeyBC(new String[]{ keyType }, new Principal[]{ new X500Principal("CN=TLS Test") },
255255
null);
256256
assertNull(key);
257257

258-
alias = manager.chooseServerAlias(keyType, new Principal[] { new X500Principal("CN=TLS Test CA") }, null);
258+
alias = manager.chooseServerAlias(keyType, new Principal[]{ new X500Principal("CN=TLS Test CA") }, null);
259259
assertNotNull(alias);
260260
assertNotNull(manager.getCertificateChain(alias));
261261
assertNotNull(manager.getPrivateKey(alias));

‎tls/src/test/java/org/bouncycastle/tls/crypto/test/TlsCryptoTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ public void testHKDF() throws IOException
444444

445445
public void testHKDFExpandLimit()
446446
{
447-
int[] hashes = new int[] { CryptoHashAlgorithm.md5, CryptoHashAlgorithm.sha1, CryptoHashAlgorithm.sha224,
447+
int[] hashes = new int[]{ CryptoHashAlgorithm.md5, CryptoHashAlgorithm.sha1, CryptoHashAlgorithm.sha224,
448448
CryptoHashAlgorithm.sha256, CryptoHashAlgorithm.sha384, CryptoHashAlgorithm.sha512,
449449
CryptoHashAlgorithm.sm3, CryptoHashAlgorithm.gostr3411_2012_256 };
450450

@@ -561,7 +561,7 @@ public void testSignatures12() throws Exception
561561
}
562562

563563
// Signature algorithms usable with HashAlgorithm.Intrinsic in TLS 1.2
564-
short[] intrinsicSignatureAlgorithms = new short[] { SignatureAlgorithm.ed25519, SignatureAlgorithm.ed448,
564+
short[] intrinsicSignatureAlgorithms = new short[]{ SignatureAlgorithm.ed25519, SignatureAlgorithm.ed448,
565565
SignatureAlgorithm.gostr34102012_256, SignatureAlgorithm.gostr34102012_512,
566566
SignatureAlgorithm.rsa_pss_pss_sha256, SignatureAlgorithm.rsa_pss_pss_sha384,
567567
SignatureAlgorithm.rsa_pss_pss_sha512, SignatureAlgorithm.rsa_pss_rsae_sha256,
@@ -587,7 +587,7 @@ public void testSignatures12() throws Exception
587587

588588
public void testSignatures13() throws Exception
589589
{
590-
int[] signatureSchemes = new int[] { SignatureScheme.ecdsa_brainpoolP256r1tls13_sha256,
590+
int[] signatureSchemes = new int[]{ SignatureScheme.ecdsa_brainpoolP256r1tls13_sha256,
591591
SignatureScheme.ecdsa_brainpoolP384r1tls13_sha384, SignatureScheme.ecdsa_brainpoolP512r1tls13_sha512,
592592
SignatureScheme.ecdsa_secp256r1_sha256, SignatureScheme.ecdsa_secp384r1_sha384,
593593
SignatureScheme.ecdsa_secp521r1_sha512, SignatureScheme.ed25519, SignatureScheme.ed448,

‎tls/src/test/java/org/bouncycastle/tls/test/DTLSRawKeysProtocolTest.java‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ private void testClientSendsExtensionButServerDoesNotSupportIt(ProtocolVersion t
4141
MockRawKeysTlsClient client = new MockRawKeysTlsClient(
4242
CertificateType.X509,
4343
(short) -1,
44-
new short[] {CertificateType.RawPublicKey, CertificateType.X509},
44+
new short[]{ CertificateType.RawPublicKey, CertificateType.X509 },
4545
null,
4646
generateKeyPair(),
4747
tlsVersion);
@@ -70,14 +70,14 @@ private void testExtensionsAreOmittedIfSpecifiedButOnlyContainX509(ProtocolVersi
7070
MockRawKeysTlsClient client = new MockRawKeysTlsClient(
7171
CertificateType.X509,
7272
CertificateType.X509,
73-
new short[] {CertificateType.X509},
74-
new short[] {CertificateType.X509},
73+
new short[]{ CertificateType.X509 },
74+
new short[]{ CertificateType.X509 },
7575
generateKeyPair(),
7676
tlsVersion);
7777
MockRawKeysTlsServer server = new MockRawKeysTlsServer(
7878
CertificateType.X509,
7979
CertificateType.X509,
80-
new short[] {CertificateType.X509},
80+
new short[]{ CertificateType.X509 },
8181
generateKeyPair(),
8282
tlsVersion);
8383
pumpData(client, server);
@@ -106,14 +106,14 @@ private void testBothSidesUseRawKey(ProtocolVersion tlsVersion) throws Exception
106106
MockRawKeysTlsClient client = new MockRawKeysTlsClient(
107107
CertificateType.RawPublicKey,
108108
CertificateType.RawPublicKey,
109-
new short[] {CertificateType.RawPublicKey},
110-
new short[] {CertificateType.RawPublicKey},
109+
new short[]{ CertificateType.RawPublicKey },
110+
new short[]{ CertificateType.RawPublicKey },
111111
generateKeyPair(),
112112
tlsVersion);
113113
MockRawKeysTlsServer server = new MockRawKeysTlsServer(
114114
CertificateType.RawPublicKey,
115115
CertificateType.RawPublicKey,
116-
new short[] {CertificateType.RawPublicKey},
116+
new short[]{ CertificateType.RawPublicKey },
117117
generateKeyPair(),
118118
tlsVersion);
119119
pumpData(client, server);
@@ -135,7 +135,7 @@ private void testServerUsesRawKeyAndClientIsAnonymous(ProtocolVersion tlsVersion
135135
MockRawKeysTlsClient client = new MockRawKeysTlsClient(
136136
CertificateType.RawPublicKey,
137137
(short) -1,
138-
new short[] {CertificateType.RawPublicKey},
138+
new short[]{ CertificateType.RawPublicKey },
139139
null,
140140
generateKeyPair(),
141141
tlsVersion);
@@ -164,7 +164,7 @@ private void testServerUsesRawKeyAndClientUsesX509(ProtocolVersion tlsVersion) t
164164
MockRawKeysTlsClient client = new MockRawKeysTlsClient(
165165
CertificateType.RawPublicKey,
166166
CertificateType.X509,
167-
new short[] {CertificateType.RawPublicKey},
167+
new short[]{ CertificateType.RawPublicKey },
168168
null,
169169
generateKeyPair(),
170170
tlsVersion);
@@ -194,13 +194,13 @@ private void testServerUsesX509AndClientUsesRawKey(ProtocolVersion tlsVersion) t
194194
CertificateType.X509,
195195
CertificateType.RawPublicKey,
196196
null,
197-
new short[] {CertificateType.RawPublicKey},
197+
new short[]{ CertificateType.RawPublicKey },
198198
generateKeyPair(),
199199
tlsVersion);
200200
MockRawKeysTlsServer server = new MockRawKeysTlsServer(
201201
CertificateType.X509,
202202
CertificateType.RawPublicKey,
203-
new short[] {CertificateType.RawPublicKey},
203+
new short[]{ CertificateType.RawPublicKey },
204204
generateKeyPair(),
205205
tlsVersion);
206206
pumpData(client, server);
@@ -227,13 +227,13 @@ private void testClientSendsClientCertExtensionButServerHasNoCommonTypes(Protoco
227227
CertificateType.X509,
228228
CertificateType.RawPublicKey,
229229
null,
230-
new short[] {CertificateType.RawPublicKey},
230+
new short[]{ CertificateType.RawPublicKey },
231231
generateKeyPair(),
232232
tlsVersion);
233233
MockRawKeysTlsServer server = new MockRawKeysTlsServer(
234234
CertificateType.X509,
235235
CertificateType.X509,
236-
new short[] {CertificateType.X509},
236+
new short[]{ CertificateType.X509 },
237237
generateKeyPair(),
238238
tlsVersion);
239239
pumpData(client, server);
@@ -266,14 +266,14 @@ private void testClientSendsServerCertExtensionButServerHasNoCommonTypes(Protoco
266266
MockRawKeysTlsClient client = new MockRawKeysTlsClient(
267267
CertificateType.RawPublicKey,
268268
CertificateType.RawPublicKey,
269-
new short[] {CertificateType.RawPublicKey},
269+
new short[]{ CertificateType.RawPublicKey },
270270
null,
271271
generateKeyPair(),
272272
tlsVersion);
273273
MockRawKeysTlsServer server = new MockRawKeysTlsServer(
274274
CertificateType.X509,
275275
CertificateType.RawPublicKey,
276-
new short[] {CertificateType.RawPublicKey},
276+
new short[]{ CertificateType.RawPublicKey },
277277
generateKeyPair(),
278278
tlsVersion);
279279
pumpData(client, server);

‎tls/src/test/java/org/bouncycastle/tls/test/MockPSKDTLSClient.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public void notifyServerCertificate(TlsServerCertificate serverCertificate) thro
101101
throw new TlsFatalAlert(AlertDescription.bad_certificate);
102102
}
103103

104-
String[] trustedCertResources = new String[] { "x509-server-rsa-enc.pem" };
104+
String[] trustedCertResources = new String[]{ "x509-server-rsa-enc.pem" };
105105

106106
TlsCertificate[] certPath = TlsTestUtils.getTrustedCertPath(context.getCrypto(), chain[0],
107107
trustedCertResources);

‎tls/src/test/java/org/bouncycastle/tls/test/MockPSKTls13Client.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class MockPSKTls13Client
3636

3737
// public short[] getPskKeyExchangeModes()
3838
// {
39-
// return new short[] { PskKeyExchangeMode.psk_dhe_ke, PskKeyExchangeMode.psk_ke };
39+
// return new short[]{ PskKeyExchangeMode.psk_dhe_ke, PskKeyExchangeMode.psk_ke };
4040
// }
4141

4242
protected Vector getProtocolNames()

0 commit comments

Comments
 (0)