=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/ssh-keygen.c,v retrieving revision 1.32.2.4 retrieving revision 1.37 diff -u -r1.32.2.4 -r1.37 --- src/usr.bin/ssh/ssh-keygen.c 2001/05/07 21:09:36 1.32.2.4 +++ src/usr.bin/ssh/ssh-keygen.c 2000/12/22 16:49:40 1.37 @@ -12,21 +12,22 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh-keygen.c,v 1.32.2.4 2001/05/07 21:09:36 jason Exp $"); +RCSID("$OpenBSD: ssh-keygen.c,v 1.37 2000/12/22 16:49:40 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; @@ -47,7 +48,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]; @@ -83,13 +83,13 @@ switch (key_type_from_name(key_type_name)) { case KEY_RSA1: - name = _PATH_SSH_CLIENT_IDENTITY; + name = SSH_CLIENT_IDENTITY; break; case KEY_DSA: - name = _PATH_SSH_CLIENT_ID_DSA; + name = SSH_CLIENT_ID_DSA; break; case KEY_RSA: - name = _PATH_SSH_CLIENT_ID_RSA; + name = SSH_CLIENT_ID_RSA; break; default: fprintf(stderr, "bad key type"); @@ -108,26 +108,25 @@ have_identity = 1; } -Key * -try_load_pem_key(char *filename) +int +try_load_key(char *filename, Key *k) { - char *pass; - Key *prv; - - prv = key_load_private(filename, "", NULL); - if (prv == NULL) { - pass = read_passphrase("Enter passphrase: ", 1); - prv = key_load_private(filename, pass, NULL); + int success = 1; + if (!load_private_key(filename, "", k, NULL)) { + char *pass = read_passphrase("Enter passphrase: ", 1); + if (!load_private_key(filename, pass, k, NULL)) { + success = 0; + } memset(pass, 0, strlen(pass)); xfree(pass); } - return prv; + return success; } #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) @@ -143,11 +142,10 @@ perror(identity_file); exit(1); } - if ((k = key_load_public(identity_file, NULL)) == NULL) { - if ((k = try_load_pem_key(identity_file)) == NULL) { - fprintf(stderr, "load failed\n"); - exit(1); - } + k = key_new(KEY_UNSPEC); + if (!try_load_key(identity_file, k)) { + fprintf(stderr, "load failed\n"); + exit(1); } key_to_blob(k, &blob, &len); fprintf(stdout, "%s\n", SSH_COM_PUBLIC_BEGIN); @@ -167,10 +165,8 @@ { int bits = buffer_get_int(b); int bytes = (bits + 7) / 8; - if (buffer_len(b) < bytes) - fatal("buffer_get_bignum_bits: input buffer too small: " - "need %d have %d", bytes, buffer_len(b)); + fatal("buffer_get_bignum_bits: input buffer too small"); BN_bin2bn((u_char *)buffer_ptr(b), bytes, value); buffer_consume(b, bytes); } @@ -179,8 +175,9 @@ do_convert_private_ssh2_from_blob(char *blob, int blen) { Buffer b; + DSA *dsa; Key *key = NULL; - int ignore, magic, rlen, ktype; + int ignore, magic, rlen; char *type, *cipher; buffer_init(&b); @@ -198,64 +195,33 @@ ignore = buffer_get_int(&b); ignore = buffer_get_int(&b); ignore = buffer_get_int(&b); + xfree(type); if (strcmp(cipher, "none") != 0) { error("unsupported cipher %s", cipher); xfree(cipher); buffer_free(&b); - xfree(type); return NULL; } xfree(cipher); - if (strstr(type, "dsa")) { - ktype = KEY_DSA; - } else if (strstr(type, "rsa")) { - ktype = KEY_RSA; - } else { - xfree(type); + key = key_new(KEY_DSA); + dsa = key->dsa; + dsa->priv_key = BN_new(); + if (dsa->priv_key == NULL) { + error("alloc priv_key failed"); + key_free(key); return NULL; } - key = key_new_private(ktype); - xfree(type); - - switch (key->type) { - case KEY_DSA: - buffer_get_bignum_bits(&b, key->dsa->p); - buffer_get_bignum_bits(&b, key->dsa->g); - buffer_get_bignum_bits(&b, key->dsa->q); - buffer_get_bignum_bits(&b, key->dsa->pub_key); - buffer_get_bignum_bits(&b, key->dsa->priv_key); - break; - case KEY_RSA: - if (!BN_set_word(key->rsa->e, (u_long) buffer_get_char(&b))) { - buffer_free(&b); - key_free(key); - return NULL; - } - buffer_get_bignum_bits(&b, key->rsa->d); - buffer_get_bignum_bits(&b, key->rsa->n); - buffer_get_bignum_bits(&b, key->rsa->iqmp); - buffer_get_bignum_bits(&b, key->rsa->q); - buffer_get_bignum_bits(&b, key->rsa->p); - generate_additional_parameters(key->rsa); - break; - } + buffer_get_bignum_bits(&b, dsa->p); + buffer_get_bignum_bits(&b, dsa->g); + buffer_get_bignum_bits(&b, dsa->q); + buffer_get_bignum_bits(&b, dsa->pub_key); + buffer_get_bignum_bits(&b, dsa->priv_key); rlen = buffer_len(&b); if(rlen != 0) - error("do_convert_private_ssh2_from_blob: " - "remaining bytes in key blob %d", rlen); + error("do_convert_private_ssh2_from_blob: remaining bytes in key blob %d", rlen); buffer_free(&b); -#ifdef DEBUG_PK - { - u_int slen; - u_char *sig, data[10] = "abcde12345"; - - key_sign(key, &sig, &slen, data, sizeof data); - key_verify(key, sig, slen, data, sizeof data); - xfree(sig); - } -#endif return key; } @@ -294,12 +260,12 @@ strstr(line, ": ") != NULL) { if (strstr(line, SSH_COM_PRIVATE_BEGIN) != NULL) private = 1; - /* fprintf(stderr, "ignore: %s", line); */ + fprintf(stderr, "ignore: %s", line); continue; } if (escaped) { escaped--; - /* fprintf(stderr, "escaped: %s", line); */ + fprintf(stderr, "escaped: %s", line); continue; } *p = '\0'; @@ -318,9 +284,7 @@ exit(1); } ok = private ? - (k->type == KEY_DSA ? - PEM_write_DSAPrivateKey(stdout, k->dsa, NULL, NULL, 0, NULL, NULL) : - PEM_write_RSAPrivateKey(stdout, k->rsa, NULL, NULL, 0, NULL, NULL)) : + PEM_write_DSAPrivateKey(stdout, k->dsa, NULL, NULL, 0, NULL, NULL) : key_write(k, stdout); if (!ok) { fprintf(stderr, "key write failed"); @@ -335,7 +299,7 @@ void do_print_public(struct passwd *pw) { - Key *prv; + Key *k; struct stat st; if (!have_identity) @@ -344,14 +308,14 @@ perror(identity_file); exit(1); } - prv = try_load_pem_key(identity_file); - if (prv == NULL) { + k = key_new(KEY_UNSPEC); + if (!try_load_key(identity_file, k)) { fprintf(stderr, "load failed\n"); exit(1); } - if (!key_write(prv, stdout)) + if (!key_write(k, stdout)) fprintf(stderr, "key_write failed"); - key_free(prv); + key_free(k); fprintf(stdout, "\n"); exit(0); } @@ -359,33 +323,41 @@ 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, rep, fptype; + char *comment = NULL, *cp, *ep, line[16*1024]; + int i, skip = 0, num = 1, invalid = 1, success = 0; + u_int ignore; struct stat st; - fptype = 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) { perror(identity_file); exit(1); } - public = key_load_public(identity_file, &comment); - if (public != NULL) { - fp = key_fingerprint(public, fptype, rep); - printf("%d %s %s\n", key_size(public), fp, comment); + public = key_new(KEY_RSA1); + if (load_public_key(identity_file, public, &comment)) { + success = 1; + } else { key_free(public); + public = key_new(KEY_UNSPEC); + if (try_load_public_key(identity_file, public, &comment)) + success = 1; + else + error("try_load_public_key KEY_UNSPEC failed"); + } + if (success) { + printf("%d %s %s\n", key_size(public), key_fingerprint(public), comment); + key_free(public); xfree(comment); - xfree(fp); exit(0); } - if (comment) - xfree(comment); + /* XXX RSA1 only */ + + public = key_new(KEY_RSA1); f = fopen(identity_file, "r"); if (f != NULL) { while (fgets(line, sizeof(line), f)) { @@ -422,26 +394,17 @@ *cp++ = '\0'; } ep = cp; - 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; - } + 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"); } - comment = *cp ? cp : comment; - fp = key_fingerprint(public, fptype, rep); - printf("%d %s %s\n", key_size(public), fp, - comment ? comment : "no comment"); - xfree(fp); - key_free(public); - invalid = 0; } fclose(f); } + key_free(public); if (invalid) { printf("%s is not a valid key file.\n", identity_file); exit(1); @@ -460,6 +423,8 @@ char *old_passphrase, *passphrase1, *passphrase2; struct stat st; Key *private; + Key *public; + int type = KEY_RSA1; if (!have_identity) ask_filename(pw, "Enter file in which the key is"); @@ -467,20 +432,28 @@ perror(identity_file); exit(1); } + public = key_new(type); + if (!load_public_key(identity_file, public, NULL)) { + type = KEY_UNSPEC; + } else { + /* Clear the public key since we are just about to load the whole file. */ + key_free(public); + } /* Try to load the file with empty passphrase. */ - private = key_load_private(identity_file, "", &comment); - if (private == NULL) { + private = key_new(type); + if (!load_private_key(identity_file, "", private, &comment)) { if (identity_passphrase) old_passphrase = xstrdup(identity_passphrase); else old_passphrase = read_passphrase("Enter old passphrase: ", 1); - private = key_load_private(identity_file, old_passphrase , &comment); - memset(old_passphrase, 0, strlen(old_passphrase)); - xfree(old_passphrase); - if (private == NULL) { + if (!load_private_key(identity_file, old_passphrase, private, &comment)) { + memset(old_passphrase, 0, strlen(old_passphrase)); + xfree(old_passphrase); printf("Bad passphrase.\n"); exit(1); } + memset(old_passphrase, 0, strlen(old_passphrase)); + xfree(old_passphrase); } printf("Key has comment '%s'\n", comment); @@ -508,8 +481,9 @@ } /* Save the file using the new passphrase. */ - if (!key_save_private(private, identity_file, passphrase1, comment)) { - printf("Saving the key failed: %s.\n", identity_file); + if (!save_private_key(identity_file, passphrase1, private, comment)) { + printf("Saving the key failed: %s: %s.\n", + identity_file, strerror(errno)); memset(passphrase1, 0, strlen(passphrase1)); xfree(passphrase1); key_free(private); @@ -532,12 +506,12 @@ void do_change_comment(struct passwd *pw) { - char new_comment[1024], *comment, *passphrase; + char new_comment[1024], *comment; Key *private; Key *public; + char *passphrase; struct stat st; FILE *f; - int fd; if (!have_identity) ask_filename(pw, "Enter file in which the key is"); @@ -545,8 +519,20 @@ perror(identity_file); exit(1); } - private = key_load_private(identity_file, "", &comment); - if (private == NULL) { + /* + * Try to load the public key from the file the verify that it is + * readable and of the proper format. + */ + public = key_new(KEY_RSA1); + if (!load_public_key(identity_file, public, NULL)) { + printf("%s is not a valid key file.\n", identity_file); + exit(1); + } + + private = key_new(KEY_RSA1); + if (load_private_key(identity_file, "", private, &comment)) + passphrase = xstrdup(""); + else { if (identity_passphrase) passphrase = xstrdup(identity_passphrase); else if (identity_new_passphrase) @@ -554,21 +540,13 @@ else passphrase = read_passphrase("Enter passphrase: ", 1); /* Try to load using the passphrase. */ - private = key_load_private(identity_file, passphrase, &comment); - if (private == NULL) { + if (!load_private_key(identity_file, passphrase, private, &comment)) { memset(passphrase, 0, strlen(passphrase)); xfree(passphrase); printf("Bad passphrase.\n"); exit(1); } - } else { - passphrase = xstrdup(""); } - if (private->type != KEY_RSA1) { - fprintf(stderr, "Comments are only supported for RSA1 keys.\n"); - key_free(private); - exit(1); - } printf("Key now has comment '%s'\n", comment); if (identity_comment) { @@ -586,8 +564,9 @@ } /* Save the file using the new passphrase. */ - if (!key_save_private(private, identity_file, passphrase, new_comment)) { - printf("Saving the key failed: %s.\n", identity_file); + if (!save_private_key(identity_file, passphrase, private, new_comment)) { + printf("Saving the key failed: %s: %s.\n", + identity_file, strerror(errno)); memset(passphrase, 0, strlen(passphrase)); xfree(passphrase); key_free(private); @@ -596,20 +575,14 @@ } memset(passphrase, 0, strlen(passphrase)); xfree(passphrase); - public = key_from_private(private); key_free(private); strlcat(identity_file, ".pub", sizeof(identity_file)); - fd = open(identity_file, O_WRONLY | O_CREAT | O_TRUNC, 0644); - if (fd == -1) { + f = fopen(identity_file, "w"); + if (!f) { 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); @@ -625,8 +598,7 @@ void usage(void) { - printf("Usage: %s [-ceilpqyB] [-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); } @@ -637,11 +609,12 @@ main(int ac, char **av) { char dotsshdir[16 * 1024], comment[1024], *passphrase1, *passphrase2; - Key *private, *public; struct passwd *pw; - int opt, type, fd; + int opt, type; struct stat st; FILE *f; + Key *private; + Key *public; extern int optind; extern char *optarg; @@ -659,7 +632,7 @@ exit(1); } - while ((opt = getopt(ac, av, "deiqpclBRxXyb:f:t:P:N:C:")) != -1) { + while ((opt = getopt(ac, av, "dqpclRxXyb:f:t:P:N:C:")) != EOF) { switch (opt) { case 'b': bits = atoi(optarg); @@ -673,10 +646,6 @@ print_fingerprint = 1; break; - case 'B': - print_bubblebabble = 1; - break; - case 'p': change_passphrase = 1; break; @@ -711,15 +680,11 @@ exit(0); break; - case 'e': case 'x': - /* export key */ convert_to_ssh2 = 1; break; - case 'i': case 'X': - /* import key */ convert_from_ssh2 = 1; break; @@ -748,7 +713,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); @@ -781,7 +746,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, _PATH_SSH_USER_DIR); + snprintf(dotsshdir, sizeof dotsshdir, "%s/%s", pw->pw_dir, SSH_USER_DIR); if (strstr(identity_file, dotsshdir) != NULL && stat(dotsshdir, &st) < 0) { if (mkdir(dotsshdir, 0700) < 0) @@ -832,8 +797,9 @@ } /* Save the key with the given passphrase and comment. */ - if (!key_save_private(private, identity_file, passphrase1, comment)) { - printf("Saving the key failed: %s.\n", identity_file); + if (!save_private_key(identity_file, passphrase1, private, comment)) { + printf("Saving the key failed: %s: %s.\n", + identity_file, strerror(errno)); memset(passphrase1, 0, strlen(passphrase1)); xfree(passphrase1); exit(1); @@ -850,28 +816,21 @@ printf("Your identification has been saved in %s.\n", identity_file); strlcat(identity_file, ".pub", sizeof(identity_file)); - fd = open(identity_file, O_WRONLY | O_CREAT | O_TRUNC, 0644); - if (fd == -1) { + f = fopen(identity_file, "w"); + if (!f) { 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", fp, comment); - xfree(fp); + printf("%s %s\n", key_fingerprint(public), comment); } key_free(public);