1 files changed, 7 insertions, 3 deletions

diff --git a/sshconnect.c b/sshconnect.c
index 1e5b8ea5a..bab3916d8 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect.c,v 1.329 2020/03/13 04:01:56 djm Exp $ */
+/* $OpenBSD: sshconnect.c,v 1.332 2020/09/09 21:57:27 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -89,11 +89,14 @@ expand_proxy_command(const char *proxy_command, const char *user,
     const char *host, const char *host_arg, int port)
 {
         char *tmp, *ret, strport[NI_MAXSERV];
+        const char *keyalias = options.host_key_alias ?
+             options.host_key_alias : host_arg;
 
         snprintf(strport, sizeof strport, "%d", port);
         xasprintf(&tmp, "exec %s", proxy_command);
         ret = percent_expand(tmp,
             "h", host,
+            "k", keyalias,
             "n", host_arg,
             "p", strport,
             "r", options.user,
@@ -594,7 +597,7 @@ confirm(const char *prompt, const char *fingerprint)
                 if (p[0] == '\0' || strcasecmp(p, "no") == 0)
                         ret = 0;
                 else if (strcasecmp(p, "yes") == 0 || (fingerprint != NULL &&
-                    strcasecmp(p, fingerprint) == 0))
+                    strcmp(p, fingerprint) == 0))
                         ret = 1;
                 free(cp);
                 if (ret != -1)
@@ -1437,7 +1440,8 @@ maybe_add_key_to_agent(const char *authfile, struct sshkey *private,
         if (sshkey_is_sk(private))
                 skprovider = options.sk_provider;
         if ((r = ssh_add_identity_constrained(auth_sock, private,
-            comment == NULL ? authfile : comment, 0,
+            comment == NULL ? authfile : comment,
+            options.add_keys_to_agent_lifespan,
             (options.add_keys_to_agent == 3), 0, skprovider)) == 0)
                 debug("identity added to agent: %s", authfile);
         else