=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/ssh-keygen.c,v retrieving revision 1.60.2.1 retrieving revision 1.66 diff -u -r1.60.2.1 -r1.66 --- src/usr.bin/ssh/ssh-keygen.c 2001/09/27 19:03:55 1.60.2.1 +++ src/usr.bin/ssh/ssh-keygen.c 2001/06/26 02:47:07 1.66 @@ -12,11 +12,15 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh-keygen.c,v 1.60.2.1 2001/09/27 19:03:55 jason Exp $"); +RCSID("$OpenBSD: ssh-keygen.c,v 1.66 2001/06/26 02:47:07 markus Exp $"); #include #include +#ifdef SMARTCARD +#include +#endif + #include "xmalloc.h" #include "key.h" #include "rsa.h" @@ -28,11 +32,6 @@ #include "log.h" #include "readpass.h" -#ifdef SMARTCARD -#include -#include -#include "scard.h" -#endif /* Number of bits in the RSA/DSA key. This value can be changed on the command line. */ int bits = 1024; @@ -159,10 +158,7 @@ exit(1); } } - if (key_to_blob(k, &blob, &len) <= 0) { - fprintf(stderr, "key_to_blob failed\n"); - exit(1); - } + key_to_blob(k, &blob, &len); fprintf(stdout, "%s\n", SSH_COM_PUBLIC_BEGIN); fprintf(stdout, "Comment: \"%d-bit %s, converted from OpenSSH by %s@%s\"\n", @@ -189,12 +185,12 @@ } static Key * -do_convert_private_ssh2_from_blob(u_char *blob, int blen) +do_convert_private_ssh2_from_blob(char *blob, int blen) { Buffer b; Key *key = NULL; char *type, *cipher; - u_char *sig, data[] = "abcde12345"; + u_char *sig, data[10] = "abcde12345"; int magic, rlen, ktype, i1, i2, i3, i4; u_int slen; u_long e; @@ -264,7 +260,7 @@ buffer_get_bignum_bits(&b, key->rsa->iqmp); buffer_get_bignum_bits(&b, key->rsa->q); buffer_get_bignum_bits(&b, key->rsa->p); - rsa_generate_additional_parameters(key->rsa); + generate_additional_parameters(key->rsa); break; } rlen = buffer_len(&b); @@ -286,7 +282,7 @@ Key *k; int blen; char line[1024], *p; - u_char blob[8096]; + char blob[8096]; char encoded[8096]; struct stat st; int escaped = 0, private = 0, ok; @@ -380,49 +376,31 @@ exit(0); } -#ifdef SMARTCARD #define NUM_RSA_KEY_ELEMENTS 5+1 #define COPY_RSA_KEY(x, i) \ do { \ len = BN_num_bytes(prv->rsa->x); \ elements[i] = xmalloc(len); \ - debug("#bytes %d", len); \ +error("#bytes %d", len); \ if (BN_bn2bin(prv->rsa->x, elements[i]) < 0) \ goto done; \ } while(0) -static int -get_AUT0(char *aut0) -{ - EVP_MD *evp_md = EVP_sha1(); - EVP_MD_CTX md; - char *pass; - - pass = read_passphrase("Enter passphrase for smartcard: ", RP_ALLOW_STDIN); - if (pass == NULL) - return -1; - EVP_DigestInit(&md, evp_md); - EVP_DigestUpdate(&md, pass, strlen(pass)); - EVP_DigestFinal(&md, aut0, NULL); - memset(pass, 0, strlen(pass)); - xfree(pass); - return 0; -} - static void -do_upload(struct passwd *pw, const char *sc_reader_id) +do_upload(struct passwd *pw, int reader) { +#ifndef SMARTCARD + fatal("no support for smartcards."); +#else Key *prv = NULL; struct stat st; u_char *elements[NUM_RSA_KEY_ELEMENTS]; u_char key_fid[2]; - u_char DEFAUT0[] = {0xad, 0x9f, 0x61, 0xfe, 0xfa, 0x20, 0xce, 0x63}; - u_char AUT0[EVP_MAX_MD_SIZE]; + u_char atr[256]; + u_char AUT0[] = {0xad, 0x9f, 0x61, 0xfe, 0xfa, 0x20, 0xce, 0x63}; int len, status = 1, i, fd = -1, ret; - int sw = 0, cla = 0x00; + int cla = 0x00; - for (i = 0; i < NUM_RSA_KEY_ELEMENTS; i++) - elements[i] = NULL; if (!have_identity) ask_filename(pw, "Enter file in which the key is"); if (stat(identity_file, &st) < 0) { @@ -434,6 +412,12 @@ error("load failed"); goto done; } +{ + prv->type = KEY_RSA; + key_write(prv, stderr); +} + for (i = 0; i < NUM_RSA_KEY_ELEMENTS; i++) + elements[i] = NULL; COPY_RSA_KEY(q, 0); COPY_RSA_KEY(p, 1); COPY_RSA_KEY(iqmp, 2); @@ -441,52 +425,29 @@ COPY_RSA_KEY(dmp1, 4); COPY_RSA_KEY(n, 5); len = BN_num_bytes(prv->rsa->n); - fd = sectok_friendly_open(sc_reader_id, STONOWAIT, &sw); - if (fd < 0) { - error("sectok_open failed: %s", sectok_get_sw(sw)); + fd = scopen(reader, 0, NULL); + if (fd < 0) { + error("scopen failed %d.", fd); goto done; - } - if (! sectok_cardpresent(fd)) { - error("smartcard in reader %s not present", - sc_reader_id); + } + ret = screset(fd, atr, NULL); + if (ret <= 0) { + error("screset failed."); goto done; - } - ret = sectok_reset(fd, 0, NULL, &sw); - if (ret <= 0) { - error("sectok_reset failed: %s", sectok_get_sw(sw)); + } + if (cyberflex_verify_AUT0(fd, cla, AUT0, sizeof(AUT0)) < 0) { + error("cyberflex_verify_AUT0 failed"); goto done; } - if ((cla = cyberflex_inq_class(fd)) < 0) { - error("cyberflex_inq_class failed"); - goto done; - } - memcpy(AUT0, DEFAUT0, sizeof(DEFAUT0)); - if (cyberflex_verify_AUT0(fd, cla, AUT0, sizeof(DEFAUT0)) < 0) { - if (get_AUT0(AUT0) < 0 || - cyberflex_verify_AUT0(fd, cla, AUT0, sizeof(DEFAUT0)) < 0) { - error("cyberflex_verify_AUT0 failed"); - goto done; - } - } key_fid[0] = 0x00; key_fid[1] = 0x12; - if (cyberflex_load_rsa_priv(fd, cla, key_fid, 5, 8*len, elements, - &sw) < 0) { - error("cyberflex_load_rsa_priv failed: %s", sectok_get_sw(sw)); + if (cyberflex_load_rsa_priv(fd, cla, key_fid, 5, 8*len, elements) < 0) goto done; - } - if (!sectok_swOK(sw)) - goto done; log("cyberflex_load_rsa_priv done"); key_fid[0] = 0x73; key_fid[1] = 0x68; - if (cyberflex_load_rsa_pub(fd, cla, key_fid, len, elements[5], - &sw) < 0) { - error("cyberflex_load_rsa_pub failed: %s", sectok_get_sw(sw)); + if (cyberflex_load_rsa_pub(fd, cla, key_fid, len, elements[5]) < 0) goto done; - } - if (!sectok_swOK(sw)) - goto done; log("cyberflex_load_rsa_pub done"); status = 0; log("loading key done"); @@ -494,29 +455,14 @@ if (prv) key_free(prv); for (i = 0; i < NUM_RSA_KEY_ELEMENTS; i++) - if (elements[i]) - xfree(elements[i]); + xfree(elements[i]); if (fd != -1) - sectok_close(fd); + scclose(fd); exit(status); +#endif } static void -do_download(struct passwd *pw, const char *sc_reader_id) -{ - Key *pub = NULL; - - pub = sc_get_key(sc_reader_id); - if (pub == NULL) - fatal("cannot read public key from smartcard"); - key_write(pub, stdout); - key_free(pub); - fprintf(stdout, "\n"); - exit(0); -} -#endif /* SMARTCARD */ - -static void do_fingerprint(struct passwd *pw) { FILE *f; @@ -791,27 +737,8 @@ static void usage(void) { - fprintf(stderr, "Usage: %s [options]\n", __progname); - fprintf(stderr, "Options:\n"); - fprintf(stderr, " -b bits Number of bits in the key to create.\n"); - fprintf(stderr, " -c Change comment in private and public key files.\n"); - fprintf(stderr, " -e Convert OpenSSH to IETF SECSH key file.\n"); - fprintf(stderr, " -f filename Filename of the key file.\n"); - fprintf(stderr, " -i Convert IETF SECSH to OpenSSH key file.\n"); - fprintf(stderr, " -l Show fingerprint of key file.\n"); - fprintf(stderr, " -p Change passphrase of private key file.\n"); - fprintf(stderr, " -q Quiet.\n"); - fprintf(stderr, " -y Read private key file and print public key.\n"); - fprintf(stderr, " -t type Specify type of key to create.\n"); - fprintf(stderr, " -B Show bubblebabble digest of key file.\n"); - fprintf(stderr, " -C comment Provide new comment.\n"); - fprintf(stderr, " -N phrase Provide new passphrase.\n"); - fprintf(stderr, " -P phrase Provide old passphrase.\n"); -#ifdef SMARTCARD - fprintf(stderr, " -D reader Download public key from smartcard.\n"); - fprintf(stderr, " -U reader Upload private key to smartcard.\n"); -#endif /* SMARTCARD */ - + printf("Usage: %s [-ceilpqyB] [-t type] [-b bits] [-f file] [-C comment] " + "[-N new-pass] [-P pass]\n", __progname); exit(1); } @@ -822,11 +749,10 @@ main(int ac, char **av) { char dotsshdir[16 * 1024], comment[1024], *passphrase1, *passphrase2; - char *reader_id = NULL; Key *private, *public; struct passwd *pw; + int opt, type, fd, reader = -1; struct stat st; - int opt, type, fd, download = 0; FILE *f; extern int optind; @@ -845,7 +771,7 @@ exit(1); } - while ((opt = getopt(ac, av, "deiqpclBRxXyb:f:t:U:D:P:N:C:")) != -1) { + while ((opt = getopt(ac, av, "deiqpclBRxXyb:f:t:u:P:N:C:")) != -1) { switch (opt) { case 'b': bits = atoi(optarg); @@ -905,10 +831,8 @@ case 't': key_type_name = optarg; break; - case 'D': - download = 1; - case 'U': - reader_id = optarg; + case 'u': + reader = atoi(optarg); /*XXX*/ break; case '?': default: @@ -935,16 +859,8 @@ do_convert_from_ssh2(pw); if (print_public) do_print_public(pw); - if (reader_id != NULL) { -#ifdef SMARTCARD - if (download) - do_download(pw, reader_id); - else - do_upload(pw, reader_id); -#else /* SMARTCARD */ - fatal("no support for smartcards."); -#endif /* SMARTCARD */ - } + if (reader != -1) + do_upload(pw, reader); arc4random_stir();