- djm@cvs.openbsd.org 2001/03/13 22:42:54

[openssh.git] / ssh-keygen.c

diff --git a/ssh-keygen.c b/ssh-keygen.c
index 1f7e96766a7fa8b86a8feca7d4de36c6c3474f48..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.41 2001/01/21 19:05:57 markus 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];
@@ -325,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) {
@@ -350,9 +353,12 @@ do_fingerprint(struct passwd *pw)
                        debug("try_load_public_key KEY_UNSPEC failed");
        }
        if (success) {
-               printf("%d %s %s\n", key_size(public), key_fingerprint(public), comment);
+               fp = key_fingerprint(public, type, rep);
+               printf("%d %s %s\n", key_size(public),
+                   fp, comment);
                key_free(public);
                xfree(comment);
+               xfree(fp);
                exit(0);
        }
 
@@ -403,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);
@@ -512,12 +519,11 @@ do_change_passphrase(struct passwd *pw)
 void
 do_change_comment(struct passwd *pw)
 {
-       char new_comment[1024], *comment;
-       Key *private;
-       Key *public;
-       char *passphrase;
+       char new_comment[1024], *comment, *passphrase;
+       Key *private, *public;
        struct stat st;
        FILE *f;
+       int fd;
 
        if (!have_identity)
                ask_filename(pw, "Enter file in which the key is");
@@ -532,6 +538,7 @@ do_change_comment(struct passwd *pw)
        public = key_new(KEY_RSA1);
        if (!load_public_key(identity_file, public, NULL)) {
                printf("%s is not a valid key file.\n", identity_file);
+               printf("Comments are only supported in RSA1 keys\n");
                exit(1);
        }
 
@@ -584,11 +591,16 @@ do_change_comment(struct passwd *pw)
        key_free(private);
 
        strlcat(identity_file, ".pub", sizeof(identity_file));
-       f = fopen(identity_file, "w");
-       if (!f) {
+       fd = open(identity_file, O_WRONLY | O_CREAT | O_TRUNC, 0644);
+       if (fd == -1) {
                printf("Could not save your public key in %s\n", identity_file);
                exit(1);
        }
+       f = fdopen(fd, "w");
+       if (f == NULL) {
+               printf("fdopen %s failed", identity_file);
+               exit(1);
+       }
        if (!key_write(public, f))
                fprintf(stderr, "write key failed");
        key_free(public);
@@ -604,7 +616,8 @@ do_change_comment(struct passwd *pw)
 void
 usage(void)
 {
-       printf("Usage: %s [-lpqxXyc] [-t type] [-b bits] [-f file] [-C comment] [-N new-pass] [-P pass]\n", __progname);
+       printf("Usage: %s [-lpqxXyc] [-t type] [-b bits] [-f file] [-C comment] "
+           "[-N new-pass] [-P pass]\n", __progname);
        exit(1);
 }
 
@@ -615,12 +628,11 @@ int
 main(int ac, char **av)
 {
        char dotsshdir[16 * 1024], comment[1024], *passphrase1, *passphrase2;
+       Key *private, *public;
        struct passwd *pw;
-       int opt, type;
+       int opt, type, fd;
        struct stat st;
        FILE *f;
-       Key *private;
-       Key *public;
 
        extern int optind;
        extern char *optarg;
@@ -641,7 +653,7 @@ main(int ac, char **av)
                exit(1);
        }
 
-       while ((opt = getopt(ac, av, "dqpclRxXyb: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);
@@ -655,6 +667,10 @@ main(int ac, char **av)
                        print_fingerprint = 1;
                        break;
 
+               case 'B':
+                       print_bubblebabble = 1;
+                       break;
+
                case 'p':
                        change_passphrase = 1;
                        break;
@@ -722,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);
@@ -825,21 +841,28 @@ passphrase_again:
                printf("Your identification has been saved in %s.\n", identity_file);
 
        strlcat(identity_file, ".pub", sizeof(identity_file));
-       f = fopen(identity_file, "w");
-       if (!f) {
+       fd = open(identity_file, O_WRONLY | O_CREAT | O_TRUNC, 0644);
+       if (fd == -1) {
                printf("Could not save your public key in %s\n", identity_file);
                exit(1);
        }
+       f = fdopen(fd, "w");
+       if (f == NULL) {
+               printf("fdopen %s failed", identity_file);
+               exit(1);
+       }
        if (!key_write(public, f))
                fprintf(stderr, "write key failed");
        fprintf(f, " %s\n", comment);
        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);