Update JSch to latest 0.2.11 version (#70)

- Updates JSch to latest 0.2.11 version
- Updates Release Notes with jsch changes
- Updates README for latest version of clj-ssh

Author: tiagomlalves

README.md

@@ -5,7 +5,7 @@
 
 # clj-ssh
 
-SSH in clojure.  Uses jsch. 
+SSH in clojure.  Uses [jsch](https://github.com/mwiede/jsch).
 (See section RSA Private Key format if using openssl generated keys)
 
 ## Usage
@@ -205,7 +205,7 @@ Thanks to [Ryan Stradling](http://github.com/rstradling) for these.
 Via [clojars](http://clojars.org) and
 [Leiningen](http://github.com/technomancy/leiningen).
 
-    :dependencies [clj-ssh "0.5.14"]
+    :dependencies [org.clj-commons/clj-ssh "0.6.2"]
 
 or your favourite maven repository aware tool.
 

ReleaseNotes.md

@@ -1,3 +1,11 @@
+## 0.6.3
+
+ - Moved jsch to version 0.2.11
+
+## 0.6.2
+
+ - Moved jsch to supported fork from com.github.mwiede/jsch version 0.2.9
+
 ## 0.5.16
 
 - Moved jsch to version 0.1.55 

project.clj

@@ -11,7 +11,7 @@
 
   :dependencies [[org.clojure/tools.logging "1.2.4"
                   :exclusions [org.clojure/clojure]]
-                 [com.github.mwiede/jsch "0.2.9"]
+                 [com.github.mwiede/jsch "0.2.11"]
                  [net.java.dev.jna/jna "5.13.0"]
                  [com.kohlschutter.junixsocket/junixsocket-core "2.6.2" :extension "pom"]]
   :jvm-opts ["-Djava.awt.headless=true"]

src/clj_ssh/ssh.clj

@@ -162,9 +162,8 @@
    encrypted."
   [^JSch agent ^String private-key-path ^String public-key-path]
   (logging/tracef "Make identity %s %s" private-key-path public-key-path)
-  (reflect/call-method
-   com.jcraft.jsch.IdentityFile 'newInstance [String String JSch]
-   nil private-key-path public-key-path agent))
+  (.addIdentity agent private-key-path public-key-path nil)
+  (.lastElement (.getIdentities (.getIdentityRepository agent))))
 
 (defn ^KeyPair keypair
   "Return a KeyPair object for the given options.
@@ -238,7 +237,7 @@
   (^bytes getSignature [_ ^bytes data] (.. kpair (getSignature data)))
   (^bytes getSignature [_ ^bytes data ^String alg] (.. kpair (getSignature data alg)))
   (getAlgName [_]
-    (String. (reflect/call-method KeyPair 'getKeyTypeName [] kpair)))
+    (.getKeyTypeString kpair))
   (getName [_] identity)
   (isEncrypted [_] (.. kpair isEncrypted))
   (clear [_] (.. kpair dispose)))