- otto@cvs.openbsd.org 2008/06/25 11:13:43

     [key.c]
     add key length to visual fingerprint; zap magical constants;
     ok grunk@ djm@

2 files changed, 8 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 892eb90de..5cde1b698 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,10 @@
      [sftp.c]
      use optopt to get invalid flag, instead of return value of getopt,
      which is always '?';  ok djm@
+   - otto@cvs.openbsd.org 2008/06/25 11:13:43
+     [key.c]
+     add key length to visual fingerprint; zap magical constants;
+     ok grunk@ djm@
 
 20080628
  - (djm) [RFC.nroff contrib/cygwin/Makefile contrib/suse/openssh.spec]
@@ -4424,4 +4428,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.5025 2008/06/29 12:45:13 djm Exp $
+$Id: ChangeLog,v 1.5026 2008/06/29 12:45:37 djm Exp $
diff --git a/key.c b/key.c
index f981710a7..515103cb4 100644
--- a/key.c
+++ b/key.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: key.c,v 1.76 2008/06/12 22:03:36 grunk Exp $ */
+/* $OpenBSD: key.c,v 1.77 2008/06/25 11:13:43 otto Exp $ */
 /*
  * read_bignum():
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -378,11 +378,11 @@ key_fingerprint_randomart(u_char *dgst_raw, u_int dgst_raw_len, const Key *k)
         field[x][y] = len;
 
         /* fill in retval */
-        snprintf(retval, 10, "+--[%4s]", key_type(k));
+        snprintf(retval, FLDSIZE_X, "+--[%4s %4u]", key_type(k), key_size(k));
         p = strchr(retval, '\0');
 
         /* output upper border */
-        for (i = 0; i < FLDSIZE_X - 8; i++)
+        for (i = p - retval - 1; i < FLDSIZE_X; i++)
                 *p++ = '-';
         *p++ = '+';
         *p++ = '\n';