=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/ssh-keygen.c,v retrieving revision 1.25.2.4 retrieving revision 1.27 diff -u -r1.25.2.4 -r1.27 --- src/usr.bin/ssh/ssh-keygen.c 2001/03/12 15:44:16 1.25.2.4 +++ src/usr.bin/ssh/ssh-keygen.c 2000/06/20 01:39:44 1.27 @@ -2,30 +2,26 @@ * Author: Tatu Ylonen * Copyright (c) 1994 Tatu Ylonen , Espoo, Finland * All rights reserved + * Created: Mon Mar 27 02:26:40 1995 ylo * Identity and host key generation and maintenance. - * - * As far as I am concerned, the code I have written for this software - * can be used freely for any purpose. Any derived versions of this - * software must be clearly marked as such, and if the derived work is - * incompatible with the protocol description in the RFC file, it must be - * called by a name other than "ssh" or "Secure Shell". */ #include "includes.h" -RCSID("$OpenBSD: ssh-keygen.c,v 1.25.2.4 2001/03/12 15:44:16 jason Exp $"); +RCSID("$OpenBSD: ssh-keygen.c,v 1.27 2000/06/20 01:39:44 markus Exp $"); #include #include +#include +#include +#include "ssh.h" #include "xmalloc.h" +#include "fingerprint.h" #include "key.h" +#include "rsa.h" +#include "dsa.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; @@ -64,10 +60,8 @@ int convert_to_ssh2 = 0; int convert_from_ssh2 = 0; int print_public = 0; +int dsa_mode = 0; -/* default to RSA for SSH-1 */ -char *key_type_name = "rsa1"; - /* argv0 */ extern char *__progname; @@ -77,26 +71,11 @@ ask_filename(struct passwd *pw, const char *prompt) { char buf[1024]; - char *name = NULL; - - switch (key_type_from_name(key_type_name)) { - case KEY_RSA1: - name = _PATH_SSH_CLIENT_IDENTITY; - break; - case KEY_DSA: - name = _PATH_SSH_CLIENT_ID_DSA; - break; - case KEY_RSA: - name = _PATH_SSH_CLIENT_ID_RSA; - break; - default: - fprintf(stderr, "bad key type"); - exit(1); - break; - } - snprintf(identity_file, sizeof(identity_file), "%s/%s", pw->pw_dir, name); - fprintf(stderr, "%s (%s): ", prompt, identity_file); - fflush(stderr); + snprintf(identity_file, sizeof(identity_file), "%s/%s", + pw->pw_dir, + dsa_mode ? SSH_CLIENT_ID_DSA: SSH_CLIENT_IDENTITY); + printf("%s (%s): ", prompt, identity_file); + fflush(stdout); if (fgets(buf, sizeof(buf), stdin) == NULL) exit(1); if (strchr(buf, '\n')) @@ -121,17 +100,15 @@ 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_MAGIC_BEGIN "---- BEGIN SSH2 PUBLIC KEY ----" +#define SSH_COM_MAGIC_END "---- END SSH2 PUBLIC KEY ----" void do_convert_to_ssh2(struct passwd *pw) { Key *k; int len; - u_char *blob; + unsigned char *blob; struct stat st; if (!have_identity) @@ -140,90 +117,25 @@ perror(identity_file); exit(1); } - k = key_new(KEY_UNSPEC); + k = key_new(KEY_DSA); 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); + dsa_make_key_blob(k, &blob, &len); + fprintf(stdout, SSH_COM_MAGIC_BEGIN "\n"); fprintf(stdout, - "Comment: \"%d-bit %s, converted from OpenSSH by %s@%s\"\n", - key_size(k), key_type(k), + "Comment: \"%d-bit DSA, converted from openssh by %s@%s\"\n", + BN_num_bits(k->dsa->p), pw->pw_name, hostname); dump_base64(stdout, blob, len); - fprintf(stdout, "%s\n", SSH_COM_PUBLIC_END); + fprintf(stdout, SSH_COM_MAGIC_END "\n"); key_free(k); xfree(blob); exit(0); } void -buffer_get_bignum_bits(Buffer *b, BIGNUM *value) -{ - 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"); - BN_bin2bn((u_char *)buffer_ptr(b), bytes, value); - buffer_consume(b, bytes); -} - -Key * -do_convert_private_ssh2_from_blob(char *blob, int blen) -{ - Buffer b; - DSA *dsa; - Key *key = NULL; - int ignore, magic, rlen; - char *type, *cipher; - - buffer_init(&b); - buffer_append(&b, blob, blen); - - magic = buffer_get_int(&b); - if (magic != SSH_COM_PRIVATE_KEY_MAGIC) { - error("bad magic 0x%x != 0x%x", magic, SSH_COM_PRIVATE_KEY_MAGIC); - buffer_free(&b); - return NULL; - } - ignore = buffer_get_int(&b); - type = buffer_get_string(&b, NULL); - cipher = buffer_get_string(&b, NULL); - 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); - return NULL; - } - xfree(cipher); - - 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; - } - 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); - buffer_free(&b); - return key; -} - -void do_convert_from_ssh2(struct passwd *pw) { Key *k; @@ -232,7 +144,7 @@ char blob[8096]; char encoded[8096]; struct stat st; - int escaped = 0, private = 0, ok; + int escaped = 0; FILE *fp; if (!have_identity) @@ -256,8 +168,6 @@ escaped++; if (strncmp(line, "----", 4) == 0 || strstr(line, ": ") != NULL) { - if (strstr(line, SSH_COM_PRIVATE_BEGIN) != NULL) - private = 1; fprintf(stderr, "ignore: %s", line); continue; } @@ -269,25 +179,14 @@ *p = '\0'; strlcat(encoded, line, sizeof(encoded)); } - blen = uudecode(encoded, (u_char *)blob, sizeof(blob)); + blen = uudecode(encoded, (unsigned char *)blob, sizeof(blob)); if (blen < 0) { fprintf(stderr, "uudecode failed.\n"); exit(1); } - k = private ? - do_convert_private_ssh2_from_blob(blob, blen) : - key_from_blob(blob, blen); - if (k == NULL) { - fprintf(stderr, "decode blob failed.\n"); - exit(1); - } - ok = private ? - PEM_write_DSAPrivateKey(stdout, k->dsa, NULL, NULL, 0, NULL, NULL) : - key_write(k, stdout); - if (!ok) { - fprintf(stderr, "key write failed"); - exit(1); - } + k = dsa_key_from_blob(blob, blen); + if (!key_write(k, stdout)) + fprintf(stderr, "key_write failed"); key_free(k); fprintf(stdout, "\n"); fclose(fp); @@ -298,6 +197,8 @@ do_print_public(struct passwd *pw) { Key *k; + int len; + unsigned char *blob; struct stat st; if (!have_identity) @@ -306,14 +207,16 @@ perror(identity_file); exit(1); } - k = key_new(KEY_UNSPEC); + k = key_new(KEY_DSA); if (!try_load_key(identity_file, k)) { fprintf(stderr, "load failed\n"); exit(1); } + dsa_make_key_blob(k, &blob, &len); if (!key_write(k, stdout)) fprintf(stderr, "key_write failed"); key_free(k); + xfree(blob); fprintf(stdout, "\n"); exit(0); } @@ -321,11 +224,12 @@ void do_fingerprint(struct passwd *pw) { - FILE *f; + BIGNUM *e, *n; Key *public; char *comment = NULL, *cp, *ep, line[16*1024]; - int i, skip = 0, num = 1, invalid = 1, success = 0; + int i, skip = 0, num = 1, invalid = 1; + unsigned int ignore; struct stat st; if (!have_identity) @@ -334,26 +238,20 @@ perror(identity_file); exit(1); } - public = key_new(KEY_RSA1); + public = key_new(KEY_RSA); if (load_public_key(identity_file, public, &comment)) { - success = 1; - } else { + printf("%d %s %s\n", BN_num_bits(public->rsa->n), + key_fingerprint(public), comment); key_free(public); - public = key_new(KEY_UNSPEC); - if (try_load_public_key(identity_file, public, &comment)) - success = 1; - else - debug("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); exit(0); } + key_free(public); + /* XXX */ f = fopen(identity_file, "r"); if (f != NULL) { + n = BN_new(); + e = BN_new(); while (fgets(line, sizeof(line), f)) { i = strlen(line) - 1; if (line[i] != '\n') { @@ -388,25 +286,18 @@ *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, e, n)) { + invalid = 0; + comment = *cp ? cp : comment; + printf("%d %s %s\n", BN_num_bits(n), + fingerprint(e, n), + comment ? comment : "no comment"); } - comment = *cp ? cp : comment; - printf("%d %s %s\n", key_size(public), - key_fingerprint(public), - comment ? comment : "no comment"); - invalid = 0; } + BN_free(e); + BN_free(n); fclose(f); } - key_free(public); if (invalid) { printf("%s is not a valid key file.\n", identity_file); exit(1); @@ -426,7 +317,7 @@ struct stat st; Key *private; Key *public; - int type = KEY_RSA1; + int type = dsa_mode ? KEY_DSA : KEY_RSA; if (!have_identity) ask_filename(pw, "Enter file in which the key is"); @@ -434,13 +325,18 @@ perror(identity_file); exit(1); } - public = key_new(type); - if (!load_public_key(identity_file, public, NULL)) { - type = KEY_UNSPEC; - } else { + + if (type == KEY_RSA) { + /* XXX this works currently only for RSA */ + public = key_new(type); + if (!load_public_key(identity_file, public, NULL)) { + printf("%s is not a valid key file.\n", identity_file); + exit(1); + } /* 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_new(type); if (!load_private_key(identity_file, "", private, &comment)) { @@ -525,14 +421,13 @@ * 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); + public = key_new(KEY_RSA); 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); } - private = key_new(KEY_RSA1); + private = key_new(KEY_RSA); if (load_private_key(identity_file, "", private, &comment)) passphrase = xstrdup(""); else { @@ -601,7 +496,7 @@ 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 [-lpqxXydc] [-b bits] [-f file] [-C comment] [-N new-pass] [-P pass]\n", __progname); exit(1); } @@ -613,12 +508,11 @@ { char dotsshdir[16 * 1024], comment[1024], *passphrase1, *passphrase2; struct passwd *pw; - int opt, type; + int opt; struct stat st; FILE *f; Key *private; Key *public; - extern int optind; extern char *optarg; @@ -635,7 +529,7 @@ exit(1); } - while ((opt = getopt(ac, av, "dqpclRxXyb:f:t:P:N:C:")) != -1) { + while ((opt = getopt(ac, av, "dqpclRxXyb:f:P:N:C:")) != EOF) { switch (opt) { case 'b': bits = atoi(optarg); @@ -679,8 +573,10 @@ break; case 'R': - /* unused */ - exit(0); + if (rsa_alive() == 0) + exit(1); + else + exit(0); break; case 'x': @@ -696,13 +592,9 @@ break; case 'd': - key_type_name = "dsa"; + dsa_mode = 1; break; - case 't': - key_type_name = optarg; - break; - case '?': default: usage(); @@ -716,6 +608,13 @@ printf("Can only have one of -p and -c.\n"); usage(); } + /* check if RSA support is needed and exists */ + if (dsa_mode == 0 && rsa_alive() == 0) { + fprintf(stderr, + "%s: no RSA support in libssl and libcrypto. See ssl(8).\n", + __progname); + exit(1); + } if (print_fingerprint) do_fingerprint(pw); if (change_passphrase) @@ -731,28 +630,31 @@ arc4random_stir(); - type = key_type_from_name(key_type_name); - if (type == KEY_UNSPEC) { - fprintf(stderr, "unknown key type %s\n", key_type_name); - exit(1); + if (dsa_mode != 0) { + if (!quiet) + printf("Generating DSA parameter and key.\n"); + public = private = dsa_generate_key(bits); + if (private == NULL) { + fprintf(stderr, "dsa_generate_keys failed"); + exit(1); + } + } else { + if (quiet) + rsa_set_verbose(0); + /* Generate the rsa key pair. */ + public = key_new(KEY_RSA); + private = key_new(KEY_RSA); + rsa_generate_key(private->rsa, public->rsa, bits); } - if (!quiet) - printf("Generating public/private %s key pair.\n", key_type_name); - private = key_generate(type, bits); - if (private == NULL) { - fprintf(stderr, "key_generate failed"); - exit(1); - } - public = key_from_private(private); if (!have_identity) 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) + if (mkdir(dotsshdir, 0755) < 0) error("Could not create directory '%s'.", dotsshdir); else if (!quiet) printf("Created directory '%s'.\n", dotsshdir); @@ -812,7 +714,9 @@ xfree(passphrase1); /* Clear the private key and the random number generator. */ - key_free(private); + if (private != public) { + key_free(private); + } arc4random_stir(); if (!quiet)