From 1ae4a6c43ea21d4b147bcfcfaf1484c6e618dce5 Mon Sep 17 00:00:00 2001
From: Matthew Donovan <mdonovan@openjdk.org>
Date: Tue, 9 Dec 2025 18:48:33 +0000
Subject: [PATCH] 8373101: JdkClient and JdkServer test classes ignore
 namedGroups field

Reviewed-by: rhalade
---
 .../javax/net/ssl/TLSCommon/interop/JdkClient.java | 13 ++++++++++++-
 .../javax/net/ssl/TLSCommon/interop/JdkServer.java | 14 ++++++++++++--
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/test/jdk/javax/net/ssl/TLSCommon/interop/JdkClient.java b/test/jdk/javax/net/ssl/TLSCommon/interop/JdkClient.java
index 79476cbb81e..eb6ecbb12b8 100644
--- a/test/jdk/javax/net/ssl/TLSCommon/interop/JdkClient.java
+++ b/test/jdk/javax/net/ssl/TLSCommon/interop/JdkClient.java
@@ -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);
     }
 
diff --git a/test/jdk/javax/net/ssl/TLSCommon/interop/JdkServer.java b/test/jdk/javax/net/ssl/TLSCommon/interop/JdkServer.java
index 1521325b65a..20bfffbac7d 100644
--- a/test/jdk/javax/net/ssl/TLSCommon/interop/JdkServer.java
+++ b/test/jdk/javax/net/ssl/TLSCommon/interop/JdkServer.java
@@ -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);
     }