diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2017-04-28 05:24:53 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2017-04-28 05:26:37 +0200 |
| commit | 6830be90e71f46bcd182a9202b151eaf2b299434 (patch) | |
| tree | 4f32a34e1e7709dd27898589e188969ae707eef0 /sshconnect2.c | |
| parent | upstream commit (diff) | |
| download | openssh-6830be90e71f46bcd182a9202b151eaf2b299434.tar.xz openssh-6830be90e71f46bcd182a9202b151eaf2b299434.zip | |
upstream commit
include key fingerprint in "Offering public key" debug
message
Upstream-ID: 964749f820c2ed4cf6a866268b1a05e907315c52
Diffstat (limited to 'sshconnect2.c')
| -rw-r--r-- | sshconnect2.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index f8a54beea..7e4cde151 100644 --- a/sshconnect2.c +++ b/sshconnect2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect2.c,v 1.255 2017/03/11 23:40:26 djm Exp $ */ +/* $OpenBSD: sshconnect2.c,v 1.256 2017/04/28 03:24:53 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2008 Damien Miller. All rights reserved. @@ -1479,6 +1479,7 @@ userauth_pubkey(Authctxt *authctxt) { Identity *id; int sent = 0; + char *fp; while ((id = TAILQ_FIRST(&authctxt->keys))) { if (id->tried++) @@ -1493,8 +1494,16 @@ userauth_pubkey(Authctxt *authctxt) */ if (id->key != NULL) { if (try_identity(id)) { - debug("Offering %s public key: %s", - key_type(id->key), id->filename); + if ((fp = sshkey_fingerprint(id->key, + options.fingerprint_hash, + SSH_FP_DEFAULT)) == NULL) { + error("%s: sshkey_fingerprint failed", + __func__); + return 0; + } + debug("Offering public key: %s %s %s", + sshkey_type(id->key), fp, id->filename); + free(fp); sent = send_pubkey_test(authctxt, id); } } else { |