infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-04-28 15:51:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

8367112: HttpClient does not support Named Groups set on SSLParameters

Browse Source 
Reviewed-by: jpai, dfuchs
This commit is contained in:
Daniel Jeliński 2025-09-17 14:01:32 +00:00
parent 91afdaff80
commit d7eeacf2a0
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -610,6 +610,8 @@ public final class Utils {
p1.setSNIMatchers(p.getSNIMatchers());
p1.setServerNames(p.getServerNames());
p1.setUseCipherSuitesOrder(p.getUseCipherSuitesOrder());
p1.setSignatureSchemes(p.getSignatureSchemes());
p1.setNamedGroups(p.getNamedGroups());
return p1;
}

18
test/jdk/java/net/httpclient/HttpClientBuilderTest.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 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
@ -57,7 +57,7 @@ import static org.testng.Assert.*;
/*
* @test
* @bug 8209137 8326233
* @bug 8209137 8326233 8367112
* @summary HttpClient[.Builder] API and behaviour checks
* @library /test/lib
* @build jdk.test.lib.net.SimpleSSLContext
@ -271,6 +271,20 @@ public class HttpClientBuilderTest {
try (var closer = closeable(builder)) {
assertTrue(closer.build().sslParameters().getProtocols()[0].equals("C"));
}
SSLParameters d = new SSLParameters();
d.setSignatureSchemes(new String[] { "C" });
builder.sslParameters(d);
d.setSignatureSchemes(new String[] { "D" });
try (var closer = closeable(builder)) {
assertTrue(closer.build().sslParameters().getSignatureSchemes()[0].equals("C"));
}
SSLParameters e = new SSLParameters();
e.setNamedGroups(new String[] { "C" });
builder.sslParameters(e);
e.setNamedGroups(new String[] { "D" });
try (var closer = closeable(builder)) {
assertTrue(closer.build().sslParameters().getNamedGroups()[0].equals("C"));
}
// test defaults for needClientAuth and wantClientAuth
builder.sslParameters(new SSLParameters());
try (var closer = closeable(builder)) {