diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/PoolingHttpClientConnectionManagerBuilder.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/PoolingHttpClientConnectionManagerBuilder.java
index ae62bdbe8f..2f39e9ddfe 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/PoolingHttpClientConnectionManagerBuilder.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/PoolingHttpClientConnectionManagerBuilder.java
@@ -72,8 +72,6 @@
*
javax.net.ssl.keyStore
* javax.net.ssl.keyStoreProvider
* javax.net.ssl.keyStorePassword
- * https.protocols
- * https.cipherSuites
*
*
* @since 5.0
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/PoolingAsyncClientConnectionManagerBuilder.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/PoolingAsyncClientConnectionManagerBuilder.java
index 0a30435268..e899071003 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/PoolingAsyncClientConnectionManagerBuilder.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/PoolingAsyncClientConnectionManagerBuilder.java
@@ -68,8 +68,6 @@
* javax.net.ssl.keyStore
* javax.net.ssl.keyStoreProvider
* javax.net.ssl.keyStorePassword
- * https.protocols
- * https.cipherSuites
*
*
* @since 5.0
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/ClientTlsStrategyBuilder.java b/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/ClientTlsStrategyBuilder.java
index 3f54b8e570..12e254a929 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/ClientTlsStrategyBuilder.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/ClientTlsStrategyBuilder.java
@@ -58,8 +58,6 @@
* javax.net.ssl.keyStore
* javax.net.ssl.keyStoreProvider
* javax.net.ssl.keyStorePassword
- * https.protocols
- * https.cipherSuites
*
*
* @since 5.0
@@ -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);
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/ConscryptClientTlsStrategy.java b/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/ConscryptClientTlsStrategy.java
index 089da89b7a..fb270e7dba 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/ConscryptClientTlsStrategy.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/ConscryptClientTlsStrategy.java
@@ -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);
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/DefaultClientTlsStrategy.java b/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/DefaultClientTlsStrategy.java
index 76faf8c9b1..7e6c1122c4 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/DefaultClientTlsStrategy.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/DefaultClientTlsStrategy.java
@@ -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);
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/HttpsSupport.java b/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/HttpsSupport.java
index 910d345f58..135aa31e11 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/HttpsSupport.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/HttpsSupport.java
@@ -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"));
}