version 1.61, 2001/05/25 14:37:32 |
version 1.79, 2001/08/02 16:14:05 |
|
|
#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; |
|
|
|
|
|
|
char hostname[MAXHOSTNAMELEN]; |
char hostname[MAXHOSTNAMELEN]; |
|
|
void |
static void |
ask_filename(struct passwd *pw, const char *prompt) |
ask_filename(struct passwd *pw, const char *prompt) |
{ |
{ |
char buf[1024]; |
char buf[1024]; |
|
|
have_identity = 1; |
have_identity = 1; |
} |
} |
|
|
Key * |
static Key * |
load_identity(char *filename) |
load_identity(char *filename) |
{ |
{ |
char *pass; |
char *pass; |
|
|
if (identity_passphrase) |
if (identity_passphrase) |
pass = xstrdup(identity_passphrase); |
pass = xstrdup(identity_passphrase); |
else |
else |
pass = read_passphrase("Enter passphrase: ", 1); |
pass = read_passphrase("Enter passphrase: ", |
|
RP_ALLOW_STDIN); |
prv = key_load_private(filename, pass, NULL); |
prv = key_load_private(filename, pass, NULL); |
memset(pass, 0, strlen(pass)); |
memset(pass, 0, strlen(pass)); |
xfree(pass); |
xfree(pass); |
|
|
#define SSH_COM_PRIVATE_BEGIN "---- BEGIN SSH2 ENCRYPTED PRIVATE 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 |
static void |
do_convert_to_ssh2(struct passwd *pw) |
do_convert_to_ssh2(struct passwd *pw) |
{ |
{ |
Key *k; |
Key *k; |
|
|
exit(0); |
exit(0); |
} |
} |
|
|
void |
static void |
buffer_get_bignum_bits(Buffer *b, BIGNUM *value) |
buffer_get_bignum_bits(Buffer *b, BIGNUM *value) |
{ |
{ |
int bits = buffer_get_int(b); |
int bits = buffer_get_int(b); |
|
|
buffer_consume(b, bytes); |
buffer_consume(b, bytes); |
} |
} |
|
|
Key * |
static Key * |
do_convert_private_ssh2_from_blob(char *blob, int blen) |
do_convert_private_ssh2_from_blob(char *blob, int blen) |
{ |
{ |
Buffer b; |
Buffer b; |
Key *key = NULL; |
Key *key = NULL; |
int ignore, magic, rlen, ktype; |
|
char *type, *cipher; |
char *type, *cipher; |
|
u_char *sig, data[] = "abcde12345"; |
|
int magic, rlen, ktype, i1, i2, i3, i4; |
|
u_int slen; |
|
u_long e; |
|
|
buffer_init(&b); |
buffer_init(&b); |
buffer_append(&b, blob, blen); |
buffer_append(&b, blob, blen); |
|
|
buffer_free(&b); |
buffer_free(&b); |
return NULL; |
return NULL; |
} |
} |
ignore = buffer_get_int(&b); |
i1 = buffer_get_int(&b); |
type = buffer_get_string(&b, NULL); |
type = buffer_get_string(&b, NULL); |
cipher = buffer_get_string(&b, NULL); |
cipher = buffer_get_string(&b, NULL); |
ignore = buffer_get_int(&b); |
i2 = buffer_get_int(&b); |
ignore = buffer_get_int(&b); |
i3 = buffer_get_int(&b); |
ignore = buffer_get_int(&b); |
i4 = buffer_get_int(&b); |
|
debug("ignore (%d %d %d %d)", i1,i2,i3,i4); |
if (strcmp(cipher, "none") != 0) { |
if (strcmp(cipher, "none") != 0) { |
error("unsupported cipher %s", cipher); |
error("unsupported cipher %s", cipher); |
xfree(cipher); |
xfree(cipher); |
|
|
buffer_get_bignum_bits(&b, key->dsa->priv_key); |
buffer_get_bignum_bits(&b, key->dsa->priv_key); |
break; |
break; |
case KEY_RSA: |
case KEY_RSA: |
if (!BN_set_word(key->rsa->e, (u_long) buffer_get_char(&b))) { |
e = buffer_get_char(&b); |
|
debug("e %lx", e); |
|
if (e < 30) { |
|
e <<= 8; |
|
e += buffer_get_char(&b); |
|
debug("e %lx", e); |
|
e <<= 8; |
|
e += buffer_get_char(&b); |
|
debug("e %lx", e); |
|
} |
|
if (!BN_set_word(key->rsa->e, e)) { |
buffer_free(&b); |
buffer_free(&b); |
key_free(key); |
key_free(key); |
return NULL; |
return NULL; |
|
|
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); |
|
|
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); |
#ifdef DEBUG_PK |
|
{ |
|
u_int slen; |
|
u_char *sig, data[10] = "abcde12345"; |
|
|
|
key_sign(key, &sig, &slen, data, sizeof data); |
/* try the key */ |
key_verify(key, sig, slen, data, sizeof data); |
key_sign(key, &sig, &slen, data, sizeof(data)); |
xfree(sig); |
key_verify(key, sig, slen, data, sizeof(data)); |
} |
xfree(sig); |
#endif |
|
return key; |
return key; |
} |
} |
|
|
void |
static void |
do_convert_from_ssh2(struct passwd *pw) |
do_convert_from_ssh2(struct passwd *pw) |
{ |
{ |
Key *k; |
Key *k; |
|
|
strstr(line, ": ") != NULL) { |
strstr(line, ": ") != NULL) { |
if (strstr(line, SSH_COM_PRIVATE_BEGIN) != NULL) |
if (strstr(line, SSH_COM_PRIVATE_BEGIN) != NULL) |
private = 1; |
private = 1; |
|
if (strstr(line, " END ") != NULL) { |
|
break; |
|
} |
/* fprintf(stderr, "ignore: %s", line); */ |
/* fprintf(stderr, "ignore: %s", line); */ |
continue; |
continue; |
} |
} |
|
|
exit(0); |
exit(0); |
} |
} |
|
|
void |
static void |
do_print_public(struct passwd *pw) |
do_print_public(struct passwd *pw) |
{ |
{ |
Key *prv; |
Key *prv; |
|
|
exit(0); |
exit(0); |
} |
} |
|
|
void |
#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); \ |
|
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) |
|
{ |
|
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]; |
|
int len, status = 1, i, fd = -1, ret; |
|
int sw = 0, 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) { |
|
perror(identity_file); |
|
goto done; |
|
} |
|
prv = load_identity(identity_file); |
|
if (prv == NULL) { |
|
error("load failed"); |
|
goto done; |
|
} |
|
COPY_RSA_KEY(q, 0); |
|
COPY_RSA_KEY(p, 1); |
|
COPY_RSA_KEY(iqmp, 2); |
|
COPY_RSA_KEY(dmq1, 3); |
|
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)); |
|
goto done; |
|
} |
|
if (! sectok_cardpresent(fd)) { |
|
error("smartcard in reader %s not present", |
|
sc_reader_id); |
|
goto done; |
|
} |
|
ret = sectok_reset(fd, 0, NULL, &sw); |
|
if (ret <= 0) { |
|
error("sectok_reset failed: %s", sectok_get_sw(sw)); |
|
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)); |
|
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)); |
|
goto done; |
|
} |
|
if (!sectok_swOK(sw)) |
|
goto done; |
|
log("cyberflex_load_rsa_pub done"); |
|
status = 0; |
|
log("loading key done"); |
|
done: |
|
if (prv) |
|
key_free(prv); |
|
for (i = 0; i < NUM_RSA_KEY_ELEMENTS; i++) |
|
if (elements[i]) |
|
xfree(elements[i]); |
|
if (fd != -1) |
|
sectok_close(fd); |
|
exit(status); |
|
} |
|
|
|
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; |
|
|
* Perform changing a passphrase. The argument is the passwd structure |
* Perform changing a passphrase. The argument is the passwd structure |
* for the current user. |
* for the current user. |
*/ |
*/ |
void |
static void |
do_change_passphrase(struct passwd *pw) |
do_change_passphrase(struct passwd *pw) |
{ |
{ |
char *comment; |
char *comment; |
|
|
if (identity_passphrase) |
if (identity_passphrase) |
old_passphrase = xstrdup(identity_passphrase); |
old_passphrase = xstrdup(identity_passphrase); |
else |
else |
old_passphrase = read_passphrase("Enter old passphrase: ", 1); |
old_passphrase = |
private = key_load_private(identity_file, old_passphrase , &comment); |
read_passphrase("Enter old passphrase: ", |
|
RP_ALLOW_STDIN); |
|
private = key_load_private(identity_file, old_passphrase, |
|
&comment); |
memset(old_passphrase, 0, strlen(old_passphrase)); |
memset(old_passphrase, 0, strlen(old_passphrase)); |
xfree(old_passphrase); |
xfree(old_passphrase); |
if (private == NULL) { |
if (private == NULL) { |
|
|
passphrase2 = NULL; |
passphrase2 = NULL; |
} else { |
} else { |
passphrase1 = |
passphrase1 = |
read_passphrase("Enter new passphrase (empty for no passphrase): ", 1); |
read_passphrase("Enter new passphrase (empty for no " |
passphrase2 = read_passphrase("Enter same passphrase again: ", 1); |
"passphrase): ", RP_ALLOW_STDIN); |
|
passphrase2 = read_passphrase("Enter same passphrase again: ", |
|
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) { |
|
|
/* |
/* |
* Change the comment of a private key file. |
* Change the comment of a private key file. |
*/ |
*/ |
void |
static void |
do_change_comment(struct passwd *pw) |
do_change_comment(struct passwd *pw) |
{ |
{ |
char new_comment[1024], *comment, *passphrase; |
char new_comment[1024], *comment, *passphrase; |
|
|
else if (identity_new_passphrase) |
else if (identity_new_passphrase) |
passphrase = xstrdup(identity_new_passphrase); |
passphrase = xstrdup(identity_new_passphrase); |
else |
else |
passphrase = read_passphrase("Enter passphrase: ", 1); |
passphrase = read_passphrase("Enter passphrase: ", |
|
RP_ALLOW_STDIN); |
/* Try to load using the passphrase. */ |
/* Try to load using the passphrase. */ |
private = key_load_private(identity_file, passphrase, &comment); |
private = key_load_private(identity_file, passphrase, &comment); |
if (private == NULL) { |
if (private == NULL) { |
|
|
exit(0); |
exit(0); |
} |
} |
|
|
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); |
} |
} |
|
|
|
|
main(int ac, char **av) |
main(int ac, char **av) |
{ |
{ |
char dotsshdir[16 * 1024], comment[1024], *passphrase1, *passphrase2; |
char dotsshdir[16 * 1024], comment[1024], *passphrase1, *passphrase2; |
|
char *reader_id = NULL; |
Key *private, *public; |
Key *private, *public; |
struct passwd *pw; |
struct passwd *pw; |
int opt, type, fd; |
|
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: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); |
|
|
exit(1); |
exit(1); |
} |
} |
break; |
break; |
|
|
case 'l': |
case 'l': |
print_fingerprint = 1; |
print_fingerprint = 1; |
break; |
break; |
|
|
case 'B': |
case 'B': |
print_bubblebabble = 1; |
print_bubblebabble = 1; |
break; |
break; |
|
|
case 'p': |
case 'p': |
change_passphrase = 1; |
change_passphrase = 1; |
break; |
break; |
|
|
case 'c': |
case 'c': |
change_comment = 1; |
change_comment = 1; |
break; |
break; |
|
|
case 'f': |
case 'f': |
strlcpy(identity_file, optarg, sizeof(identity_file)); |
strlcpy(identity_file, optarg, sizeof(identity_file)); |
have_identity = 1; |
have_identity = 1; |
break; |
break; |
|
|
case 'P': |
case 'P': |
identity_passphrase = optarg; |
identity_passphrase = optarg; |
break; |
break; |
|
|
case 'N': |
case 'N': |
identity_new_passphrase = optarg; |
identity_new_passphrase = optarg; |
break; |
break; |
|
|
case 'C': |
case 'C': |
identity_comment = optarg; |
identity_comment = optarg; |
break; |
break; |
|
|
case 'q': |
case 'q': |
quiet = 1; |
quiet = 1; |
break; |
break; |
|
|
case 'R': |
case 'R': |
/* unused */ |
/* unused */ |
exit(0); |
exit(0); |
break; |
break; |
|
|
case 'e': |
case 'e': |
case 'x': |
case 'x': |
/* export key */ |
/* export key */ |
convert_to_ssh2 = 1; |
convert_to_ssh2 = 1; |
break; |
break; |
|
|
case 'i': |
case 'i': |
case 'X': |
case 'X': |
/* import key */ |
/* import key */ |
convert_from_ssh2 = 1; |
convert_from_ssh2 = 1; |
break; |
break; |
|
|
case 'y': |
case 'y': |
print_public = 1; |
print_public = 1; |
break; |
break; |
|
|
case 'd': |
case 'd': |
key_type_name = "dsa"; |
key_type_name = "dsa"; |
break; |
break; |
|
|
case 't': |
case 't': |
key_type_name = optarg; |
key_type_name = optarg; |
break; |
break; |
|
case 'D': |
|
download = 1; |
|
case 'U': |
|
reader_id = optarg; |
|
break; |
case '?': |
case '?': |
default: |
default: |
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_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 */ |
|
} |
|
|
arc4random_stir(); |
arc4random_stir(); |
|
|
|
|
else { |
else { |
passphrase_again: |
passphrase_again: |
passphrase1 = |
passphrase1 = |
read_passphrase("Enter passphrase (empty for no passphrase): ", 1); |
read_passphrase("Enter passphrase (empty for no " |
passphrase2 = read_passphrase("Enter same passphrase again: ", 1); |
"passphrase): ", RP_ALLOW_STDIN); |
|
passphrase2 = read_passphrase("Enter same passphrase again: ", |
|
RP_ALLOW_STDIN); |
if (strcmp(passphrase1, passphrase2) != 0) { |
if (strcmp(passphrase1, passphrase2) != 0) { |
/* The passphrases do not match. Clear them and retry. */ |
/* |
|
* The passphrases do not match. Clear them and |
|
* retry. |
|
*/ |
memset(passphrase1, 0, strlen(passphrase1)); |
memset(passphrase1, 0, strlen(passphrase1)); |
memset(passphrase2, 0, strlen(passphrase2)); |
memset(passphrase2, 0, strlen(passphrase2)); |
xfree(passphrase1); |
xfree(passphrase1); |