summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ssh-keygen.c6
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 70d5baa58..a2019d231 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,10 @@
24 walked in either direction. 24 walked in either direction.
25 discussions with several people, 25 discussions with several people,
26 help, corrections and ok markus@ djm@ 26 help, corrections and ok markus@ djm@
27 - grunk@cvs.openbsd.org 2008/06/11 21:38:25
28 [ssh-keygen.c]
29 ssh-keygen -lv -f /etc/ssh/ssh_host_rsa_key.pub
30 would not display you the random art as intended, spotted by canacar@
27 31
2820080611 3220080611
29 - (djm) [channels.c configure.ac] 33 - (djm) [channels.c configure.ac]
@@ -4186,4 +4190,4 @@
4186 OpenServer 6 and add osr5bigcrypt support so when someone migrates 4190 OpenServer 6 and add osr5bigcrypt support so when someone migrates
4187 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 4191 passwords between UnixWare and OpenServer they will still work. OK dtucker@
4188 4192
4189$Id: ChangeLog,v 1.4969 2008/06/12 18:40:35 dtucker Exp $ 4193$Id: ChangeLog,v 1.4970 2008/06/12 18:42:14 dtucker Exp $
diff --git a/ssh-keygen.c b/ssh-keygen.c
index c22e814da..5d90e7a24 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-keygen.c,v 1.167 2008/06/11 21:01:35 grunk Exp $ */ 1/* $OpenBSD: ssh-keygen.c,v 1.168 2008/06/11 21:38:25 grunk 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
@@ -522,9 +522,9 @@ do_fingerprint(struct passwd *pw)
522 public = key_load_public(identity_file, &comment); 522 public = key_load_public(identity_file, &comment);
523 if (public != NULL) { 523 if (public != NULL) {
524 fp = key_fingerprint(public, fptype, rep); 524 fp = key_fingerprint(public, fptype, rep);
525 ra = key_fingerprint(public, fptype, rep); 525 ra = key_fingerprint(public, fptype, SSH_FP_RANDOMART);
526 printf("%u %s %s\n", key_size(public), fp, comment); 526 printf("%u %s %s\n", key_size(public), fp, comment);
527 verbose("%s\n", ra); 527 verbose("%s", ra);
528 key_free(public); 528 key_free(public);
529 xfree(comment); 529 xfree(comment);
530 xfree(ra); 530 xfree(ra);