RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2025-01-12 12:49:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2008/05/19 15:46:31

Browse Source 
[ssh-keygen.c]
     support -l (print fingerprint) in combination with -F (find host) to
     search for a host in ~/.ssh/known_hosts and display its fingerprint;
     ok markus@
This commit is contained in:
Darren Tucker 2008-06-08 12:54:29 +10:00
parent dd39264e4b
commit 0f7e910604
2 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -11,6 +11,11 @@
we would send the modes corresponding to a zeroed struct termios, we would send the modes corresponding to a zeroed struct termios,
whereas we should have been sending an empty list of modes. whereas we should have been sending an empty list of modes.
Based on patch from daniel.ritz AT alcatel.ch; ok dtucker@ markus@ Based on patch from daniel.ritz AT alcatel.ch; ok dtucker@ markus@
- djm@cvs.openbsd.org 2008/05/19 15:46:31
[ssh-keygen.c]
support -l (print fingerprint) in combination with -F (find host) to
search for a host in ~/.ssh/known_hosts and display its fingerprint;
ok markus@
20080604 20080604
- (djm) [openbsd-compat/bsd-arc4random.c] Fix math bug that caused bias - (djm) [openbsd-compat/bsd-arc4random.c] Fix math bug that caused bias
@ -4042,4 +4047,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@ passwords between UnixWare and OpenServer they will still work. OK dtucker@
$Id: ChangeLog,v 1.4940 2008/06/08 02:53:20 dtucker Exp $ $Id: ChangeLog,v 1.4941 2008/06/08 02:54:29 dtucker Exp $

30
ssh-keygen.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-keygen.c,v 1.165 2008/01/19 22:37:19 djm Exp $ */ /* $OpenBSD: ssh-keygen.c,v 1.166 2008/05/19 15:46:31 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
@ -600,12 +600,24 @@ do_fingerprint(struct passwd *pw)
static void static void
print_host(FILE *f, const char *name, Key *public, int hash) print_host(FILE *f, const char *name, Key *public, int hash)
{ {
if (hash && (name = host_hash(name, NULL, 0)) == NULL) if (print_fingerprint) {
fatal("hash_host failed"); enum fp_rep rep;
fprintf(f, "%s ", name); enum fp_type fptype;
if (!key_write(public, f)) char *fp;
fatal("key_write failed");
fprintf(f, "\n"); fptype = print_bubblebabble ? SSH_FP_SHA1 : SSH_FP_MD5;
rep = print_bubblebabble ? SSH_FP_BUBBLEBABBLE : SSH_FP_HEX;
fp = key_fingerprint(public, fptype, rep);
printf("%u %s %s\n", key_size(public), fp, name);
xfree(fp);
} else {
if (hash && (name = host_hash(name, NULL, 0)) == NULL)
fatal("hash_host failed");
fprintf(f, "%s ", name);
if (!key_write(public, f))
fatal("key_write failed");
fprintf(f, "\n");
}
} }
static void static void
@ -1231,6 +1243,10 @@ main(int argc, char **argv)
printf("Can only have one of -p and -c.\n"); printf("Can only have one of -p and -c.\n");
usage(); usage();
} }
if (print_fingerprint && (delete_host || hash_hosts)) {
printf("Cannot use -l with -D or -R.\n");
usage();
}
if (delete_host || hash_hosts || find_host) if (delete_host || hash_hosts || find_host)
do_known_hosts(pw, rr_hostname); do_known_hosts(pw, rr_hostname);
if (print_fingerprint || print_bubblebabble) if (print_fingerprint || print_bubblebabble)