Skip to content

Discontinue the use of https.protocols, https.cipherSuites system properties #793

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rschmitt merged 1 commit into from
Jan 18, 2026
+14 −24
Merged

Discontinue the use of https.protocols, https.cipherSuites system properties #793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions ...in/java/org/apache/hc/client5/http/impl/io/PoolingHttpClientConnectionManagerBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,6 @@
* <li>javax.net.ssl.keyStore</li>
* <li>javax.net.ssl.keyStoreProvider</li>
* <li>javax.net.ssl.keyStorePassword</li>
* <li>https.protocols</li>
* <li>https.cipherSuites</li>
* </ul>
*
* @since 5.0
Expand Down
2 changes: 0 additions & 2 deletions .../java/org/apache/hc/client5/http/impl/nio/PoolingAsyncClientConnectionManagerBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,6 @@
* <li>javax.net.ssl.keyStore</li>
* <li>javax.net.ssl.keyStoreProvider</li>
* <li>javax.net.ssl.keyStorePassword</li>
* <li>https.protocols</li>
* <li>https.cipherSuites</li>
* </ul>
*
* @since 5.0
Expand Down
18 changes: 2 additions & 16 deletions httpclient5/src/main/java/org/apache/hc/client5/http/ssl/ClientTlsStrategyBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,6 @@
* <li>javax.net.ssl.keyStore</li>
* <li>javax.net.ssl.keyStoreProvider</li>
* <li>javax.net.ssl.keyStorePassword</li>
* <li>https.protocols</li>
* <li>https.cipherSuites</li>
* </ul>
*
* @since 5.0
Expand Down Expand Up @@ -212,24 +210,12 @@ private DefaultClientTlsStrategy buildImpl() {
} else {
sslContextCopy = systemProperties ? SSLContexts.createSystemDefault() : SSLContexts.createDefault();
}
final String[] tlsVersionsCopy;
if (tlsVersions != null) {
tlsVersionsCopy = tlsVersions;
} else {
tlsVersionsCopy = systemProperties ? HttpsSupport.getSystemProtocols() : null;
}
final String[] ciphersCopy;
if (ciphers != null) {
ciphersCopy = ciphers;
} else {
ciphersCopy = systemProperties ? HttpsSupport.getSystemCipherSuits() : null;
}
final HostnameVerificationPolicy hostnameVerificationPolicyCopy = hostnameVerificationPolicy != null ? hostnameVerificationPolicy :
(hostnameVerifier == null ? HostnameVerificationPolicy.BUILTIN : HostnameVerificationPolicy.BOTH);
return new DefaultClientTlsStrategy(
sslContextCopy,
tlsVersionsCopy,
ciphersCopy,
tlsVersions,
ciphers,
sslBufferMode != null ? sslBufferMode : SSLBufferMode.STATIC,
hostnameVerificationPolicyCopy,
hostnameVerifier);
Expand Down
4 changes: 2 additions & 2 deletions httpclient5/src/main/java/org/apache/hc/client5/http/ssl/ConscryptClientTlsStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ public static TlsStrategy getDefault() {
public static TlsStrategy getSystemDefault() {
return new ConscryptClientTlsStrategy(
SSLContexts.createSystemDefault(),
HttpsSupport.getSystemProtocols(),
HttpsSupport.getSystemCipherSuits(),
null,
null,
SSLBufferMode.STATIC,
HostnameVerificationPolicy.BUILTIN,
null);
Expand Down
4 changes: 2 additions & 2 deletions httpclient5/src/main/java/org/apache/hc/client5/http/ssl/DefaultClientTlsStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ public static DefaultClientTlsStrategy createDefault() {
public static DefaultClientTlsStrategy createSystemDefault() {
return new DefaultClientTlsStrategy(
SSLContexts.createSystemDefault(),
HttpsSupport.getSystemProtocols(),
HttpsSupport.getSystemCipherSuits(),
null,
null,
SSLBufferMode.STATIC,
HostnameVerificationPolicy.BUILTIN,
null);
Expand Down
8 changes: 8 additions & 0 deletions httpclient5/src/main/java/org/apache/hc/client5/http/ssl/HttpsSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,18 @@ private static String[] split(final String s) {
return s.split(" *, *");
}

/**
* @deprecated Do not use.
*/
@Deprecated
public static String[] getSystemProtocols() {
return split(System.getProperty("https.protocols"));
}

/**
* @deprecated Do not use.
*/
@Deprecated
public static String[] getSystemCipherSuits() {
return split(System.getProperty("https.cipherSuites"));
}
Expand Down