test/jdk/javax/net/ssl/compatibility/JdkUtils.java

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, 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
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.

@@ -19,39 +19,65 @@
  * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
 
-import java.security.KeyFactory;
 import java.security.NoSuchAlgorithmException;
 
+import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLParameters;
+import javax.net.ssl.SSLSocketFactory;
 
 /*
  * This class is used for returning some specific JDK information.
  */
 public class JdkUtils {
 
     public static final String JAVA_RUNTIME_VERSION = "javaRuntimeVersion";
-    public static final String SUPPORTS_EC_KEY = "supportsECKey";
+    public static final String SUPPORTED_PROTOCOLS = "supportedProtocols";
+    public static final String SUPPORTED_CIPHER_SUITES = "supportedCipherSuites";
     public static final String SUPPORTS_SNI = "supportsSNI";
     public static final String SUPPORTS_ALPN = "supportsALPN";
 
     // Returns the JDK build version.
     public static String javaRuntimeVersion() {
         return System.getProperty("java.runtime.version");
     }
 
-    // Checks if EC key algorithm is supported by the JDK build.
-    private static boolean supportsECKey() {
-        boolean isSupported = true;
+    private static String supportedProtocols() {
+        StringBuilder protocols = new StringBuilder();
+        for (String protocol : new String[] {
+                "TLSv1", "TLSv1.1", "TLSv1.2", "TLSv1.3" }) {
+            if (supportsProtocol(protocol)) {
+                protocols.append(protocol).append(Utils.VALUE_DELIMITER);
+            }
+        }
+        return protocols.toString().substring(
+                0, protocols.toString().length() - 1);
+    }
+
+    private static boolean supportsProtocol(String protocol) {
+        boolean supported = true;
         try {
-            KeyFactory.getInstance("EC");
+            SSLContext.getInstance(protocol);
         } catch (NoSuchAlgorithmException e) {
-            isSupported = false;
+            supported = false;
         }
-        return isSupported;
+        return supported;
+    }
+
+    private static String supportedCipherSuites() {
+        StringBuilder cipherSuites = new StringBuilder();
+        String[] supportedCipherSuites = ((SSLSocketFactory) SSLSocketFactory
+                .getDefault()).getSupportedCipherSuites();
+        for (int i = 0; i < supportedCipherSuites.length - 1; i++) {
+            cipherSuites.append(supportedCipherSuites[i])
+                    .append(Utils.VALUE_DELIMITER);
+        }
+        cipherSuites.append(
+                supportedCipherSuites[supportedCipherSuites.length - 1]);
+        return cipherSuites.toString();
     }
 
     // Checks if SNI is supported by the JDK build.
     private static boolean supportsSNI() {
         boolean isSupported = true;

@@ -72,14 +98,15 @@
             isSupported = false;
         }
         return isSupported;
     }
 
-    public static void main(String[] args) {
+    public static void main(String[] args) throws NoSuchAlgorithmException {
         System.out.print(Utils.join(Utils.PARAM_DELIMITER,
                 attr(JAVA_RUNTIME_VERSION, javaRuntimeVersion()),
-                attr(SUPPORTS_EC_KEY, supportsECKey()),
+                attr(SUPPORTED_PROTOCOLS, supportedProtocols()),
+                attr(SUPPORTED_CIPHER_SUITES, supportedCipherSuites()),
                 attr(SUPPORTS_SNI, supportsSNI()),
                 attr(SUPPORTS_ALPN, supportsALPN())));
     }
 
     private static String attr(String name, Object value) {