infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-01-28 03:58:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

8373101: JdkClient and JdkServer test classes ignore namedGroups field

Browse Source 
Reviewed-by: rhalade
This commit is contained in:
Matthew Donovan 2025-12-09 18:48:33 +00:00
parent b2daf9de30
commit 1ae4a6c43e
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/jdk/javax/net/ssl/TLSCommon/interop/JdkClient.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2020, 2025, 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
@ -25,6 +25,7 @@ import java.io.IOException;
import java.net.InetSocketAddress;
import java.net.SocketException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import javax.net.ssl.SNIHostName;
@ -86,6 +87,16 @@ public class JdkClient extends AbstractClient {
if (builder.getAppProtocols() != null) {
sslParams.setApplicationProtocols(builder.getAppProtocols());
}
NamedGroup[] namedGroups = builder.getNamedGroups();
if (namedGroups != null
&& namedGroups.length > 0) {
String[] namedGroupStrs = Arrays.stream(namedGroups)
.map(NamedGroup::name)
.toArray(String[]::new);
sslParams.setNamedGroups(namedGroupStrs);
}
socket.setSSLParameters(sslParams);
}

14
test/jdk/javax/net/ssl/TLSCommon/interop/JdkServer.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2020, 2025, 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
@ -22,9 +22,9 @@
*/
import java.io.IOException;
import java.net.InetAddress;
import java.net.SocketException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import javax.net.ssl.SNIHostName;
@ -85,6 +85,16 @@ public class JdkServer extends AbstractServer {
System.out.println("appProtocol: " + appProtocol);
}
}
NamedGroup[] namedGroups = builder.getNamedGroups();
if (namedGroups != null
&& namedGroups.length > 0) {
String[] namedGroupStrs = Arrays.stream(namedGroups)
.map(NamedGroup::name)
.toArray(String[]::new);
sslParams.setNamedGroups(namedGroupStrs);
}
serverSocket.setSSLParameters(sslParams);
}