Fix #78: TLS connections broken, if no explicit TLS Protocol is speci…

…fied
dcm4che · Apr 10, 2017 · 3155f30 · 3155f30
1 parent 596a80e
commit 3155f30
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/dcm4che-net/src/main/java/org/dcm4che3/net/Connection.java b/dcm4che-net/src/main/java/org/dcm4che3/net/Connection.java
@@ -1230,7 +1230,7 @@ private SSLSocket createTLSSocket(Socket s, Connection remoteConn)
         SSLSocket ssl = (SSLSocket) sf.createSocket(s,
                 remoteConn.getHostname(), remoteConn.getPort(), true);
         ssl.setEnabledProtocols(
-                intersect(remoteConn.tlsProtocols, tlsProtocols));
+                intersect(remoteConn.tlsProtocols(), tlsProtocols()));
         ssl.setEnabledCipherSuites(
                 intersect(remoteConn.tlsCipherSuites, tlsCipherSuites));
         ssl.startHandshake();
@@ -1252,8 +1252,8 @@ public boolean isCompatible(Connection remoteConn) {
         if (!isTls())
             return !remoteConn.isTls();
 
-        return hasCommon(remoteConn.tlsProtocols, tlsProtocols)
-                && hasCommon(remoteConn.tlsCipherSuites, tlsCipherSuites);
+        return hasCommon(remoteConn.tlsProtocols(), tlsProtocols())
+            && hasCommon(remoteConn.tlsCipherSuites, tlsCipherSuites);
     }
 
     private boolean hasCommon(String[] ss1, String[] ss2) {