- grunk@cvs.openbsd.org 2008/06/11 21:38:25

     [ssh-keygen.c]
     ssh-keygen -lv -f /etc/ssh/ssh_host_rsa_key.pub
     would not display you the random art as intended, spotted by canacar@

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 @@
      walked in either direction.
      discussions with several people,
      help, corrections and ok markus@ djm@
+   - grunk@cvs.openbsd.org 2008/06/11 21:38:25
+     [ssh-keygen.c]
+     ssh-keygen -lv -f /etc/ssh/ssh_host_rsa_key.pub
+     would not display you the random art as intended, spotted by canacar@
 
 20080611
  - (djm) [channels.c configure.ac]
@@ -4186,4 +4190,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.4969 2008/06/12 18:40:35 dtucker Exp $
+$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 @@
-/* $OpenBSD: ssh-keygen.c,v 1.167 2008/06/11 21:01:35 grunk Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.168 2008/06/11 21:38:25 grunk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -522,9 +522,9 @@ do_fingerprint(struct passwd *pw)
         public = key_load_public(identity_file, &comment);
         if (public != NULL) {
                 fp = key_fingerprint(public, fptype, rep);
-                ra = key_fingerprint(public, fptype, rep);
+                ra = key_fingerprint(public, fptype, SSH_FP_RANDOMART);
                 printf("%u %s %s\n", key_size(public), fp, comment);
-                verbose("%s\n", ra);
+                verbose("%s", ra);
                 key_free(public);
                 xfree(comment);
                 xfree(ra);