Skip to content

Commit dfe8c05

Browse files
committed
increased RSA key size and added skip tests for Java 25 compatibility.
1 parent a047534 commit dfe8c05

File tree

2 files changed

+20
-6
lines changed

2 files changed

+20
-6
lines changed

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

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,11 @@
1616
import javax.net.ssl.TrustManagerFactory;
1717
import javax.security.auth.x500.X500Principal;
1818

19+
import junit.framework.TestCase;
1920
import org.bouncycastle.asn1.x500.X500Name;
2021
import org.bouncycastle.jsse.BCX509ExtendedKeyManager;
2122
import org.bouncycastle.jsse.BCX509Key;
2223

23-
import junit.framework.TestCase;
24-
2524
public class KeyManagerFactoryTest
2625
extends TestCase
2726
{
@@ -58,6 +57,11 @@ public void testBasicRSA()
5857
public void testRSAServer()
5958
throws Exception
6059
{
60+
// TLS_RSA is disabled in Java 25.
61+
if ("25".equals(System.getProperty("java.version")))
62+
{
63+
return;
64+
}
6165
KeyStore ks = getRsaKeyStore(true);
6266

6367
KeyStore trustStore = KeyStore.getInstance("JKS");
@@ -93,6 +97,11 @@ public void testRSAServer()
9397
public void testRSAServerTrustEE()
9498
throws Exception
9599
{
100+
// TLS_RSA is disabled in Java 25.
101+
if ("25".equals(System.getProperty("java.version")))
102+
{
103+
return;
104+
}
96105
KeyStore ks = getRsaKeyStore(true);
97106

98107
KeyStore trustStore = KeyStore.getInstance("JKS");
@@ -138,6 +147,11 @@ public void testRSAServerTrustEE()
138147
public void testRSAServerWithClientAuth()
139148
throws Exception
140149
{
150+
// TLS_RSA is disabled in Java 25.
151+
if ("25".equals(System.getProperty("java.version")))
152+
{
153+
return;
154+
}
141155
KeyStore clientKS = getRsaKeyStore(false);
142156
KeyStore serverKS = getRsaKeyStore(true);
143157

tls/src/test/java/org/bouncycastle/jsse/provider/test/TestUtils.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -282,27 +282,27 @@ public static KeyPair generateDSAKeyPair()
282282
}
283283

284284
/**
285-
* Create a random 1024 bit RSA key pair
285+
* Create a random 2048 bit RSA key pair
286286
*/
287287
public static KeyPair generateRSAKeyPair()
288288
throws Exception
289289
{
290290
KeyPairGenerator kpGen = KeyPairGenerator.getInstance("RSA", ProviderUtils.PROVIDER_NAME_BC);
291291

292-
kpGen.initialize(1024, RANDOM);
292+
kpGen.initialize(2048, RANDOM);
293293

294294
return kpGen.generateKeyPair();
295295
}
296296

297297
/**
298-
* Create a random 1024 bit RSASSA-PSS key pair
298+
* Create a random 2048 bit RSASSA-PSS key pair
299299
*/
300300
public static KeyPair generatePSSKeyPair()
301301
throws Exception
302302
{
303303
KeyPairGenerator kpGen = KeyPairGenerator.getInstance("RSASSA-PSS", ProviderUtils.PROVIDER_NAME_BC);
304304

305-
kpGen.initialize(1024, RANDOM);
305+
kpGen.initialize(2048, RANDOM);
306306

307307
return kpGen.generateKeyPair();
308308
}

0 commit comments

Comments
 (0)