geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r1363638 - /geronimo/server/branches/3.0/plugins/corba/geronimo-yoko/src/main/java/org/apache/geronimo/yoko/SocketFactory.java
Date Fri, 20 Jul 2012 03:36:42 GMT
Author: genspring
Date: Fri Jul 20 03:36:41 2012
New Revision: 1363638

URL: http://svn.apache.org/viewvc?rev=1363638&view=rev
Log:
GERONIMOTCK-141 we should use default enabled cipher suites at runtime instead of supported
cipher suites

Modified:
    geronimo/server/branches/3.0/plugins/corba/geronimo-yoko/src/main/java/org/apache/geronimo/yoko/SocketFactory.java

Modified: geronimo/server/branches/3.0/plugins/corba/geronimo-yoko/src/main/java/org/apache/geronimo/yoko/SocketFactory.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/plugins/corba/geronimo-yoko/src/main/java/org/apache/geronimo/yoko/SocketFactory.java?rev=1363638&r1=1363637&r2=1363638&view=diff
==============================================================================
--- geronimo/server/branches/3.0/plugins/corba/geronimo-yoko/src/main/java/org/apache/geronimo/yoko/SocketFactory.java
(original)
+++ geronimo/server/branches/3.0/plugins/corba/geronimo-yoko/src/main/java/org/apache/geronimo/yoko/SocketFactory.java
Fri Jul 20 03:36:41 2012
@@ -410,7 +410,7 @@ public class SocketFactory implements Co
             // we have a socket factory....now get our cipher suite set based on our requirements
and what's
             // available from the factory.
             if (cipherSuites == null) {
-                cipherSuites = SSLCipherSuiteDatabase.getCipherSuites(requires, supports,
serverSocketFactory.getSupportedCipherSuites());
+                cipherSuites = SSLCipherSuiteDatabase.getCipherSuites(requires, supports,
serverSocketFactory.getDefaultCipherSuites());
             }
             // There's a bit of a timing problem with server-side ORBs.  Part of the ORB
shutdown is to
             // establish a self-connection to shutdown the acceptor threads.  This requires
a client
@@ -480,7 +480,7 @@ public class SocketFactory implements Co
         // get a set of cipher suites appropriate for this connections requirements.
         // We request this for each connection, since the outgoing IOR's requirements may
be different from
         // our server listener requirements.
-        String[] iorSuites = SSLCipherSuiteDatabase.getCipherSuites(requires, supports, factory.getSupportedCipherSuites());
+        String[] iorSuites = SSLCipherSuiteDatabase.getCipherSuites(requires, supports, factory.getDefaultCipherSuites());
         socket.setEnabledCipherSuites(iorSuites);
         if (log.isDebugEnabled()) {
             log.debug("Created SSL socket to " + host + ":" + port);



Mime
View raw message