From 03ec0f888d605e867086646e645b29fb33daba5f Mon Sep 17 00:00:00 2001 From: Alex King Date: Sat, 24 May 2014 19:36:17 +0100 Subject: [PATCH] Added support for nil password when none specified --- src/clj_http/conn_mgr.clj | 2 +- test/clj_http/test/conn_mgr.clj | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/clj_http/conn_mgr.clj b/src/clj_http/conn_mgr.clj index 2679fae4..1d26f18b 100644 --- a/src/clj_http/conn_mgr.clj +++ b/src/clj_http/conn_mgr.clj @@ -96,7 +96,7 @@ (let [keystore (KeyStore/getInstance (or keystore-type (KeyStore/getDefaultType)))] (with-open [is (io/input-stream keystore-file)] - (.load keystore is (.toCharArray keystore-pass)) + (.load keystore is (when keystore-pass (.toCharArray keystore-pass))) keystore)))) (defn ^SchemeRegistry get-keystore-scheme-registry diff --git a/test/clj_http/test/conn_mgr.clj b/test/clj_http/test/conn_mgr.clj index 5c2a6196..c7daf907 100644 --- a/test/clj_http/test/conn_mgr.clj +++ b/test/clj_http/test/conn_mgr.clj @@ -26,6 +26,10 @@ (is (instance? KeyStore ks)) (is (> (.size ks) 0)))) +(deftest load-keystore-with-nil-pass + (let [ks (conn-mgr/get-keystore "test-resources/keystore" nil nil)] + (is (instance? KeyStore ks)))) + (deftest keystore-scheme-factory (let [sr (conn-mgr/get-keystore-scheme-registry {:keystore client-ks :keystore-pass client-ks-pass