Skip to content

Commit 0bd52f8

Browse files
committed
Java 25 (no TLS_RSA)
1 parent 1dc502f commit 0bd52f8

File tree

1 file changed

+16
-2
lines changed

1 file changed

+16
-2
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

0 commit comments

Comments
 (0)