infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-05-09 21:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

8383570: Test DisabledAlgorithms.java intermittently timed out

Browse Source 
Reviewed-by: djelinski
This commit is contained in:
SendaoYan 2026-05-06 03:59:15 +00:00
parent dab7414e8d
commit f646ace39e
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
test/jdk/javax/net/ssl/ciphersuites/DisabledAlgorithms.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2026, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -36,8 +36,10 @@ import java.io.BufferedOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.InetAddress;
import java.security.Security;
import java.util.concurrent.TimeUnit;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLHandshakeException;
import javax.net.ssl.SSLServerSocket;
@ -56,6 +58,8 @@ import javax.net.ssl.SSLSocketFactory;
*/
public class DisabledAlgorithms {
private static final int SOCKET_TIMEOUT_MILLIS = 10_000;
public static final SSLContextTemplate.Cert[] CERTIFICATES = {
SSLContextTemplate.Cert.EE_DSA_SHA1_1024,
SSLContextTemplate.Cert.EE_DSA_SHA224_1024,
@ -139,15 +143,15 @@ public class DisabledAlgorithms {
}
switch (args[0]) {
case "default":
case "default" -> {
// use default jdk.tls.disabledAlgorithms
System.out.println("jdk.tls.disabledAlgorithms = "
+ Security.getProperty("jdk.tls.disabledAlgorithms"));
// check that disabled cipher suites can't be used by default
checkFailure(DISABLED_CIPHERSUITES);
break;
case "empty":
}
case "empty" -> {
// reset jdk.tls.disabledAlgorithms
Security.setProperty("jdk.tls.disabledAlgorithms", "");
System.out.println("jdk.tls.disabledAlgorithms = "
@ -162,9 +166,8 @@ public class DisabledAlgorithms {
// check that disabled cipher suites can be used if
// jdk.{tls,certpath}.disabledAlgorithms is empty
checkSuccess(DISABLED_CIPHERSUITES);
break;
default:
throw new RuntimeException("Wrong parameter: " + args[0]);
}
default -> throw new RuntimeException("Wrong parameter: " + args[0]);
}
System.out.println("Test passed");
@ -270,7 +273,7 @@ public class DisabledAlgorithms {
DisabledAlgorithms.CERTIFICATES, getServerContextParameters());
SSLServerSocketFactory ssf = context.getServerSocketFactory();
SSLServerSocket ssocket = (SSLServerSocket)
ssf.createServerSocket(0);
ssf.createServerSocket(0, 0, InetAddress.getLoopbackAddress());
if (ciphersuites != null) {
System.out.println("Server: enable cipher suites: "
@ -287,7 +290,10 @@ public class DisabledAlgorithms {
running = true;
while (!stopped) {
try (SSLSocket socket = (SSLSocket) ssocket.accept()) {
System.out.println("Server: accepted client connection");
System.out.println("Server: accepted client connection from "
+ socket.getRemoteSocketAddress());
socket.setSoTimeout(SOCKET_TIMEOUT_MILLIS);
socket.startHandshake();
InputStream in = socket.getInputStream();
OutputStream out = socket.getOutputStream();
int b = in.read();
@ -307,7 +313,6 @@ public class DisabledAlgorithms {
+ e);
e.printStackTrace();
otherError = true;
stopped = true;
} else {
System.out.println("Server: run: " + e);
System.out.println("The exception above occurred "
@ -367,7 +372,9 @@ public class DisabledAlgorithms {
SSLContext context = createSSLContext(DisabledAlgorithms.CERTIFICATES,
null, getClientContextParameters());
SSLSocketFactory ssf = context.getSocketFactory();
SSLSocket socket = (SSLSocket) ssf.createSocket("localhost", port);
SSLSocket socket = (SSLSocket) ssf.createSocket(
InetAddress.getLoopbackAddress(), port);
socket.setSoTimeout(SOCKET_TIMEOUT_MILLIS);
if (ciphersuite != null) {
System.out.println("Client: enable cipher suite: "
@ -379,6 +386,7 @@ public class DisabledAlgorithms {
void connect() throws IOException {
System.out.println("Client: connect to server");
socket.startHandshake();
try (
BufferedInputStream bis = new BufferedInputStream(
socket.getInputStream());