- grunk@cvs.openbsd.org 2008/06/12 21:14:46
     [ssh-keygen.c]
     make ssh-keygen -lf show the key type just as ssh-add -l would do it
     ok djm@ markus@
diff --git a/ChangeLog b/ChangeLog
index 652266e..c1f93fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -129,6 +129,10 @@
      [clientloop.c]
      I was coalescing expected global request confirmation replies at
      the wrong end of the queue - fix; prompted by markus@
+   - grunk@cvs.openbsd.org 2008/06/12 21:14:46
+     [ssh-keygen.c]
+     make ssh-keygen -lf show the key type just as ssh-add -l would do it
+     ok djm@ markus@
   - (dtucker) [clientloop.c serverloop.c]  channel_register_filter now
     takes 2 more args.  with djm@
 
@@ -4293,4 +4297,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.4990 2008/06/12 22:56:01 dtucker Exp $
+$Id: ChangeLog,v 1.4991 2008/06/12 22:57:27 dtucker Exp $
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 02bd530..eca758c 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.169 2008/06/11 22:20:46 grunk Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.170 2008/06/12 21:14:46 grunk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -525,7 +525,8 @@
 	if (public != NULL) {
 		fp = key_fingerprint(public, fptype, rep);
 		ra = key_fingerprint(public, fptype, SSH_FP_RANDOMART);
-		printf("%u %s %s\n", key_size(public), fp, comment);
+		printf("%u %s %s (%s)\n", key_size(public), fp, comment,
+		    key_type(public));
 		if (log_level >= SYSLOG_LEVEL_VERBOSE)
 			printf("%s\n", ra);
 		key_free(public);
@@ -589,8 +590,8 @@
 			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");
+			printf("%u %s %s (%s)\n", key_size(public), fp,
+			    comment ? comment : "no comment", key_type(public));
 			if (log_level >= SYSLOG_LEVEL_VERBOSE)
 				printf("%s\n", ra);
 			xfree(ra);
@@ -619,7 +620,8 @@
 		rep =    print_bubblebabble ? SSH_FP_BUBBLEBABBLE : SSH_FP_HEX;
 		fp = key_fingerprint(public, fptype, rep);
 		ra = key_fingerprint(public, fptype, SSH_FP_RANDOMART);
-		printf("%u %s %s\n%s\n", key_size(public), fp, name, ra);
+		printf("%u %s %s (%s)\n%s\n", key_size(public), fp, name,
+		    key_type(public), ra);
 		xfree(ra);
 		xfree(fp);
 	} else {