tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream commit 

include key fingerprint in "Offering public key" debug
message

Upstream-ID: 964749f820c2ed4cf6a866268b1a05e907315c52
This commit is contained in:
djm@openbsd.org 2017-04-28 03:24:53 +00:00 committed by Damien Miller
parent 066437187e
commit 6830be90e7
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sshconnect2.c
View File

@ -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 {