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

upstream commit

Browse Source 
fix "ssh-keygen -l" of private key, broken in support for
 multiple plain keys on stdin

Upstream-ID: 6b3132d2c62d03d0bad6f2bcd7e2d8b7dab5cd9d
This commit is contained in:
djm@openbsd.org 2015-11-18 08:37:28 +00:00 committed by Damien Miller
parent 259adb6179
commit bcb7bc77bb
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ssh-keygen.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-keygen.c,v 1.279 2015/11/16 22:53:07 djm Exp $ */ /* $OpenBSD: ssh-keygen.c,v 1.280 2015/11/18 08:37:28 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -861,8 +861,15 @@ fingerprint_private(const char *path)
if (stat(identity_file, &st) < 0) if (stat(identity_file, &st) < 0)
fatal("%s: %s", path, strerror(errno)); fatal("%s: %s", path, strerror(errno));
if ((r = sshkey_load_public(path, &public, &comment)) != 0) if ((r = sshkey_load_public(path, &public, &comment)) != 0) {
fatal("Error loading public key \"%s\": %s", path, ssh_err(r)); debug("load public \"%s\": %s", path, ssh_err(r));
if ((r = sshkey_load_private(path, NULL,
&public, &comment)) != 0) {
debug("load private \"%s\": %s", path, ssh_err(r));
fatal("%s is not a key file.", path);
}
}
fingerprint_one_key(public, comment); fingerprint_one_key(public, comment);
sshkey_free(public); sshkey_free(public);
free(comment); free(comment);
@ -907,7 +914,7 @@ do_fingerprint(struct passwd *pw)
* not reading from stdin (XXX support private keys on stdin). * not reading from stdin (XXX support private keys on stdin).
*/ */
if (lnum == 1 && strcmp(identity_file, "-") != 0 && if (lnum == 1 && strcmp(identity_file, "-") != 0 &&
strstr(cp, "SSH PRIVATE KEY") != NULL) { strstr(cp, "PRIVATE KEY") != NULL) {
fclose(f); fclose(f);
fingerprint_private(path); fingerprint_private(path);
exit(0); exit(0);