diff options
-rw-r--r-- | ChangeLog | 11 | ||||
-rw-r--r-- | ssh-keygen.c | 8 |
2 files changed, 15 insertions, 4 deletions
@@ -1,3 +1,12 @@ | |||
1 | 20080714 | ||
2 | - (djm) OpenBSD CVS Sync | ||
3 | - sthen@cvs.openbsd.org 2008/07/13 21:22:52 | ||
4 | [ssh-keygen.c] | ||
5 | Change "ssh-keygen -F [host] -l" to not display random art unless | ||
6 | -v is also specified, making it consistent with the manual and other | ||
7 | uses of -l. | ||
8 | ok grunk@ | ||
9 | |||
1 | 20080712 | 10 | 20080712 |
2 | - (djm) OpenBSD CVS Sync | 11 | - (djm) OpenBSD CVS Sync |
3 | - djm@cvs.openbsd.org 2008/07/12 04:52:50 | 12 | - djm@cvs.openbsd.org 2008/07/12 04:52:50 |
@@ -4633,4 +4642,4 @@ | |||
4633 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 4642 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
4634 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 4643 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
4635 | 4644 | ||
4636 | $Id: ChangeLog,v 1.5075 2008/07/12 07:12:49 djm Exp $ | 4645 | $Id: ChangeLog,v 1.5076 2008/07/14 01:28:29 djm Exp $ |
diff --git a/ssh-keygen.c b/ssh-keygen.c index eca758c6e..f7e284062 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-keygen.c,v 1.170 2008/06/12 21:14:46 grunk Exp $ */ | 1 | /* $OpenBSD: ssh-keygen.c,v 1.171 2008/07/13 21:22:52 sthen Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -620,8 +620,10 @@ print_host(FILE *f, const char *name, Key *public, int hash) | |||
620 | rep = print_bubblebabble ? SSH_FP_BUBBLEBABBLE : SSH_FP_HEX; | 620 | rep = print_bubblebabble ? SSH_FP_BUBBLEBABBLE : SSH_FP_HEX; |
621 | fp = key_fingerprint(public, fptype, rep); | 621 | fp = key_fingerprint(public, fptype, rep); |
622 | ra = key_fingerprint(public, fptype, SSH_FP_RANDOMART); | 622 | ra = key_fingerprint(public, fptype, SSH_FP_RANDOMART); |
623 | printf("%u %s %s (%s)\n%s\n", key_size(public), fp, name, | 623 | printf("%u %s %s (%s)\n", key_size(public), fp, name, |
624 | key_type(public), ra); | 624 | key_type(public)); |
625 | if (log_level >= SYSLOG_LEVEL_VERBOSE) | ||
626 | printf("%s\n", ra); | ||
625 | xfree(ra); | 627 | xfree(ra); |
626 | xfree(fp); | 628 | xfree(fp); |
627 | } else { | 629 | } else { |