Merge pull request #1 from absurdfarce/ssl-brokenness

Incorporating Phil's changes to get SSL working again.
absurdfarce · Feb 25, 2016 · ca376e5 · ca376e5
2 parents 370bbe1 + 7691a67
commit ca376e5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/project.clj b/project.clj
@@ -1,4 +1,4 @@
-(defproject absurdfarce/cassaforte "2.0.1-30drivers-1.0.0"
+(defproject absurdfarce/cassaforte "2.0.1-30drivers-1.0.2"
   :min-lein-version "2.5.0"
   :description "A Clojure client for Apache Cassandra"
   :url "http://clojurecassandra.info"

diff --git a/src/clojure/clojurewerkz/cassaforte/client.clj b/src/clojure/clojurewerkz/cassaforte/client.clj
@@ -128,14 +128,15 @@
                             (into-array String cipher-suites)
                             ;; v3.0 of the drivers dropped SSLOptions.DEFAULT_SSL_CIPHER_SUITES so we'll just re-use
                             ;; the literal here.
-                            { "TLS_RSA_WITH_AES_128_CBC_SHA", "TLS_RSA_WITH_AES_256_CBC_SHA" })]
+                            (into-array String ["TLS_RSA_WITH_AES_128_CBC_SHA" "TLS_RSA_WITH_AES_256_CBC_SHA"]))]
     (.load keystore keystore-stream password)
     (.init keymanager keystore password)
     (.init trustmanager keystore)
     (.init ssl-context (.getKeyManagers keymanager) (.getTrustManagers trustmanager) nil)
-    (-> (JdkSSLOptions/builder)
-        (.withSSLContext ssl-context)
-        (.withCipherSuites ssl-cipher-suites))))
+    (.. (JdkSSLOptions/builder)
+        (withSSLContext ssl-context)
+        (withCipherSuites ssl-cipher-suites)
+        (build))))
 
 (defn- ^ProtocolOptions$Compression select-compression
   [compression]