From: dtucker <dtucker>
Date: Thu, 12 Jun 2008 18:55:10 +0000 (+0000)
Subject:    - grunk@cvs.openbsd.org 2008/06/12 06:32:59
X-Git-Tag: V_5_1_P1~113
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/2bb50d2302c5f752784af71d7c08b6b7985c5c24

   - grunk@cvs.openbsd.org 2008/06/12 06:32:59
     [key.c]
     We already mark the start of the worm, now also mark the end of the worm
     in our random art drawings.
     ok djm@
---

diff --git a/ChangeLog b/ChangeLog
index e154ad4b..1d1ab2de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -97,6 +97,17 @@
    - djm@cvs.openbsd.org 2008/06/12 05:32:30
      [mux.c]
      some more TODO for me
+   - grunk@cvs.openbsd.org 2008/06/12 05:42:46
+     [key.c]
+     supply the key type (rsa1, rsa, dsa) as a caption in the frame of the
+     random art.  while there, stress the fact that the field base should at
+     least be 8 characters for the pictures to make sense.
+     comment and ok djm@
+   - grunk@cvs.openbsd.org 2008/06/12 06:32:59
+     [key.c]
+     We already mark the start of the worm, now also mark the end of the worm
+     in our random art drawings.
+     ok djm@
 
 20080611
  - (djm) [channels.c configure.ac]
diff --git a/key.c b/key.c
index c1dadb52..7a062ea8 100644
--- a/key.c
+++ b/key.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: key.c,v 1.74 2008/06/12 05:42:46 grunk Exp $ */
+/* $OpenBSD: key.c,v 1.75 2008/06/12 06:32:59 grunk Exp $ */
 /*
  * read_bignum():
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -336,7 +336,7 @@ key_fingerprint_randomart(u_char *dgst_raw, u_int dgst_raw_len, const Key *k)
 	 * Chars to be used after each other every time the worm
 	 * intersects with itself.  Matter of taste.
 	 */
-	char	*augmentation_string = " .o+=*BOX@%&#/^S";
+	char	*augmentation_string = " .o+=*BOX@%&#/^SE";
 	char	*retval, *p;
 	u_char	 field[FLDSIZE_X][FLDSIZE_Y];
 	u_int	 i, b;
@@ -371,7 +371,10 @@ key_fingerprint_randomart(u_char *dgst_raw, u_int dgst_raw_len, const Key *k)
 			input = input >> 2;
 		}
 	}
-	field[FLDSIZE_X / 2][FLDSIZE_Y / 2] = len;
+
+	/* mark starting point and end point*/
+	field[FLDSIZE_X / 2][FLDSIZE_Y / 2] = len - 1;
+	field[x][y] = len;
 
 	/* fill in retval */
 	snprintf(retval, 10, "+--[%4s]", key_type(k));