- djm@cvs.openbsd.org 2009/08/27 17:33:49

     [ssh-keygen.c]
     force use of correct hash function for random-art signature display
     as it was inheriting the wrong one when bubblebabble signatures were
     activated; bz#1611 report and patch from fwojcik+openssh AT besh.com;
     ok markus@

diff --git a/ChangeLog b/ChangeLog
index 9ebb19e00797f05f5f037de3fed22cf2492c2244..f27d043ee6a624ffad935c68ce073c622e45d090 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -50,6 +50,12 @@
      [sftp-server.c]
      allow setting an explicit umask on the commandline to override whatever
      default the user has. bz#1229; ok dtucker@ deraadt@ markus@
+   - djm@cvs.openbsd.org 2009/08/27 17:33:49
+     [ssh-keygen.c]
+     force use of correct hash function for random-art signature display
+     as it was inheriting the wrong one when bubblebabble signatures were
+     activated; bz#1611 report and patch from fwojcik+openssh AT besh.com;
+     ok markus@
 
 20091002
  - (djm) [Makefile.in] Mention readconf.o in ssh-keysign's make deps.

diff --git a/ssh-keygen.c b/ssh-keygen.c
index da5db98455d0c2afd49b6ad73e3f6a7974abfc49..4f90ac5c1c7e2f6d9314645a501bae6ff5c224f2 100644 (file)
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.174 2009/06/22 05:39:28 dtucker Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.175 2009/08/27 17:33:49 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -524,7 +524,7 @@ 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, SSH_FP_RANDOMART);
+               ra = key_fingerprint(public, SSH_FP_MD5, SSH_FP_RANDOMART);
                printf("%u %s %s (%s)\n", key_size(public), fp, comment,
                    key_type(public));
                if (log_level >= SYSLOG_LEVEL_VERBOSE)
@@ -589,7 +589,7 @@ do_fingerprint(struct passwd *pw)
                        }
                        comment = *cp ? cp : comment;
                        fp = key_fingerprint(public, fptype, rep);
-                       ra = key_fingerprint(public, fptype, SSH_FP_RANDOMART);
+                       ra = key_fingerprint(public, SSH_FP_MD5, SSH_FP_RANDOMART);
                        printf("%u %s %s (%s)\n", key_size(public), fp,
                            comment ? comment : "no comment", key_type(public));
                        if (log_level >= SYSLOG_LEVEL_VERBOSE)
@@ -619,7 +619,7 @@ print_host(FILE *f, const char *name, Key *public, int hash)
                fptype = print_bubblebabble ? SSH_FP_SHA1 : SSH_FP_MD5;
                rep =    print_bubblebabble ? SSH_FP_BUBBLEBABBLE : SSH_FP_HEX;
                fp = key_fingerprint(public, fptype, rep);
-               ra = key_fingerprint(public, fptype, SSH_FP_RANDOMART);
+               ra = key_fingerprint(public, SSH_FP_MD5, SSH_FP_RANDOMART);
                printf("%u %s %s (%s)\n", key_size(public), fp, name,
                    key_type(public));
                if (log_level >= SYSLOG_LEVEL_VERBOSE)