===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/ssh-keygen.c,v
retrieving revision 1.32.2.3
retrieving revision 1.48
diff -u -r1.32.2.3 -r1.48
--- src/usr.bin/ssh/ssh-keygen.c	2001/03/21 19:46:30	1.32.2.3
+++ src/usr.bin/ssh/ssh-keygen.c	2001/03/11 16:39:03	1.48
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-keygen.c,v 1.32.2.3 2001/03/21 19:46:30 jason Exp $");
+RCSID("$OpenBSD: ssh-keygen.c,v 1.48 2001/03/11 16:39:03 deraadt Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/pem.h>
@@ -46,7 +46,6 @@
 
 /* Flag indicating that we just want to see the key fingerprint */
 int print_fingerprint = 0;
-int print_bubblebabble = 0;
 
 /* The identity file name, given on the command line or entered by the user. */
 char identity_file[1024];
@@ -65,6 +64,7 @@
 int convert_to_ssh2 = 0;
 int convert_from_ssh2 = 0;
 int print_public = 0;
+int print_verbose = 0;
 
 /* default to RSA for SSH-1 */
 char *key_type_name = "rsa1";
@@ -322,15 +322,13 @@
 void
 do_fingerprint(struct passwd *pw)
 {
+
 	FILE *f;
 	Key *public;
-	char *comment = NULL, *cp, *ep, line[16*1024], *fp;
-	int i, skip = 0, num = 1, invalid = 1, success = 0, rep, type;
+	char *comment = NULL, *cp, *ep, line[16*1024];
+	int i, skip = 0, num = 1, invalid = 1, success = 0;
 	struct stat st;
 
-	type = print_bubblebabble ? SSH_FP_SHA1 : SSH_FP_MD5;
-	rep =  print_bubblebabble ? SSH_FP_BUBBLEBABBLE : SSH_FP_HEX;
-
 	if (!have_identity)
 		ask_filename(pw, "Enter file in which the key is");
 	if (stat(identity_file, &st) < 0) {
@@ -349,12 +347,26 @@
 			debug("try_load_public_key KEY_UNSPEC failed");
 	}
 	if (success) {
-		fp = key_fingerprint(public, type, rep);
-		printf("%d %s %s\n", key_size(public),
-		    fp, comment);
+		char *digest_md5, *digest_bubblebabble;
+
+		digest_md5 = key_fingerprint_ex(public, SSH_FP_MD5, SSH_FP_HEX);
+		digest_bubblebabble = key_fingerprint_ex(public, SSH_FP_SHA1,
+		    SSH_FP_BUBBLEBABBLE);
+
+		if (print_verbose) {
+			printf("comment:      %s\n", comment);
+			printf("size:         %d\n", key_size(public));
+			printf("md5:          %s\n", digest_md5);
+			printf("bubblebabble: %s\n", digest_bubblebabble);
+		} else {
+			printf("%d %s %s\n", key_size(public), digest_md5, comment);
+		}
+
 		key_free(public);
 		xfree(comment);
-		xfree(fp);
+		xfree(digest_md5);
+		xfree(digest_bubblebabble);
+
 		exit(0);
 	}
 
@@ -405,10 +417,9 @@
 				}
 			}
 			comment = *cp ? cp : comment;
-			fp = key_fingerprint(public, type, rep);
-			printf("%d %s %s\n", key_size(public), fp,
+			printf("%d %s %s\n", key_size(public),
+			    key_fingerprint(public),
 			    comment ? comment : "no comment");
-			xfree(fp);
 			invalid = 0;
 		}
 		fclose(f);
@@ -646,7 +657,7 @@
 		exit(1);
 	}
 
-	while ((opt = getopt(ac, av, "dqpclBRxXyb:f:t:P:N:C:")) != -1) {
+	while ((opt = getopt(ac, av, "dqpclRxXyvb:f:t:P:N:C:")) != -1) {
 		switch (opt) {
 		case 'b':
 			bits = atoi(optarg);
@@ -660,10 +671,6 @@
 			print_fingerprint = 1;
 			break;
 
-		case 'B':
-			print_bubblebabble = 1;
-			break;
-
 		case 'p':
 			change_passphrase = 1;
 			break;
@@ -710,6 +717,10 @@
 			print_public = 1;
 			break;
 
+		case 'v':
+			print_verbose = 1;
+			break;
+
 		case 'd':
 			key_type_name = "dsa";
 			break;
@@ -731,7 +742,7 @@
 		printf("Can only have one of -p and -c.\n");
 		usage();
 	}
-	if (print_fingerprint || print_bubblebabble)
+	if (print_fingerprint)
 		do_fingerprint(pw);
 	if (change_passphrase)
 		do_change_passphrase(pw);
@@ -850,12 +861,10 @@
 	fclose(f);
 
 	if (!quiet) {
-		char *fp = key_fingerprint(public, SSH_FP_MD5, SSH_FP_HEX);
 		printf("Your public key has been saved in %s.\n",
 		    identity_file);
 		printf("The key fingerprint is:\n");
-		printf("%s %s\n", fp, comment);
-		xfree(fp);
+		printf("%s %s\n", key_fingerprint(public), comment);
 	}
 
 	key_free(public);