Use SSLContext.getDefault() in default SSLOptions.

olim7t · olim7t · commit 610fe58112ff · 2015-11-05T18:54:41.000+01:00
The way we built the SSLContext before, it would ignore keystore system
properties (javax.net.ssl.keyStore and javax.net.ssl.keyStorePassword).
We provide the default implementation for people who have a simple
configuration that should require no code, so it makes sense that it
would honor those properties.
diff --git a/driver-core/src/main/java/com/datastax/driver/core/SSLOptions.java b/driver-core/src/main/java/com/datastax/driver/core/SSLOptions.java
@@ -24,8 +24,6 @@
  */
 public class SSLOptions {
 
-    private static final String SSL_PROTOCOL = "TLS";
-
     /**
      * The default SSL cipher suites.
      */
@@ -63,12 +61,8 @@ public SSLOptions(SSLContext context, String[] cipherSuites) {
 
     private static SSLContext makeDefaultContext() throws IllegalStateException {
         try {
-            SSLContext ctx = SSLContext.getInstance(SSL_PROTOCOL);
-            ctx.init(null, null, null); // use defaults
-            return ctx;
+            return SSLContext.getDefault();
         } catch (NoSuchAlgorithmException e) {
-            throw new RuntimeException("This JVM doesn't support TLS, this shouldn't happen");
-        } catch (KeyManagementException e) {
             throw new IllegalStateException("Cannot initialize SSL Context", e);
         }
     }
