Skip to content
This repository has been archived by the owner on Dec 1, 2021. It is now read-only.

Incorporating Phil's changes to get SSL working again. #1

Merged
merged 2 commits into from
Feb 25, 2016
Merged

Incorporating Phil's changes to get SSL working again. #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28f2baa
Incorporating Phil's changes to get SSL working again.
absurdfarce Feb 23, 2016
7691a67
A few small changes based on code review.
absurdfarce Feb 25, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion project.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(defproject absurdfarce/cassaforte "2.0.1-30drivers-1.0.0"
(defproject absurdfarce/cassaforte "2.0.1-30drivers-1.0.2"
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I preserved version numbers here since this represents identical code; a version is a version, whether it's in your repo or mine. :)

:min-lein-version "2.5.0"
:description "A Clojure client for Apache Cassandra"
:url "http://clojurecassandra.info"
Expand Down
9 changes: 5 additions & 4 deletions src/clojure/clojurewerkz/cassaforte/client.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down