Merge branch 'release/0.4.3'

Author: hugoduncan

README.md

@@ -133,7 +133,7 @@ A: Probably a disk full, or permission error.
 Via [clojars](http://clojars.org) and
 [Leiningen](http://github.com/technomancy/leiningen).
 
-    :dependencies [clj-ssh "0.4.2"]
+    :dependencies [clj-ssh "0.4.3"]
 
 or your favourite maven repository aware tool.
 

ReleaseNotes.md

@@ -1,6 +1,10 @@
 # Release Notes
 
-Current release is 0.4.2
+Current release is 0.4.3
+
+## 0.4.3
+
+- Use passphrase when adding key to agent, and honour the key name
 
 ## 0.4.2
 

project.clj

@@ -1,4 +1,4 @@
-(defproject clj-ssh "0.4.2"
+(defproject clj-ssh "0.4.3"
   :description "Library for using SSH from clojure."
   :url "https://github.com/hugoduncan/clj-ssh"
   :license {:name "Eclipse Public License"

src/clj_ssh/ssh.clj

@@ -155,6 +155,8 @@
        (if (local-repo? id-repo)
          (.addIdentity agent name private-key public-key passphrase)
          (let [keypair (KeyPair/load agent private-key-path public-key-path)]
+           (when passphrase
+             (.decrypt keypair passphrase))
            (.add id-repo (.forSSHAgent keypair)))))
 
      (and public-key-path private-key-path)
@@ -164,13 +166,19 @@
           agent
           (file-path private-key-path) (file-path public-key-path) passphrase)
          (let [keypair (KeyPair/load agent private-key-path public-key-path)]
+           (when passphrase
+             (.decrypt keypair passphrase))
+           (.setPublicKeyComment keypair name)
            (.add id-repo (.forSSHAgent keypair)))))
 
      private-key-path
      (let [id-repo (id-repository)]
        (if (local-repo? id-repo)
          (.addIdentity agent (file-path private-key-path) passphrase)
          (let [keypair (KeyPair/load agent private-key-path)]
+           (when passphrase
+             (.decrypt keypair passphrase))
+           (.setPublicKeyComment keypair name)
            (.add id-repo (.forSSHAgent keypair)))))
 
      :else

test/clj_ssh/cli_test.clj

@@ -76,7 +76,7 @@
   (with-ssh-agent (ssh-agent {:use-system-ssh-agent false})
     (add-identity-with-keychain
       :private-key-path (encrypted-private-key-path)
-      :name "clj-ssh")
+      :passphrase "clj-ssh")
     (let [session (session "localhost")]
       (is (instance? com.jcraft.jsch.Session session))
       (is (not (connected? session)))

test/clj_ssh/ssh_test.clj

@@ -60,14 +60,13 @@
     (let [agent (ssh-agent {})]
       (let [n (count (.getIdentityNames agent))
             test-key-comment "key for test clj-ssh"
-            has-key (some #(= test-key-comment %) (.getIdentityNames agent))]
+            has-key (some #(= (private-key-path) %) (.getIdentityNames agent))]
         (add-identity
          agent
-         {:name "name"
-          :private-key-path (private-key-path)
+         {:private-key-path (private-key-path)
           :public-key-path (public-key-path)})
         (is (or has-key (= (inc n) (count (.getIdentityNames agent)))))
-        (is (some #(= test-key-comment %) (.getIdentityNames agent)))))))
+        (is (some #(= (private-key-path) %) (.getIdentityNames agent)))))))
 
 (deftest has-identity?-test
   (let [key (private-key-path)
@@ -141,7 +140,7 @@
         (add-identity-with-keychain
           agent
           {:private-key-path (encrypted-private-key-path)
-           :name "clj-ssh"})
+           :passphrase "clj-ssh"})
         (let [session (session
                        agent
                        "localhost"