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:07:31 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	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/1217afb5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1217afb5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1217afb5

Branch: refs/heads/cassandra-2.1
Commit: 1217afb5cf68e1d1d8bfc951b74fc4e0fa7b17f2
Parents: 26ea0f6 b93f48a
Author: Jason Brown <jasedbrown@gmail.com>
Authored: Wed Nov 12 16:07:12 2014 -0800
Committer: Jason Brown <jasedbrown@gmail.com>
Committed: Wed Nov 12 16:07:12 2014 -0800

----------------------------------------------------------------------
 CHANGES.txt                                                      | 1 +
 src/java/org/apache/cassandra/security/SSLFactory.java           | 4 ++++
 .../org/apache/cassandra/thrift/CustomTThreadPoolServer.java     | 4 ++++
 src/java/org/apache/cassandra/transport/Server.java              | 2 +-
 src/java/org/apache/cassandra/transport/SimpleClient.java        | 1 +
 5 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1217afb5/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 51a3ed0,809a102..1910f31
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,5 +1,9 @@@
 -2.0.12:
 +2.1.3
 + * Support for frozen collections (CASSANDRA-7859)
 + * Fix overflow on histogram computation (CASSANDRA-8028)
 + * Have paxos reuse the timestamp generation of normal queries (CASSANDRA-7801)
 +Merged from 2.0:
+  * Disable SSLv3 for POODLE (CASSANDRA-8265)
   * Fix millisecond timestamps in Tracing (CASSANDRA-8297)
   * Include keyspace name in error message when there are insufficient
     live nodes to stream from (CASSANDRA-8221)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1217afb5/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1217afb5/src/java/org/apache/cassandra/transport/Server.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/transport/Server.java
index 8af6ee8,092e1ba..2a60242
--- 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"});
 -            
              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/1217afb5/src/java/org/apache/cassandra/transport/SimpleClient.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/transport/SimpleClient.java
index 3cf9b7b,3bcf751..2e1e45e
--- a/src/java/org/apache/cassandra/transport/SimpleClient.java
+++ b/src/java/org/apache/cassandra/transport/SimpleClient.java
@@@ -253,7 -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"});
 -            ChannelPipeline pipeline = super.getPipeline();
 -
 -            pipeline.addFirst("ssl", new SslHandler(sslEngine));
 -            return pipeline;
 +            channel.pipeline().addFirst("ssl", new SslHandler(sslEngine));
          }
      }
  


Mime
View raw message