1 files changed, 11 insertions, 4 deletions

diff --git a/sshconnect1.c b/sshconnect1.c
index 016abbce5..bfc523bde 100644
--- a/sshconnect1.c
+++ b/sshconnect1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect1.c,v 1.77 2015/01/14 20:05:27 djm Exp $ */
+/* $OpenBSD: sshconnect1.c,v 1.78 2015/11/15 22:26:49 jcs Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -221,7 +221,7 @@ try_rsa_authentication(int idx)
 {
         BIGNUM *challenge;
         Key *public, *private;
-        char buf[300], *passphrase, *comment, *authfile;
+        char buf[300], *passphrase = NULL, *comment, *authfile;
         int i, perm_ok = 1, type, quit;
 
         public = options.identity_keys[idx];
@@ -283,13 +283,20 @@ try_rsa_authentication(int idx)
                                 debug2("no passphrase given, try next key");
                                 quit = 1;
                         }
-                        explicit_bzero(passphrase, strlen(passphrase));
-                        free(passphrase);
                         if (private != NULL || quit)
                                 break;
                         debug2("bad passphrase given, try again...");
                 }
         }
+
+        if (private != NULL)
+                maybe_add_key_to_agent(authfile, private, comment, passphrase);
+
+        if (passphrase != NULL) {
+                explicit_bzero(passphrase, strlen(passphrase));
+                free(passphrase);
+        }
+
         /* We no longer need the comment. */
         free(comment);