cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jasobr...@apache.org
Subject [2/2] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Thu, 13 Nov 2014 00:16:47 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
	src/java/org/apache/cassandra/transport/Server.java
	src/java/org/apache/cassandra/transport/SimpleClient.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5615a79c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5615a79c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5615a79c

Branch: refs/heads/cassandra-2.1
Commit: 5615a79cf0b4579af363688124d3f57fa7efa00d
Parents: 1217afb 37d33b2
Author: Jason Brown <jasedbrown@gmail.com>
Authored: Wed Nov 12 16:16:31 2014 -0800
Committer: Jason Brown <jasedbrown@gmail.com>
Committed: Wed Nov 12 16:16:31 2014 -0800

----------------------------------------------------------------------
 src/java/org/apache/cassandra/security/SSLFactory.java    | 10 +++++-----
 .../apache/cassandra/thrift/CustomTThreadPoolServer.java  |  3 ++-
 src/java/org/apache/cassandra/transport/Server.java       |  2 +-
 src/java/org/apache/cassandra/transport/SimpleClient.java |  2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5615a79c/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
index 8a4d016,f25c761..7e67110
--- a/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
+++ b/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
@@@ -35,7 -35,7 +35,8 @@@ import org.slf4j.LoggerFactory
  import org.apache.cassandra.concurrent.NamedThreadFactory;
  import org.apache.cassandra.config.DatabaseDescriptor;
  import org.apache.cassandra.config.EncryptionOptions.ClientEncryptionOptions;
 +import org.apache.cassandra.utils.JVMStabilityInspector;
+ import org.apache.cassandra.security.SSLFactory;
  import org.apache.thrift.TException;
  import org.apache.thrift.TProcessor;
  import org.apache.thrift.protocol.TProtocol;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5615a79c/src/java/org/apache/cassandra/transport/Server.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/transport/Server.java
index 2a60242,df4f127..ba6e895
--- a/src/java/org/apache/cassandra/transport/Server.java
+++ b/src/java/org/apache/cassandra/transport/Server.java
@@@ -324,10 -296,13 +324,10 @@@ public class Server implements Cassandr
              sslEngine.setUseClientMode(false);
              sslEngine.setEnabledCipherSuites(encryptionOptions.cipher_suites);
              sslEngine.setNeedClientAuth(encryptionOptions.require_client_auth);
-             sslEngine.setEnabledProtocols(new String[] {"SSLv2Hello", "TLSv1", "TLSv1.1",
"TLSv1.2"});
+             sslEngine.setEnabledProtocols(SSLFactory.ACCEPTED_PROTOCOLS);
 -            
              SslHandler sslHandler = new SslHandler(sslEngine);
 -            sslHandler.setIssueHandshake(true);
 -            ChannelPipeline pipeline = super.getPipeline();
 -            pipeline.addFirst("ssl", sslHandler);
 -            return pipeline;
 +            super.initChannel(channel);
 +            channel.pipeline().addFirst("ssl", sslHandler);
          }
      }
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5615a79c/src/java/org/apache/cassandra/transport/SimpleClient.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/transport/SimpleClient.java
index 2e1e45e,1ed9ab9..3a6ecf7
--- a/src/java/org/apache/cassandra/transport/SimpleClient.java
+++ b/src/java/org/apache/cassandra/transport/SimpleClient.java
@@@ -253,8 -259,11 +253,8 @@@ public class SimpleClien
              SSLEngine sslEngine = sslContext.createSSLEngine();
              sslEngine.setUseClientMode(true);
              sslEngine.setEnabledCipherSuites(encryptionOptions.cipher_suites);
-             sslEngine.setEnabledProtocols(new String[] {"SSLv2Hello", "TLSv1", "TLSv1.1",
"TLSv1.2"});
+             sslEngine.setEnabledProtocols(SSLFactory.ACCEPTED_PROTOCOLS);
 -            ChannelPipeline pipeline = super.getPipeline();
 -
 -            pipeline.addFirst("ssl", new SslHandler(sslEngine));
 -            return pipeline;
 +            channel.pipeline().addFirst("ssl", new SslHandler(sslEngine));
          }
      }
  


Mime
View raw message