Skip to content

Commit d7eeacf

Browse files
committed
8367112: HttpClient does not support Named Groups set on SSLParameters
Reviewed-by: jpai, dfuchs
1 parent 91afdaf commit d7eeacf

File tree

2 files changed

+18
-2
lines changed

2 files changed

+18
-2
lines changed

src/java.net.http/share/classes/jdk/internal/net/http/common/Utils.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -610,6 +610,8 @@ public static SSLParameters copySSLParameters(SSLParameters p) {
610610
p1.setSNIMatchers(p.getSNIMatchers());
611611
p1.setServerNames(p.getServerNames());
612612
p1.setUseCipherSuitesOrder(p.getUseCipherSuitesOrder());
613+
p1.setSignatureSchemes(p.getSignatureSchemes());
614+
p1.setNamedGroups(p.getNamedGroups());
613615
return p1;
614616
}
615617

test/jdk/java/net/httpclient/HttpClientBuilderTest.java

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -57,7 +57,7 @@
5757

5858
/*
5959
* @test
60-
* @bug 8209137 8326233
60+
* @bug 8209137 8326233 8367112
6161
* @summary HttpClient[.Builder] API and behaviour checks
6262
* @library /test/lib
6363
* @build jdk.test.lib.net.SimpleSSLContext
@@ -271,6 +271,20 @@ public void testSSLParameters() {
271271
try (var closer = closeable(builder)) {
272272
assertTrue(closer.build().sslParameters().getProtocols()[0].equals("C"));
273273
}
274+
SSLParameters d = new SSLParameters();
275+
d.setSignatureSchemes(new String[] { "C" });
276+
builder.sslParameters(d);
277+
d.setSignatureSchemes(new String[] { "D" });
278+
try (var closer = closeable(builder)) {
279+
assertTrue(closer.build().sslParameters().getSignatureSchemes()[0].equals("C"));
280+
}
281+
SSLParameters e = new SSLParameters();
282+
e.setNamedGroups(new String[] { "C" });
283+
builder.sslParameters(e);
284+
e.setNamedGroups(new String[] { "D" });
285+
try (var closer = closeable(builder)) {
286+
assertTrue(closer.build().sslParameters().getNamedGroups()[0].equals("C"));
287+
}
274288
// test defaults for needClientAuth and wantClientAuth
275289
builder.sslParameters(new SSLParameters());
276290
try (var closer = closeable(builder)) {

0 commit comments

Comments
 (0)