=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/ssh-keygen.c,v retrieving revision 1.37 retrieving revision 1.50 diff -u -r1.37 -r1.50 --- src/usr.bin/ssh/ssh-keygen.c 2000/12/22 16:49:40 1.37 +++ src/usr.bin/ssh/ssh-keygen.c 2001/03/12 22:02:02 1.50 @@ -12,22 +12,20 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh-keygen.c,v 1.37 2000/12/22 16:49:40 markus Exp $"); +RCSID("$OpenBSD: ssh-keygen.c,v 1.50 2001/03/12 22:02:02 markus Exp $"); #include #include -#include -#include -#include "ssh.h" #include "xmalloc.h" #include "key.h" -#include "rsa.h" #include "authfile.h" #include "uuencode.h" - #include "buffer.h" #include "bufaux.h" +#include "pathnames.h" +#include "log.h" +#include "readpass.h" /* Number of bits in the RSA/DSA key. This value can be changed on the command line. */ int bits = 1024; @@ -48,6 +46,7 @@ /* 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]; @@ -83,13 +82,13 @@ switch (key_type_from_name(key_type_name)) { case KEY_RSA1: - name = SSH_CLIENT_IDENTITY; + name = _PATH_SSH_CLIENT_IDENTITY; break; case KEY_DSA: - name = SSH_CLIENT_ID_DSA; + name = _PATH_SSH_CLIENT_ID_DSA; break; case KEY_RSA: - name = SSH_CLIENT_ID_RSA; + name = _PATH_SSH_CLIENT_ID_RSA; break; default: fprintf(stderr, "bad key type"); @@ -126,7 +125,7 @@ #define SSH_COM_PUBLIC_BEGIN "---- BEGIN SSH2 PUBLIC KEY ----" #define SSH_COM_PUBLIC_END "---- END SSH2 PUBLIC KEY ----" #define SSH_COM_PRIVATE_BEGIN "---- BEGIN SSH2 ENCRYPTED PRIVATE KEY ----" -#define SSH_COM_PRIVATE_KEY_MAGIC 0x3f6ff9eb +#define SSH_COM_PRIVATE_KEY_MAGIC 0x3f6ff9eb void do_convert_to_ssh2(struct passwd *pw) @@ -323,14 +322,15 @@ 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; - u_int ignore; + 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) { @@ -346,18 +346,18 @@ if (try_load_public_key(identity_file, public, &comment)) success = 1; else - error("try_load_public_key KEY_UNSPEC failed"); + 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); } - /* XXX RSA1 only */ - - public = key_new(KEY_RSA1); f = fopen(identity_file, "r"); if (f != NULL) { while (fgets(line, sizeof(line), f)) { @@ -394,13 +394,22 @@ *cp++ = '\0'; } ep = cp; - if (auth_rsa_read_key(&cp, &ignore, public->rsa->e, public->rsa->n)) { - invalid = 0; - comment = *cp ? cp : comment; - printf("%d %s %s\n", key_size(public), - key_fingerprint(public), - comment ? comment : "no comment"); + public = key_new(KEY_RSA1); + if (key_read(public, &cp) != 1) { + cp = ep; + key_free(public); + public = key_new(KEY_UNSPEC); + if (key_read(public, &cp) != 1) { + key_free(public); + continue; + } } + comment = *cp ? cp : comment; + 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); } @@ -506,12 +515,11 @@ 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"); @@ -526,6 +534,7 @@ 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); } @@ -578,11 +587,16 @@ 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); @@ -598,7 +612,8 @@ 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); } @@ -609,12 +624,11 @@ 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; @@ -632,7 +646,7 @@ exit(1); } - while ((opt = getopt(ac, av, "dqpclRxXyb:f:t:P:N:C:")) != EOF) { + while ((opt = getopt(ac, av, "dqpclBRxXyb:f:t:P:N:C:")) != -1) { switch (opt) { case 'b': bits = atoi(optarg); @@ -646,6 +660,10 @@ print_fingerprint = 1; break; + case 'B': + print_bubblebabble = 1; + break; + case 'p': change_passphrase = 1; break; @@ -713,7 +731,7 @@ 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); @@ -746,7 +764,7 @@ ask_filename(pw, "Enter file in which to save the key"); /* Create ~/.ssh directory if it doesn\'t already exist. */ - snprintf(dotsshdir, sizeof dotsshdir, "%s/%s", pw->pw_dir, SSH_USER_DIR); + snprintf(dotsshdir, sizeof dotsshdir, "%s/%s", pw->pw_dir, _PATH_SSH_USER_DIR); if (strstr(identity_file, dotsshdir) != NULL && stat(dotsshdir, &st) < 0) { if (mkdir(dotsshdir, 0700) < 0) @@ -816,21 +834,28 @@ 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);