tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-23 13:55:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

upstream commit

Browse Source 
Regression: I broke logging of public key fingerprints in
 1.46. Pointed out by Pontus Lundkvist
This commit is contained in:
djm@openbsd.org 2015-02-17 00:14:05 +00:00 committed by Damien Miller
parent 773dda25e8
commit 13a39414d2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
auth2-pubkey.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: auth2-pubkey.c,v 1.46 2015/01/28 22:36:00 djm Exp $ */ /* $OpenBSD: auth2-pubkey.c,v 1.47 2015/02/17 00:14:05 djm Exp $ */
/* /*
* Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2000 Markus Friedl. All rights reserved.
* *
@ -234,14 +234,14 @@ pubkey_auth_info(Authctxt *authctxt, const Key *key, const char *fmt, ...)
key_type(key), key->cert->key_id, key_type(key), key->cert->key_id,
(unsigned long long)key->cert->serial, (unsigned long long)key->cert->serial,
key_type(key->cert->signature_key), key_type(key->cert->signature_key),
fp == NULL ? "(null)" : "", fp == NULL ? "(null)" : fp,
extra == NULL ? "" : ", ", extra == NULL ? "" : extra); extra == NULL ? "" : ", ", extra == NULL ? "" : extra);
free(fp); free(fp);
} else { } else {
fp = sshkey_fingerprint(key, options.fingerprint_hash, fp = sshkey_fingerprint(key, options.fingerprint_hash,
SSH_FP_DEFAULT); SSH_FP_DEFAULT);
auth_info(authctxt, "%s %s%s%s", key_type(key), auth_info(authctxt, "%s %s%s%s", key_type(key),
fp == NULL ? "(null)" : "", fp == NULL ? "(null)" : fp,
extra == NULL ? "" : ", ", extra == NULL ? "" : extra); extra == NULL ? "" : ", ", extra == NULL ? "" : extra);
free(fp); free(fp);
} }