- grunk@cvs.openbsd.org 2008/06/11 21:01:35

     [ssh_config.5 key.h readconf.c readconf.h ssh-keygen.1 ssh-keygen.c key.c
      sshconnect.c]
     Introduce SSH Fingerprint ASCII Visualization, a technique inspired by the
     graphical hash visualization schemes known as "random art", and by
     Dan Kaminsky's musings on the subject during a BlackOp talk at the
     23C3 in Berlin.
     Scientific publication (original paper):
     "Hash Visualization: a New Technique to improve Real-World Security",
     Perrig A. and Song D., 1999, International Workshop on Cryptographic
     Techniques and E-Commerce (CrypTEC '99)
     http://sparrow.ece.cmu.edu/~adrian/projects/validation/validation.pdf
     The algorithm used here is a worm crawling over a discrete plane,
     leaving a trace (augmenting the field) everywhere it goes.
     Movement is taken from dgst_raw 2bit-wise.  Bumping into walls
     makes the respective movement vector be ignored for this turn,
     thus switching to the other color of the chessboard.
     Graphs are not unambiguous for now, because circles in graphs can be
     walked in either direction.
     discussions with several people,
     help, corrections and ok markus@ djm@

1 files changed, 17 insertions, 4 deletions

diff --git a/ssh-keygen.c b/ssh-keygen.c
index a03c6575d..c22e814da 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.166 2008/05/19 15:46:31 djm Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.167 2008/06/11 21:01:35 grunk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -504,7 +504,7 @@ do_fingerprint(struct passwd *pw)
 {
         FILE *f;
         Key *public;
-        char *comment = NULL, *cp, *ep, line[16*1024], *fp;
+        char *comment = NULL, *cp, *ep, line[16*1024], *fp, *ra;
         int i, skip = 0, num = 0, invalid = 1;
         enum fp_rep rep;
         enum fp_type fptype;
@@ -522,9 +522,12 @@ 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);
                 printf("%u %s %s\n", key_size(public), fp, comment);
+                verbose("%s\n", ra);
                 key_free(public);
                 xfree(comment);
+                xfree(ra);
                 xfree(fp);
                 exit(0);
         }
@@ -582,8 +585,11 @@ do_fingerprint(struct passwd *pw)
                         }
                         comment = *cp ? cp : comment;
                         fp = key_fingerprint(public, fptype, rep);
+                        ra = key_fingerprint(public, fptype, SSH_FP_RANDOMART);
                         printf("%u %s %s\n", key_size(public), fp,
                             comment ? comment : "no comment");
+                        verbose("%s\n", ra);
+                        xfree(ra);
                         xfree(fp);
                         key_free(public);
                         invalid = 0;
@@ -603,12 +609,14 @@ print_host(FILE *f, const char *name, Key *public, int hash)
         if (print_fingerprint) {
                 enum fp_rep rep;
                 enum fp_type fptype;
-                char *fp;
+                char *fp, *ra;
 
                 fptype = print_bubblebabble ? SSH_FP_SHA1 : SSH_FP_MD5;
                 rep =    print_bubblebabble ? SSH_FP_BUBBLEBABBLE : SSH_FP_HEX;
                 fp = key_fingerprint(public, fptype, rep);
-                printf("%u %s %s\n", key_size(public), fp, name);
+                ra = key_fingerprint(public, fptype, SSH_FP_RANDOMART);
+                printf("%u %s %s\n%s\n", key_size(public), fp, name, ra);
+                xfree(ra);
                 xfree(fp);
         } else {
                 if (hash && (name = host_hash(name, NULL, 0)) == NULL)
@@ -1451,10 +1459,15 @@ passphrase_again:
 
         if (!quiet) {
                 char *fp = key_fingerprint(public, SSH_FP_MD5, SSH_FP_HEX);
+                char *ra = key_fingerprint(public, SSH_FP_MD5,
+                    SSH_FP_RANDOMART);
                 printf("Your public key has been saved in %s.\n",
                     identity_file);
                 printf("The key fingerprint is:\n");
                 printf("%s %s\n", fp, comment);
+                printf("The key's randomart image is:\n");
+                printf("%s\n", ra);
+                xfree(ra);
                 xfree(fp);
         }