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

Author: ok2c

httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/PoolingHttpClientConnectionManagerBuilder.java

@@ -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

httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/PoolingAsyncClientConnectionManagerBuilder.java

@@ -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

httpclient5/src/main/java/org/apache/hc/client5/http/ssl/ClientTlsStrategyBuilder.java

@@ -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
@@ -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);

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);

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);

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"));
     }