=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/ssh-keygen.c,v retrieving revision 1.25.2.4 retrieving revision 1.34 diff -u -r1.25.2.4 -r1.34 --- 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/11/15 20:24:43 1.34 @@ -12,20 +12,22 @@ */ #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.34 2000/11/15 20:24:43 millert 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; @@ -65,8 +67,9 @@ int convert_from_ssh2 = 0; int print_public = 0; -/* default to RSA for SSH-1 */ -char *key_type_name = "rsa1"; +/* key type */ +int dsa_mode = 0; /* compat */ +char *key_type_name = NULL; /* argv0 */ extern char *__progname; @@ -77,26 +80,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')) @@ -124,14 +112,14 @@ #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) { Key *k; int len; - u_char *blob; + unsigned char *blob; struct stat st; if (!have_identity) @@ -165,7 +153,7 @@ 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); + BN_bin2bn((unsigned char *)buffer_ptr(b), bytes, value); buffer_consume(b, bytes); } @@ -269,7 +257,7 @@ *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); @@ -326,6 +314,7 @@ Key *public; char *comment = NULL, *cp, *ep, line[16*1024]; int i, skip = 0, num = 1, invalid = 1, success = 0; + unsigned int ignore; struct stat st; if (!have_identity) @@ -343,7 +332,7 @@ if (try_load_public_key(identity_file, public, &comment)) success = 1; else - debug("try_load_public_key KEY_UNSPEC failed"); + error("try_load_public_key KEY_UNSPEC failed"); } if (success) { printf("%d %s %s\n", key_size(public), key_fingerprint(public), comment); @@ -352,6 +341,9 @@ exit(0); } + /* XXX RSA1 only */ + + public = key_new(KEY_RSA1); f = fopen(identity_file, "r"); if (f != NULL) { while (fgets(line, sizeof(line), f)) { @@ -388,21 +380,13 @@ *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; - printf("%d %s %s\n", key_size(public), - key_fingerprint(public), - comment ? comment : "no comment"); - invalid = 0; } fclose(f); } @@ -528,7 +512,6 @@ 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); } @@ -613,9 +596,10 @@ { char dotsshdir[16 * 1024], comment[1024], *passphrase1, *passphrase2; struct passwd *pw; - int opt, type; + int opt; struct stat st; FILE *f; + int type = KEY_RSA1; Key *private; Key *public; @@ -635,7 +619,7 @@ exit(1); } - while ((opt = getopt(ac, av, "dqpclRxXyb: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); @@ -697,10 +681,12 @@ case 'd': key_type_name = "dsa"; + dsa_mode = 1; break; case 't': key_type_name = optarg; + dsa_mode = (strcmp(optarg, "dsa") == 0); break; case '?': @@ -731,13 +717,15 @@ 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 (key_type_name != NULL) { + 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 (!quiet) - printf("Generating public/private %s key pair.\n", key_type_name); + printf("Generating public/private key pair.\n"); private = key_generate(type, bits); if (private == NULL) { fprintf(stderr, "key_generate failed"); @@ -749,7 +737,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)