RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-12-19 08:34:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

upstream: fix a bug I introduced in r1.406: when printing private key

Browse Source 
fingerprint of old-format key, key comments were not being displayed. Spotted
by loic AT venez.fr, ok dtucker

OpenBSD-Commit-ID: 2d98e4f9eb168eea733d17e141e1ead9fe26e533
This commit is contained in:
djm@openbsd.org 2020-04-20 04:43:57 +00:00 committed by Damien Miller
parent 32f2d0aad4
commit a98d5ba31e
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ssh-keygen.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-keygen.c,v 1.406 2020/04/17 07:16:07 djm Exp $ */
/* $OpenBSD: ssh-keygen.c,v 1.407 2020/04/20 04:43:57 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -910,21 +910,25 @@ fingerprint_private(const char *path)
{
struct stat st;
char *comment = NULL;
struct sshkey *key = NULL;
struct sshkey *privkey = NULL, *pubkey = NULL;
int r;
if (stat(identity_file, &st) == -1)
fatal("%s: %s", path, strerror(errno));
if ((r = sshkey_load_private(path, NULL, &key, &comment)) != 0) {
debug("load private \"%s\": %s", path, ssh_err(r));
if ((r = sshkey_load_public(path, &key, &comment)) != 0) {
debug("load public \"%s\": %s", path, ssh_err(r));
fatal("%s is not a key file.", path);
}
if ((r = sshkey_load_public(path, &pubkey, &comment)) != 0)
debug("load public \"%s\": %s", path, ssh_err(r));
if (pubkey == NULL || comment == NULL || *comment == '\0') {
free(comment);
if ((r = sshkey_load_private(path, NULL,
&privkey, &comment)) != 0)
debug("load private \"%s\": %s", path, ssh_err(r));
}
if (pubkey == NULL && privkey == NULL)
fatal("%s is not a key file.", path);
fingerprint_one_key(key, comment);
sshkey_free(key);
fingerprint_one_key(pubkey == NULL ? privkey : pubkey, comment);
sshkey_free(pubkey);
sshkey_free(privkey);
free(comment);
}