- OpenBSD CVS Sync

[openssh.git] / ssh-keygen.c

diff --git a/ssh-keygen.c b/ssh-keygen.c
index af59bcf6e8ada06bf3f8ed9e6ed7e078fb5601c5..b9ea0178173268192d54a0e1bb8c92b34167c755 100644 (file)
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-keygen.c,v 1.47 2001/03/11 15:04:16 jakob Exp $");
+RCSID("$OpenBSD: ssh-keygen.c,v 1.50 2001/03/12 22:02:02 markus Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/pem.h>
@@ -46,6 +46,7 @@ int quiet = 0;
 
 /* 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];
@@ -64,7 +65,6 @@ char *identity_comment = NULL;
 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";
@@ -326,13 +326,15 @@ do_print_public(struct passwd *pw)
 void
 do_fingerprint(struct passwd *pw)
 {
-
        FILE *f;
        Key *public;
-       char *comment = NULL, *cp, *ep, line[16*1024];
-       int i, skip = 0, num = 1, invalid = 1, success = 0;
+       char *comment = NULL, *cp, *ep, line[16*1024], *fp;
+       int i, skip = 0, num = 1, invalid = 1, success = 0, rep, type;
        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) {
@@ -351,28 +353,12 @@ do_fingerprint(struct passwd *pw)
                        debug("try_load_public_key KEY_UNSPEC failed");
        }
        if (success) {
-               char *digest_md5, *digest_sha1, *digest_bubblebabble;
-
-               digest_md5 = key_fingerprint_ex(public, SSH_FP_MD5, SSH_FP_HEX);
-               digest_sha1 = key_fingerprint_ex(public, SSH_FP_SHA1, 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("sha1:         %s\n", digest_sha1);
-                       printf("bubblebabble: %s\n", digest_bubblebabble);
-               } else {
-                       printf("%d %s %s\n", key_size(public), digest_md5, comment);
-               }
-
+               fp = key_fingerprint(public, type, rep);
+               printf("%d %s %s\n", key_size(public),
+                   fp, comment);
                key_free(public);
                xfree(comment);
-               xfree(digest_md5);
-               xfree(digest_sha1);
-               xfree(digest_bubblebabble);
-
+               xfree(fp);
                exit(0);
        }
 
@@ -423,9 +409,10 @@ do_fingerprint(struct passwd *pw)
                                }
                        }
                        comment = *cp ? cp : comment;
-                       printf("%d %s %s\n", key_size(public),
-                           key_fingerprint(public),
+                       fp = key_fingerprint(public, type, rep);
+                       printf("%d %s %s\n", key_size(public), fp,
                            comment ? comment : "no comment");
+                       xfree(fp);
                        invalid = 0;
                }
                fclose(f);
@@ -666,7 +653,7 @@ main(int ac, char **av)
                exit(1);
        }
 
-       while ((opt = getopt(ac, av, "dqpclRxXyvb:f:t:P:N:C:")) != -1) {
+       while ((opt = getopt(ac, av, "dqpclBRxXyb:f:t:P:N:C:")) != -1) {
                switch (opt) {
                case 'b':
                        bits = atoi(optarg);
@@ -680,6 +667,10 @@ main(int ac, char **av)
                        print_fingerprint = 1;
                        break;
 
+               case 'B':
+                       print_bubblebabble = 1;
+                       break;
+
                case 'p':
                        change_passphrase = 1;
                        break;
@@ -726,10 +717,6 @@ main(int ac, char **av)
                        print_public = 1;
                        break;
 
-               case 'v':
-                       print_verbose = 1;
-                       break;
-
                case 'd':
                        key_type_name = "dsa";
                        break;
@@ -751,7 +738,7 @@ main(int ac, char **av)
                printf("Can only have one of -p and -c.\n");
                usage();
        }
-       if (print_fingerprint)
+       if (print_fingerprint || print_bubblebabble)
                do_fingerprint(pw);
        if (change_passphrase)
                do_change_passphrase(pw);
@@ -870,10 +857,12 @@ passphrase_again:
        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", key_fingerprint(public), comment);
+               printf("%s %s\n", fp, comment);
+               xfree(fp);
        }
 
        key_free(public);