version 1.66, 2001/06/26 02:47:07 |
version 1.87, 2001/12/21 08:52:22 |
|
|
#include <openssl/evp.h> |
#include <openssl/evp.h> |
#include <openssl/pem.h> |
#include <openssl/pem.h> |
|
|
#ifdef SMARTCARD |
|
#include <sectok.h> |
|
#endif |
|
|
|
#include "xmalloc.h" |
#include "xmalloc.h" |
#include "key.h" |
#include "key.h" |
#include "rsa.h" |
#include "rsa.h" |
|
|
#include "log.h" |
#include "log.h" |
#include "readpass.h" |
#include "readpass.h" |
|
|
|
#ifdef SMARTCARD |
|
#include <sectok.h> |
|
#include <openssl/engine.h> |
|
#include "scard.h" |
|
#endif |
|
|
/* Number of bits in the RSA/DSA key. This value can be changed on the command line. */ |
/* Number of bits in the RSA/DSA key. This value can be changed on the command line. */ |
int bits = 1024; |
int bits = 1024; |
|
|
int convert_from_ssh2 = 0; |
int convert_from_ssh2 = 0; |
int print_public = 0; |
int print_public = 0; |
|
|
/* default to RSA for SSH-1 */ |
char *key_type_name = NULL; |
char *key_type_name = "rsa1"; |
|
|
|
/* argv0 */ |
/* argv0 */ |
extern char *__progname; |
extern char *__progname; |
|
|
exit(1); |
exit(1); |
} |
} |
} |
} |
key_to_blob(k, &blob, &len); |
if (key_to_blob(k, &blob, &len) <= 0) { |
|
fprintf(stderr, "key_to_blob failed\n"); |
|
exit(1); |
|
} |
fprintf(stdout, "%s\n", SSH_COM_PUBLIC_BEGIN); |
fprintf(stdout, "%s\n", SSH_COM_PUBLIC_BEGIN); |
fprintf(stdout, |
fprintf(stdout, |
"Comment: \"%d-bit %s, converted from OpenSSH by %s@%s\"\n", |
"Comment: \"%d-bit %s, converted from OpenSSH by %s@%s\"\n", |
|
|
} |
} |
|
|
static Key * |
static Key * |
do_convert_private_ssh2_from_blob(char *blob, int blen) |
do_convert_private_ssh2_from_blob(u_char *blob, int blen) |
{ |
{ |
Buffer b; |
Buffer b; |
Key *key = NULL; |
Key *key = NULL; |
char *type, *cipher; |
char *type, *cipher; |
u_char *sig, data[10] = "abcde12345"; |
u_char *sig, data[] = "abcde12345"; |
int magic, rlen, ktype, i1, i2, i3, i4; |
int magic, rlen, ktype, i1, i2, i3, i4; |
u_int slen; |
u_int slen; |
u_long e; |
u_long e; |
|
|
buffer_get_bignum_bits(&b, key->rsa->iqmp); |
buffer_get_bignum_bits(&b, key->rsa->iqmp); |
buffer_get_bignum_bits(&b, key->rsa->q); |
buffer_get_bignum_bits(&b, key->rsa->q); |
buffer_get_bignum_bits(&b, key->rsa->p); |
buffer_get_bignum_bits(&b, key->rsa->p); |
generate_additional_parameters(key->rsa); |
rsa_generate_additional_parameters(key->rsa); |
break; |
break; |
} |
} |
rlen = buffer_len(&b); |
rlen = buffer_len(&b); |
if(rlen != 0) |
if (rlen != 0) |
error("do_convert_private_ssh2_from_blob: " |
error("do_convert_private_ssh2_from_blob: " |
"remaining bytes in key blob %d", rlen); |
"remaining bytes in key blob %d", rlen); |
buffer_free(&b); |
buffer_free(&b); |
|
|
Key *k; |
Key *k; |
int blen; |
int blen; |
char line[1024], *p; |
char line[1024], *p; |
char blob[8096]; |
u_char blob[8096]; |
char encoded[8096]; |
char encoded[8096]; |
struct stat st; |
struct stat st; |
int escaped = 0, private = 0, ok; |
int escaped = 0, private = 0, ok; |
|
|
exit(0); |
exit(0); |
} |
} |
|
|
|
#ifdef SMARTCARD |
#define NUM_RSA_KEY_ELEMENTS 5+1 |
#define NUM_RSA_KEY_ELEMENTS 5+1 |
#define COPY_RSA_KEY(x, i) \ |
#define COPY_RSA_KEY(x, i) \ |
do { \ |
do { \ |
len = BN_num_bytes(prv->rsa->x); \ |
len = BN_num_bytes(prv->rsa->x); \ |
elements[i] = xmalloc(len); \ |
elements[i] = xmalloc(len); \ |
error("#bytes %d", len); \ |
debug("#bytes %d", len); \ |
if (BN_bn2bin(prv->rsa->x, elements[i]) < 0) \ |
if (BN_bn2bin(prv->rsa->x, elements[i]) < 0) \ |
goto done; \ |
goto done; \ |
} while(0) |
} 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 |
static void |
do_upload(struct passwd *pw, int reader) |
do_upload(struct passwd *pw, const char *sc_reader_id) |
{ |
{ |
#ifndef SMARTCARD |
|
fatal("no support for smartcards."); |
|
#else |
|
Key *prv = NULL; |
Key *prv = NULL; |
struct stat st; |
struct stat st; |
u_char *elements[NUM_RSA_KEY_ELEMENTS]; |
u_char *elements[NUM_RSA_KEY_ELEMENTS]; |
u_char key_fid[2]; |
u_char key_fid[2]; |
u_char atr[256]; |
u_char DEFAUT0[] = {0xad, 0x9f, 0x61, 0xfe, 0xfa, 0x20, 0xce, 0x63}; |
u_char AUT0[] = {0xad, 0x9f, 0x61, 0xfe, 0xfa, 0x20, 0xce, 0x63}; |
u_char AUT0[EVP_MAX_MD_SIZE]; |
int len, status = 1, i, fd = -1, ret; |
int len, status = 1, i, fd = -1, ret; |
int cla = 0x00; |
int sw = 0, cla = 0x00; |
|
|
|
for (i = 0; i < NUM_RSA_KEY_ELEMENTS; i++) |
|
elements[i] = NULL; |
if (!have_identity) |
if (!have_identity) |
ask_filename(pw, "Enter file in which the key is"); |
ask_filename(pw, "Enter file in which the key is"); |
if (stat(identity_file, &st) < 0) { |
if (stat(identity_file, &st) < 0) { |
|
|
error("load failed"); |
error("load failed"); |
goto done; |
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(q, 0); |
COPY_RSA_KEY(p, 1); |
COPY_RSA_KEY(p, 1); |
COPY_RSA_KEY(iqmp, 2); |
COPY_RSA_KEY(iqmp, 2); |
|
|
COPY_RSA_KEY(dmp1, 4); |
COPY_RSA_KEY(dmp1, 4); |
COPY_RSA_KEY(n, 5); |
COPY_RSA_KEY(n, 5); |
len = BN_num_bytes(prv->rsa->n); |
len = BN_num_bytes(prv->rsa->n); |
fd = scopen(reader, 0, NULL); |
fd = sectok_friendly_open(sc_reader_id, STONOWAIT, &sw); |
if (fd < 0) { |
if (fd < 0) { |
error("scopen failed %d.", fd); |
error("sectok_open failed: %s", sectok_get_sw(sw)); |
goto done; |
goto done; |
} |
} |
ret = screset(fd, atr, NULL); |
if (! sectok_cardpresent(fd)) { |
if (ret <= 0) { |
error("smartcard in reader %s not present", |
error("screset failed."); |
sc_reader_id); |
goto done; |
goto done; |
} |
} |
if (cyberflex_verify_AUT0(fd, cla, AUT0, sizeof(AUT0)) < 0) { |
ret = sectok_reset(fd, 0, NULL, &sw); |
error("cyberflex_verify_AUT0 failed"); |
if (ret <= 0) { |
|
error("sectok_reset failed: %s", sectok_get_sw(sw)); |
goto done; |
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[0] = 0x00; |
key_fid[1] = 0x12; |
key_fid[1] = 0x12; |
if (cyberflex_load_rsa_priv(fd, cla, key_fid, 5, 8*len, elements) < 0) |
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)); |
goto done; |
goto done; |
|
} |
|
if (!sectok_swOK(sw)) |
|
goto done; |
log("cyberflex_load_rsa_priv done"); |
log("cyberflex_load_rsa_priv done"); |
key_fid[0] = 0x73; |
key_fid[0] = 0x73; |
key_fid[1] = 0x68; |
key_fid[1] = 0x68; |
if (cyberflex_load_rsa_pub(fd, cla, key_fid, len, elements[5]) < 0) |
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)); |
goto done; |
goto done; |
|
} |
|
if (!sectok_swOK(sw)) |
|
goto done; |
log("cyberflex_load_rsa_pub done"); |
log("cyberflex_load_rsa_pub done"); |
status = 0; |
status = 0; |
log("loading key done"); |
log("loading key done"); |
done: |
done: |
|
|
|
memset(elements[0], '\0', BN_num_bytes(prv->rsa->q)); |
|
memset(elements[1], '\0', BN_num_bytes(prv->rsa->p)); |
|
memset(elements[2], '\0', BN_num_bytes(prv->rsa->iqmp)); |
|
memset(elements[3], '\0', BN_num_bytes(prv->rsa->dmq1)); |
|
memset(elements[4], '\0', BN_num_bytes(prv->rsa->dmp1)); |
|
memset(elements[5], '\0', BN_num_bytes(prv->rsa->n)); |
|
|
if (prv) |
if (prv) |
key_free(prv); |
key_free(prv); |
for (i = 0; i < NUM_RSA_KEY_ELEMENTS; i++) |
for (i = 0; i < NUM_RSA_KEY_ELEMENTS; i++) |
xfree(elements[i]); |
if (elements[i]) |
|
xfree(elements[i]); |
if (fd != -1) |
if (fd != -1) |
scclose(fd); |
sectok_close(fd); |
exit(status); |
exit(status); |
#endif |
|
} |
} |
|
|
static void |
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) |
do_fingerprint(struct passwd *pw) |
{ |
{ |
FILE *f; |
FILE *f; |
Key *public; |
Key *public; |
char *comment = NULL, *cp, *ep, line[16*1024], *fp; |
char *comment = NULL, *cp, *ep, line[16*1024], *fp; |
int i, skip = 0, num = 1, invalid = 1, rep, fptype; |
int i, skip = 0, num = 1, invalid = 1; |
|
enum fp_rep rep; |
|
enum fp_type fptype; |
struct stat st; |
struct stat st; |
|
|
fptype = print_bubblebabble ? SSH_FP_SHA1 : SSH_FP_MD5; |
fptype = print_bubblebabble ? SSH_FP_SHA1 : SSH_FP_MD5; |
|
|
fclose(f); |
fclose(f); |
} |
} |
if (invalid) { |
if (invalid) { |
printf("%s is not a valid key file.\n", identity_file); |
printf("%s is not a public key file.\n", identity_file); |
exit(1); |
exit(1); |
} |
} |
exit(0); |
exit(0); |
|
|
read_passphrase("Enter new passphrase (empty for no " |
read_passphrase("Enter new passphrase (empty for no " |
"passphrase): ", RP_ALLOW_STDIN); |
"passphrase): ", RP_ALLOW_STDIN); |
passphrase2 = read_passphrase("Enter same passphrase again: ", |
passphrase2 = read_passphrase("Enter same passphrase again: ", |
RP_ALLOW_STDIN); |
RP_ALLOW_STDIN); |
|
|
/* Verify that they are the same. */ |
/* Verify that they are the same. */ |
if (strcmp(passphrase1, passphrase2) != 0) { |
if (strcmp(passphrase1, passphrase2) != 0) { |
|
|
fprintf(stderr, "Comments are only supported for RSA1 keys.\n"); |
fprintf(stderr, "Comments are only supported for RSA1 keys.\n"); |
key_free(private); |
key_free(private); |
exit(1); |
exit(1); |
} |
} |
printf("Key now has comment '%s'\n", comment); |
printf("Key now has comment '%s'\n", comment); |
|
|
if (identity_comment) { |
if (identity_comment) { |
|
|
static void |
static void |
usage(void) |
usage(void) |
{ |
{ |
printf("Usage: %s [-ceilpqyB] [-t type] [-b bits] [-f file] [-C comment] " |
fprintf(stderr, "Usage: %s [options]\n", __progname); |
"[-N new-pass] [-P pass]\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 */ |
|
|
exit(1); |
exit(1); |
} |
} |
|
|
|
|
int |
int |
main(int ac, char **av) |
main(int ac, char **av) |
{ |
{ |
char dotsshdir[16 * 1024], comment[1024], *passphrase1, *passphrase2; |
char dotsshdir[MAXPATHLEN], comment[1024], *passphrase1, *passphrase2; |
|
char *reader_id = NULL; |
Key *private, *public; |
Key *private, *public; |
struct passwd *pw; |
struct passwd *pw; |
int opt, type, fd, reader = -1; |
|
struct stat st; |
struct stat st; |
|
int opt, type, fd, download = 0; |
FILE *f; |
FILE *f; |
|
|
extern int optind; |
extern int optind; |
|
|
exit(1); |
exit(1); |
} |
} |
|
|
while ((opt = getopt(ac, av, "deiqpclBRxXyb:f:t:u:P:N:C:")) != -1) { |
while ((opt = getopt(ac, av, "deiqpclBRxXyb:f:t:U:D:P:N:C:")) != -1) { |
switch (opt) { |
switch (opt) { |
case 'b': |
case 'b': |
bits = atoi(optarg); |
bits = atoi(optarg); |
|
|
case 't': |
case 't': |
key_type_name = optarg; |
key_type_name = optarg; |
break; |
break; |
case 'u': |
case 'D': |
reader = atoi(optarg); /*XXX*/ |
download = 1; |
|
case 'U': |
|
reader_id = optarg; |
break; |
break; |
case '?': |
case '?': |
default: |
default: |
|
|
printf("Too many arguments.\n"); |
printf("Too many arguments.\n"); |
usage(); |
usage(); |
} |
} |
|
if (key_type_name == NULL) { |
|
printf("You must specify a key type (-t).\n"); |
|
usage(); |
|
} |
if (change_passphrase && change_comment) { |
if (change_passphrase && change_comment) { |
printf("Can only have one of -p and -c.\n"); |
printf("Can only have one of -p and -c.\n"); |
usage(); |
usage(); |
|
|
do_convert_from_ssh2(pw); |
do_convert_from_ssh2(pw); |
if (print_public) |
if (print_public) |
do_print_public(pw); |
do_print_public(pw); |
if (reader != -1) |
if (reader_id != NULL) { |
do_upload(pw, reader); |
#ifdef SMARTCARD |
|
if (download) |
|
do_download(pw, reader_id); |
|
else |
|
do_upload(pw, reader_id); |
|
#else /* SMARTCARD */ |
|
fatal("no support for smartcards."); |
|
#endif /* SMARTCARD */ |
|
} |
|
|
arc4random_stir(); |
arc4random_stir(); |
|
|