version 1.196, 2010/08/04 05:40:39 |
version 1.247, 2014/06/24 01:13:21 |
|
|
#include "match.h" |
#include "match.h" |
#include "hostfile.h" |
#include "hostfile.h" |
#include "dns.h" |
#include "dns.h" |
|
#include "ssh.h" |
#include "ssh2.h" |
#include "ssh2.h" |
|
#include "atomicio.h" |
|
#include "krl.h" |
|
|
#ifdef ENABLE_PKCS11 |
#ifdef ENABLE_PKCS11 |
#include "ssh-pkcs11.h" |
#include "ssh-pkcs11.h" |
|
|
/* Number of bits in the RSA/DSA key. This value can be set on the command line. */ |
/* Number of bits in the RSA/DSA key. This value can be set on the command line. */ |
#define DEFAULT_BITS 2048 |
#define DEFAULT_BITS 2048 |
#define DEFAULT_BITS_DSA 1024 |
#define DEFAULT_BITS_DSA 1024 |
|
#define DEFAULT_BITS_ECDSA 256 |
u_int32_t bits = 0; |
u_int32_t bits = 0; |
|
|
/* |
/* |
|
|
char *ca_key_path = NULL; |
char *ca_key_path = NULL; |
|
|
/* Certificate serial number */ |
/* Certificate serial number */ |
long long cert_serial = 0; |
unsigned long long cert_serial = 0; |
|
|
/* Key type when certifying */ |
/* Key type when certifying */ |
u_int cert_key_type = SSH2_CERT_TYPE_USER; |
u_int cert_key_type = SSH2_CERT_TYPE_USER; |
|
|
|
|
char *key_type_name = NULL; |
char *key_type_name = NULL; |
|
|
|
/* Load key from this PKCS#11 provider */ |
|
char *pkcs11provider = NULL; |
|
|
|
/* Use new OpenSSH private key format when writing SSH2 keys instead of PEM */ |
|
int use_new_format = 0; |
|
|
|
/* Cipher for new-format private keys */ |
|
char *new_format_cipher = NULL; |
|
|
|
/* |
|
* Number of KDF rounds to derive new format keys / |
|
* number of primality trials when screening moduli. |
|
*/ |
|
int rounds = 0; |
|
|
/* argv0 */ |
/* argv0 */ |
extern char *__progname; |
extern char *__progname; |
|
|
|
|
|
|
/* moduli.c */ |
/* moduli.c */ |
int gen_candidates(FILE *, u_int32_t, u_int32_t, BIGNUM *); |
int gen_candidates(FILE *, u_int32_t, u_int32_t, BIGNUM *); |
int prime_test(FILE *, FILE *, u_int32_t, u_int32_t); |
int prime_test(FILE *, FILE *, u_int32_t, u_int32_t, char *, unsigned long, |
|
unsigned long); |
|
|
static void |
static void |
|
type_bits_valid(int type, u_int32_t *bitsp) |
|
{ |
|
u_int maxbits; |
|
|
|
if (type == KEY_UNSPEC) { |
|
fprintf(stderr, "unknown key type %s\n", key_type_name); |
|
exit(1); |
|
} |
|
if (*bitsp == 0) { |
|
if (type == KEY_DSA) |
|
*bitsp = DEFAULT_BITS_DSA; |
|
else if (type == KEY_ECDSA) |
|
*bitsp = DEFAULT_BITS_ECDSA; |
|
else |
|
*bitsp = DEFAULT_BITS; |
|
} |
|
maxbits = (type == KEY_DSA) ? |
|
OPENSSL_DSA_MAX_MODULUS_BITS : OPENSSL_RSA_MAX_MODULUS_BITS; |
|
if (*bitsp > maxbits) { |
|
fprintf(stderr, "key bits exceeds maximum %d\n", maxbits); |
|
exit(1); |
|
} |
|
#ifdef WITH_OPENSSL |
|
if (type == KEY_DSA && *bitsp != 1024) |
|
fatal("DSA keys must be 1024 bits"); |
|
else if (type != KEY_ECDSA && type != KEY_ED25519 && *bitsp < 768) |
|
fatal("Key must at least be 768 bits"); |
|
else if (type == KEY_ECDSA && key_ecdsa_bits_to_nid(*bitsp) == -1) |
|
fatal("Invalid ECDSA key length - valid lengths are " |
|
"256, 384 or 521 bits"); |
|
#endif |
|
} |
|
|
|
static void |
ask_filename(struct passwd *pw, const char *prompt) |
ask_filename(struct passwd *pw, const char *prompt) |
{ |
{ |
char buf[1024]; |
char buf[1024]; |
|
|
case KEY_DSA: |
case KEY_DSA: |
name = _PATH_SSH_CLIENT_ID_DSA; |
name = _PATH_SSH_CLIENT_ID_DSA; |
break; |
break; |
|
case KEY_ECDSA_CERT: |
|
case KEY_ECDSA: |
|
name = _PATH_SSH_CLIENT_ID_ECDSA; |
|
break; |
case KEY_RSA_CERT: |
case KEY_RSA_CERT: |
case KEY_RSA_CERT_V00: |
case KEY_RSA_CERT_V00: |
case KEY_RSA: |
case KEY_RSA: |
name = _PATH_SSH_CLIENT_ID_RSA; |
name = _PATH_SSH_CLIENT_ID_RSA; |
break; |
break; |
|
case KEY_ED25519: |
|
case KEY_ED25519_CERT: |
|
name = _PATH_SSH_CLIENT_ID_ED25519; |
|
break; |
default: |
default: |
fprintf(stderr, "bad key type\n"); |
fprintf(stderr, "bad key type\n"); |
exit(1); |
exit(1); |
|
|
pass = read_passphrase("Enter passphrase: ", |
pass = read_passphrase("Enter passphrase: ", |
RP_ALLOW_STDIN); |
RP_ALLOW_STDIN); |
prv = key_load_private(filename, pass, NULL); |
prv = key_load_private(filename, pass, NULL); |
memset(pass, 0, strlen(pass)); |
explicit_bzero(pass, strlen(pass)); |
xfree(pass); |
free(pass); |
} |
} |
return prv; |
return prv; |
} |
} |
|
|
#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 |
|
|
|
#ifdef WITH_OPENSSL |
static void |
static void |
do_convert_to_ssh2(struct passwd *pw, Key *k) |
do_convert_to_ssh2(struct passwd *pw, Key *k) |
{ |
{ |
|
|
u_char *blob; |
u_char *blob; |
char comment[61]; |
char comment[61]; |
|
|
|
if (k->type == KEY_RSA1) { |
|
fprintf(stderr, "version 1 keys are not supported\n"); |
|
exit(1); |
|
} |
if (key_to_blob(k, &blob, &len) <= 0) { |
if (key_to_blob(k, &blob, &len) <= 0) { |
fprintf(stderr, "key_to_blob failed\n"); |
fprintf(stderr, "key_to_blob failed\n"); |
exit(1); |
exit(1); |
|
|
dump_base64(stdout, blob, len); |
dump_base64(stdout, blob, len); |
fprintf(stdout, "%s\n", SSH_COM_PUBLIC_END); |
fprintf(stdout, "%s\n", SSH_COM_PUBLIC_END); |
key_free(k); |
key_free(k); |
xfree(blob); |
free(blob); |
exit(0); |
exit(0); |
} |
} |
|
|
|
|
do_convert_to_pkcs8(Key *k) |
do_convert_to_pkcs8(Key *k) |
{ |
{ |
switch (key_type_plain(k->type)) { |
switch (key_type_plain(k->type)) { |
|
case KEY_RSA1: |
case KEY_RSA: |
case KEY_RSA: |
if (!PEM_write_RSA_PUBKEY(stdout, k->rsa)) |
if (!PEM_write_RSA_PUBKEY(stdout, k->rsa)) |
fatal("PEM_write_RSA_PUBKEY failed"); |
fatal("PEM_write_RSA_PUBKEY failed"); |
|
|
if (!PEM_write_DSA_PUBKEY(stdout, k->dsa)) |
if (!PEM_write_DSA_PUBKEY(stdout, k->dsa)) |
fatal("PEM_write_DSA_PUBKEY failed"); |
fatal("PEM_write_DSA_PUBKEY failed"); |
break; |
break; |
|
case KEY_ECDSA: |
|
if (!PEM_write_EC_PUBKEY(stdout, k->ecdsa)) |
|
fatal("PEM_write_EC_PUBKEY failed"); |
|
break; |
default: |
default: |
fatal("%s: unsupported key type %s", __func__, key_type(k)); |
fatal("%s: unsupported key type %s", __func__, key_type(k)); |
} |
} |
|
|
do_convert_to_pem(Key *k) |
do_convert_to_pem(Key *k) |
{ |
{ |
switch (key_type_plain(k->type)) { |
switch (key_type_plain(k->type)) { |
|
case KEY_RSA1: |
case KEY_RSA: |
case KEY_RSA: |
if (!PEM_write_RSAPublicKey(stdout, k->rsa)) |
if (!PEM_write_RSAPublicKey(stdout, k->rsa)) |
fatal("PEM_write_RSAPublicKey failed"); |
fatal("PEM_write_RSAPublicKey failed"); |
|
|
fatal("PEM_write_DSAPublicKey failed"); |
fatal("PEM_write_DSAPublicKey failed"); |
break; |
break; |
#endif |
#endif |
|
/* XXX ECDSA? */ |
default: |
default: |
fatal("%s: unsupported key type %s", __func__, key_type(k)); |
fatal("%s: unsupported key type %s", __func__, key_type(k)); |
} |
} |
|
|
exit(1); |
exit(1); |
} |
} |
} |
} |
if (k->type == KEY_RSA1) { |
|
fprintf(stderr, "version 1 keys are not supported\n"); |
|
exit(1); |
|
} |
|
|
|
switch (convert_format) { |
switch (convert_format) { |
case FMT_RFC4716: |
case FMT_RFC4716: |
|
|
Buffer b; |
Buffer b; |
Key *key = NULL; |
Key *key = NULL; |
char *type, *cipher; |
char *type, *cipher; |
u_char *sig, data[] = "abcde12345"; |
u_char *sig = NULL, 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; |
|
|
debug("ignore (%d %d %d %d)", i1, i2, i3, i4); |
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); |
free(cipher); |
buffer_free(&b); |
buffer_free(&b); |
xfree(type); |
free(type); |
return NULL; |
return NULL; |
} |
} |
xfree(cipher); |
free(cipher); |
|
|
if (strstr(type, "dsa")) { |
if (strstr(type, "dsa")) { |
ktype = KEY_DSA; |
ktype = KEY_DSA; |
|
|
ktype = KEY_RSA; |
ktype = KEY_RSA; |
} else { |
} else { |
buffer_free(&b); |
buffer_free(&b); |
xfree(type); |
free(type); |
return NULL; |
return NULL; |
} |
} |
key = key_new_private(ktype); |
key = key_new_private(ktype); |
xfree(type); |
free(type); |
|
|
switch (key->type) { |
switch (key->type) { |
case KEY_DSA: |
case KEY_DSA: |
|
|
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); |
rsa_generate_additional_parameters(key->rsa); |
if (rsa_generate_additional_parameters(key->rsa) != 0) |
|
fatal("%s: rsa_generate_additional_parameters " |
|
"error", __func__); |
break; |
break; |
} |
} |
rlen = buffer_len(&b); |
rlen = buffer_len(&b); |
|
|
/* try the key */ |
/* try the key */ |
key_sign(key, &sig, &slen, data, sizeof(data)); |
key_sign(key, &sig, &slen, data, sizeof(data)); |
key_verify(key, sig, slen, data, sizeof(data)); |
key_verify(key, sig, slen, data, sizeof(data)); |
xfree(sig); |
free(sig); |
return key; |
return key; |
} |
} |
|
|
|
|
fatal("%s: %s: %s", __progname, identity_file, strerror(errno)); |
fatal("%s: %s: %s", __progname, identity_file, strerror(errno)); |
encoded[0] = '\0'; |
encoded[0] = '\0'; |
while ((blen = get_line(fp, line, sizeof(line))) != -1) { |
while ((blen = get_line(fp, line, sizeof(line))) != -1) { |
if (line[blen - 1] == '\\') |
if (blen > 0 && line[blen - 1] == '\\') |
escaped++; |
escaped++; |
if (strncmp(line, "----", 4) == 0 || |
if (strncmp(line, "----", 4) == 0 || |
strstr(line, ": ") != NULL) { |
strstr(line, ": ") != NULL) { |
|
|
(*k)->type = KEY_DSA; |
(*k)->type = KEY_DSA; |
(*k)->dsa = EVP_PKEY_get1_DSA(pubkey); |
(*k)->dsa = EVP_PKEY_get1_DSA(pubkey); |
break; |
break; |
|
case EVP_PKEY_EC: |
|
*k = key_new(KEY_UNSPEC); |
|
(*k)->type = KEY_ECDSA; |
|
(*k)->ecdsa = EVP_PKEY_get1_EC_KEY(pubkey); |
|
(*k)->ecdsa_nid = key_ecdsa_key_to_nid((*k)->ecdsa); |
|
break; |
default: |
default: |
fatal("%s: unsupported pubkey type %d", __func__, |
fatal("%s: unsupported pubkey type %d", __func__, |
EVP_PKEY_type(pubkey->type)); |
EVP_PKEY_type(pubkey->type)); |
|
|
fclose(fp); |
fclose(fp); |
return; |
return; |
} |
} |
|
/* XXX ECDSA */ |
#endif |
#endif |
fatal("%s: unrecognised raw private key format", __func__); |
fatal("%s: unrecognised raw private key format", __func__); |
} |
} |
|
|
ok = PEM_write_DSAPrivateKey(stdout, k->dsa, NULL, |
ok = PEM_write_DSAPrivateKey(stdout, k->dsa, NULL, |
NULL, 0, NULL, NULL); |
NULL, 0, NULL, NULL); |
break; |
break; |
|
case KEY_ECDSA: |
|
ok = PEM_write_ECPrivateKey(stdout, k->ecdsa, NULL, |
|
NULL, 0, NULL, NULL); |
|
break; |
case KEY_RSA: |
case KEY_RSA: |
ok = PEM_write_RSAPrivateKey(stdout, k->rsa, NULL, |
ok = PEM_write_RSAPrivateKey(stdout, k->rsa, NULL, |
NULL, 0, NULL, NULL); |
NULL, 0, NULL, NULL); |
|
|
key_free(k); |
key_free(k); |
exit(0); |
exit(0); |
} |
} |
|
#endif |
|
|
static void |
static void |
do_print_public(struct passwd *pw) |
do_print_public(struct passwd *pw) |
|
|
} |
} |
|
|
static void |
static void |
do_download(struct passwd *pw, char *pkcs11provider) |
do_download(struct passwd *pw) |
{ |
{ |
#ifdef ENABLE_PKCS11 |
#ifdef ENABLE_PKCS11 |
Key **keys = NULL; |
Key **keys = NULL; |
int i, nkeys; |
int i, nkeys; |
|
enum fp_rep rep; |
|
enum fp_type fptype; |
|
char *fp, *ra; |
|
|
|
fptype = print_bubblebabble ? SSH_FP_SHA1 : SSH_FP_MD5; |
|
rep = print_bubblebabble ? SSH_FP_BUBBLEBABBLE : SSH_FP_HEX; |
|
|
pkcs11_init(0); |
pkcs11_init(0); |
nkeys = pkcs11_add_provider(pkcs11provider, NULL, &keys); |
nkeys = pkcs11_add_provider(pkcs11provider, NULL, &keys); |
if (nkeys <= 0) |
if (nkeys <= 0) |
fatal("cannot read public key from pkcs11"); |
fatal("cannot read public key from pkcs11"); |
for (i = 0; i < nkeys; i++) { |
for (i = 0; i < nkeys; i++) { |
key_write(keys[i], stdout); |
if (print_fingerprint) { |
|
fp = key_fingerprint(keys[i], fptype, rep); |
|
ra = key_fingerprint(keys[i], SSH_FP_MD5, |
|
SSH_FP_RANDOMART); |
|
printf("%u %s %s (PKCS11 key)\n", key_size(keys[i]), |
|
fp, key_type(keys[i])); |
|
if (log_level >= SYSLOG_LEVEL_VERBOSE) |
|
printf("%s\n", ra); |
|
free(ra); |
|
free(fp); |
|
} else { |
|
key_write(keys[i], stdout); |
|
fprintf(stdout, "\n"); |
|
} |
key_free(keys[i]); |
key_free(keys[i]); |
fprintf(stdout, "\n"); |
|
} |
} |
xfree(keys); |
free(keys); |
pkcs11_terminate(); |
pkcs11_terminate(); |
exit(0); |
exit(0); |
#else |
#else |
|
|
if (log_level >= SYSLOG_LEVEL_VERBOSE) |
if (log_level >= SYSLOG_LEVEL_VERBOSE) |
printf("%s\n", ra); |
printf("%s\n", ra); |
key_free(public); |
key_free(public); |
xfree(comment); |
free(comment); |
xfree(ra); |
free(ra); |
xfree(fp); |
free(fp); |
exit(0); |
exit(0); |
} |
} |
if (comment) { |
if (comment) { |
xfree(comment); |
free(comment); |
comment = NULL; |
comment = NULL; |
} |
} |
|
|
|
|
comment ? comment : "no comment", key_type(public)); |
comment ? comment : "no comment", key_type(public)); |
if (log_level >= SYSLOG_LEVEL_VERBOSE) |
if (log_level >= SYSLOG_LEVEL_VERBOSE) |
printf("%s\n", ra); |
printf("%s\n", ra); |
xfree(ra); |
free(ra); |
xfree(fp); |
free(fp); |
key_free(public); |
key_free(public); |
invalid = 0; |
invalid = 0; |
} |
} |
|
|
} |
} |
|
|
static void |
static void |
|
do_gen_all_hostkeys(struct passwd *pw) |
|
{ |
|
struct { |
|
char *key_type; |
|
char *key_type_display; |
|
char *path; |
|
} key_types[] = { |
|
{ "rsa1", "RSA1", _PATH_HOST_KEY_FILE }, |
|
{ "rsa", "RSA" ,_PATH_HOST_RSA_KEY_FILE }, |
|
{ "dsa", "DSA", _PATH_HOST_DSA_KEY_FILE }, |
|
{ "ecdsa", "ECDSA",_PATH_HOST_ECDSA_KEY_FILE }, |
|
{ "ed25519", "ED25519",_PATH_HOST_ED25519_KEY_FILE }, |
|
{ NULL, NULL, NULL } |
|
}; |
|
|
|
int first = 0; |
|
struct stat st; |
|
Key *private, *public; |
|
char comment[1024]; |
|
int i, type, fd; |
|
FILE *f; |
|
|
|
for (i = 0; key_types[i].key_type; i++) { |
|
if (stat(key_types[i].path, &st) == 0) |
|
continue; |
|
if (errno != ENOENT) { |
|
printf("Could not stat %s: %s", key_types[i].path, |
|
strerror(errno)); |
|
first = 0; |
|
continue; |
|
} |
|
|
|
if (first == 0) { |
|
first = 1; |
|
printf("%s: generating new host keys: ", __progname); |
|
} |
|
printf("%s ", key_types[i].key_type_display); |
|
fflush(stdout); |
|
type = key_type_from_name(key_types[i].key_type); |
|
strlcpy(identity_file, key_types[i].path, sizeof(identity_file)); |
|
bits = 0; |
|
type_bits_valid(type, &bits); |
|
private = key_generate(type, bits); |
|
if (private == NULL) { |
|
fprintf(stderr, "key_generate failed\n"); |
|
first = 0; |
|
continue; |
|
} |
|
public = key_from_private(private); |
|
snprintf(comment, sizeof comment, "%s@%s", pw->pw_name, |
|
hostname); |
|
if (!key_save_private(private, identity_file, "", comment, |
|
use_new_format, new_format_cipher, rounds)) { |
|
printf("Saving the key failed: %s.\n", identity_file); |
|
key_free(private); |
|
key_free(public); |
|
first = 0; |
|
continue; |
|
} |
|
key_free(private); |
|
strlcat(identity_file, ".pub", sizeof(identity_file)); |
|
fd = open(identity_file, O_WRONLY | O_CREAT | O_TRUNC, 0644); |
|
if (fd == -1) { |
|
printf("Could not save your public key in %s\n", |
|
identity_file); |
|
key_free(public); |
|
first = 0; |
|
continue; |
|
} |
|
f = fdopen(fd, "w"); |
|
if (f == NULL) { |
|
printf("fdopen %s failed\n", identity_file); |
|
key_free(public); |
|
first = 0; |
|
continue; |
|
} |
|
if (!key_write(public, f)) { |
|
fprintf(stderr, "write key failed\n"); |
|
key_free(public); |
|
first = 0; |
|
continue; |
|
} |
|
fprintf(f, " %s\n", comment); |
|
fclose(f); |
|
key_free(public); |
|
|
|
} |
|
if (first != 0) |
|
printf("\n"); |
|
} |
|
|
|
static void |
printhost(FILE *f, const char *name, Key *public, int ca, int hash) |
printhost(FILE *f, const char *name, Key *public, int ca, int hash) |
{ |
{ |
if (print_fingerprint) { |
if (print_fingerprint) { |
|
|
key_type(public)); |
key_type(public)); |
if (log_level >= SYSLOG_LEVEL_VERBOSE) |
if (log_level >= SYSLOG_LEVEL_VERBOSE) |
printf("%s\n", ra); |
printf("%s\n", ra); |
xfree(ra); |
free(ra); |
xfree(fp); |
free(fp); |
} else { |
} else { |
if (hash && (name = host_hash(name, NULL, 0)) == NULL) |
if (hash && (name = host_hash(name, NULL, 0)) == NULL) |
fatal("hash_host failed"); |
fatal("hash_host failed"); |
|
|
char line[16*1024], tmp[MAXPATHLEN], old[MAXPATHLEN]; |
char line[16*1024], tmp[MAXPATHLEN], old[MAXPATHLEN]; |
int c, skip = 0, inplace = 0, num = 0, invalid = 0, has_unhashed = 0; |
int c, skip = 0, inplace = 0, num = 0, invalid = 0, has_unhashed = 0; |
int ca; |
int ca; |
|
int found_key = 0; |
|
|
if (!have_identity) { |
if (!have_identity) { |
cp = tilde_expand_filename(_PATH_SSH_USER_HOSTFILE, pw->pw_uid); |
cp = tilde_expand_filename(_PATH_SSH_USER_HOSTFILE, pw->pw_uid); |
if (strlcpy(identity_file, cp, sizeof(identity_file)) >= |
if (strlcpy(identity_file, cp, sizeof(identity_file)) >= |
sizeof(identity_file)) |
sizeof(identity_file)) |
fatal("Specified known hosts path too long"); |
fatal("Specified known hosts path too long"); |
xfree(cp); |
free(cp); |
have_identity = 1; |
have_identity = 1; |
} |
} |
if ((in = fopen(identity_file, "r")) == NULL) |
if ((in = fopen(identity_file, "r")) == NULL) |
|
|
} |
} |
c = (strcmp(cp2, cp) == 0); |
c = (strcmp(cp2, cp) == 0); |
if (find_host && c) { |
if (find_host && c) { |
printf("# Host %s found: " |
if (!quiet) |
"line %d type %s%s\n", name, |
printf("# Host %s found: " |
num, key_type(pub), |
"line %d type %s%s\n", name, |
ca ? " (CA key)" : ""); |
num, key_type(pub), |
|
ca ? " (CA key)" : ""); |
printhost(out, cp, pub, ca, 0); |
printhost(out, cp, pub, ca, 0); |
|
found_key = 1; |
} |
} |
if (delete_host && !c && !ca) |
if (delete_host) { |
printhost(out, cp, pub, ca, 0); |
if (!c && !ca) |
|
printhost(out, cp, pub, ca, 0); |
|
else |
|
printf("# Host %s found: " |
|
"line %d type %s\n", name, |
|
num, key_type(pub)); |
|
} |
} else if (hash_hosts) |
} else if (hash_hosts) |
printhost(out, cp, pub, ca, 0); |
printhost(out, cp, pub, ca, 0); |
} else { |
} else { |
|
|
c = (match_hostname(name, cp, |
c = (match_hostname(name, cp, |
strlen(cp)) == 1); |
strlen(cp)) == 1); |
if (find_host && c) { |
if (find_host && c) { |
printf("# Host %s found: " |
if (!quiet) |
"line %d type %s%s\n", name, |
printf("# Host %s found: " |
num, key_type(pub), |
"line %d type %s%s\n", name, |
ca ? " (CA key)" : ""); |
num, key_type(pub), |
|
ca ? " (CA key)" : ""); |
printhost(out, name, pub, |
printhost(out, name, pub, |
ca, hash_hosts && !ca); |
ca, hash_hosts && !ca); |
|
found_key = 1; |
} |
} |
if (delete_host && !c && !ca) |
if (delete_host) { |
printhost(out, cp, pub, ca, 0); |
if (!c && !ca) |
|
printhost(out, cp, pub, ca, 0); |
|
else |
|
printf("# Host %s found: " |
|
"line %d type %s\n", name, |
|
num, key_type(pub)); |
|
} |
} else if (hash_hosts) { |
} else if (hash_hosts) { |
for (cp2 = strsep(&cp, ","); |
for (cp2 = strsep(&cp, ","); |
cp2 != NULL && *cp2 != '\0'; |
cp2 != NULL && *cp2 != '\0'; |
|
|
} |
} |
} |
} |
|
|
exit(0); |
exit (find_host && !found_key); |
} |
} |
|
|
/* |
/* |
|
|
RP_ALLOW_STDIN); |
RP_ALLOW_STDIN); |
private = key_load_private(identity_file, old_passphrase, |
private = key_load_private(identity_file, old_passphrase, |
&comment); |
&comment); |
memset(old_passphrase, 0, strlen(old_passphrase)); |
explicit_bzero(old_passphrase, strlen(old_passphrase)); |
xfree(old_passphrase); |
free(old_passphrase); |
if (private == NULL) { |
if (private == NULL) { |
printf("Bad passphrase.\n"); |
printf("Bad passphrase.\n"); |
exit(1); |
exit(1); |
|
|
|
|
/* Verify that they are the same. */ |
/* Verify that they are the same. */ |
if (strcmp(passphrase1, passphrase2) != 0) { |
if (strcmp(passphrase1, passphrase2) != 0) { |
memset(passphrase1, 0, strlen(passphrase1)); |
explicit_bzero(passphrase1, strlen(passphrase1)); |
memset(passphrase2, 0, strlen(passphrase2)); |
explicit_bzero(passphrase2, strlen(passphrase2)); |
xfree(passphrase1); |
free(passphrase1); |
xfree(passphrase2); |
free(passphrase2); |
printf("Pass phrases do not match. Try again.\n"); |
printf("Pass phrases do not match. Try again.\n"); |
exit(1); |
exit(1); |
} |
} |
/* Destroy the other copy. */ |
/* Destroy the other copy. */ |
memset(passphrase2, 0, strlen(passphrase2)); |
explicit_bzero(passphrase2, strlen(passphrase2)); |
xfree(passphrase2); |
free(passphrase2); |
} |
} |
|
|
/* Save the file using the new passphrase. */ |
/* Save the file using the new passphrase. */ |
if (!key_save_private(private, identity_file, passphrase1, comment)) { |
if (!key_save_private(private, identity_file, passphrase1, comment, |
|
use_new_format, new_format_cipher, rounds)) { |
printf("Saving the key failed: %s.\n", identity_file); |
printf("Saving the key failed: %s.\n", identity_file); |
memset(passphrase1, 0, strlen(passphrase1)); |
explicit_bzero(passphrase1, strlen(passphrase1)); |
xfree(passphrase1); |
free(passphrase1); |
key_free(private); |
key_free(private); |
xfree(comment); |
free(comment); |
exit(1); |
exit(1); |
} |
} |
/* Destroy the passphrase and the copy of the key in memory. */ |
/* Destroy the passphrase and the copy of the key in memory. */ |
memset(passphrase1, 0, strlen(passphrase1)); |
explicit_bzero(passphrase1, strlen(passphrase1)); |
xfree(passphrase1); |
free(passphrase1); |
key_free(private); /* Destroys contents */ |
key_free(private); /* Destroys contents */ |
xfree(comment); |
free(comment); |
|
|
printf("Your identification has been saved with the new passphrase.\n"); |
printf("Your identification has been saved with the new passphrase.\n"); |
exit(0); |
exit(0); |
|
|
struct stat st; |
struct stat st; |
|
|
if (fname == NULL) |
if (fname == NULL) |
ask_filename(pw, "Enter file in which the key is"); |
fatal("%s: no filename", __func__); |
if (stat(fname, &st) < 0) { |
if (stat(fname, &st) < 0) { |
if (errno == ENOENT) |
if (errno == ENOENT) |
return 0; |
return 0; |
|
|
if (public != NULL) { |
if (public != NULL) { |
export_dns_rr(hname, public, stdout, print_generic); |
export_dns_rr(hname, public, stdout, print_generic); |
key_free(public); |
key_free(public); |
xfree(comment); |
free(comment); |
return 1; |
return 1; |
} |
} |
if (comment) |
if (comment) |
xfree(comment); |
free(comment); |
|
|
printf("failed to read v2 public key from %s.\n", fname); |
printf("failed to read v2 public key from %s.\n", fname); |
exit(1); |
exit(1); |
|
|
/* 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) { |
memset(passphrase, 0, strlen(passphrase)); |
explicit_bzero(passphrase, strlen(passphrase)); |
xfree(passphrase); |
free(passphrase); |
printf("Bad passphrase.\n"); |
printf("Bad passphrase.\n"); |
exit(1); |
exit(1); |
} |
} |
|
|
printf("Enter new comment: "); |
printf("Enter new comment: "); |
fflush(stdout); |
fflush(stdout); |
if (!fgets(new_comment, sizeof(new_comment), stdin)) { |
if (!fgets(new_comment, sizeof(new_comment), stdin)) { |
memset(passphrase, 0, strlen(passphrase)); |
explicit_bzero(passphrase, strlen(passphrase)); |
key_free(private); |
key_free(private); |
exit(1); |
exit(1); |
} |
} |
|
|
} |
} |
|
|
/* Save the file using the new passphrase. */ |
/* Save the file using the new passphrase. */ |
if (!key_save_private(private, identity_file, passphrase, new_comment)) { |
if (!key_save_private(private, identity_file, passphrase, new_comment, |
|
use_new_format, new_format_cipher, rounds)) { |
printf("Saving the key failed: %s.\n", identity_file); |
printf("Saving the key failed: %s.\n", identity_file); |
memset(passphrase, 0, strlen(passphrase)); |
explicit_bzero(passphrase, strlen(passphrase)); |
xfree(passphrase); |
free(passphrase); |
key_free(private); |
key_free(private); |
xfree(comment); |
free(comment); |
exit(1); |
exit(1); |
} |
} |
memset(passphrase, 0, strlen(passphrase)); |
explicit_bzero(passphrase, strlen(passphrase)); |
xfree(passphrase); |
free(passphrase); |
public = key_from_private(private); |
public = key_from_private(private); |
key_free(private); |
key_free(private); |
|
|
|
|
fprintf(f, " %s\n", new_comment); |
fprintf(f, " %s\n", new_comment); |
fclose(f); |
fclose(f); |
|
|
xfree(comment); |
free(comment); |
|
|
printf("The comment in your key file has been changed.\n"); |
printf("The comment in your key file has been changed.\n"); |
exit(0); |
exit(0); |
|
|
certflags_command != NULL) |
certflags_command != NULL) |
add_string_option(c, "force-command", certflags_command); |
add_string_option(c, "force-command", certflags_command); |
if ((which & OPTIONS_EXTENSIONS) != 0 && |
if ((which & OPTIONS_EXTENSIONS) != 0 && |
|
(certflags_flags & CERTOPT_X_FWD) != 0) |
|
add_flag_option(c, "permit-X11-forwarding"); |
|
if ((which & OPTIONS_EXTENSIONS) != 0 && |
(certflags_flags & CERTOPT_AGENT_FWD) != 0) |
(certflags_flags & CERTOPT_AGENT_FWD) != 0) |
add_flag_option(c, "permit-agent-forwarding"); |
add_flag_option(c, "permit-agent-forwarding"); |
if ((which & OPTIONS_EXTENSIONS) != 0 && |
if ((which & OPTIONS_EXTENSIONS) != 0 && |
|
|
if ((which & OPTIONS_EXTENSIONS) != 0 && |
if ((which & OPTIONS_EXTENSIONS) != 0 && |
(certflags_flags & CERTOPT_USER_RC) != 0) |
(certflags_flags & CERTOPT_USER_RC) != 0) |
add_flag_option(c, "permit-user-rc"); |
add_flag_option(c, "permit-user-rc"); |
if ((which & OPTIONS_EXTENSIONS) != 0 && |
|
(certflags_flags & CERTOPT_X_FWD) != 0) |
|
add_flag_option(c, "permit-X11-forwarding"); |
|
if ((which & OPTIONS_CRITICAL) != 0 && |
if ((which & OPTIONS_CRITICAL) != 0 && |
certflags_src_addr != NULL) |
certflags_src_addr != NULL) |
add_string_option(c, "source-address", certflags_src_addr); |
add_string_option(c, "source-address", certflags_src_addr); |
} |
} |
|
|
|
static Key * |
|
load_pkcs11_key(char *path) |
|
{ |
|
#ifdef ENABLE_PKCS11 |
|
Key **keys = NULL, *public, *private = NULL; |
|
int i, nkeys; |
|
|
|
if ((public = key_load_public(path, NULL)) == NULL) |
|
fatal("Couldn't load CA public key \"%s\"", path); |
|
|
|
nkeys = pkcs11_add_provider(pkcs11provider, identity_passphrase, &keys); |
|
debug3("%s: %d keys", __func__, nkeys); |
|
if (nkeys <= 0) |
|
fatal("cannot read public key from pkcs11"); |
|
for (i = 0; i < nkeys; i++) { |
|
if (key_equal_public(public, keys[i])) { |
|
private = keys[i]; |
|
continue; |
|
} |
|
key_free(keys[i]); |
|
} |
|
free(keys); |
|
key_free(public); |
|
return private; |
|
#else |
|
fatal("no pkcs11 support"); |
|
#endif /* ENABLE_PKCS11 */ |
|
} |
|
|
static void |
static void |
do_ca_sign(struct passwd *pw, int argc, char **argv) |
do_ca_sign(struct passwd *pw, int argc, char **argv) |
{ |
{ |
|
|
FILE *f; |
FILE *f; |
int v00 = 0; /* legacy keys */ |
int v00 = 0; /* legacy keys */ |
|
|
tmp = tilde_expand_filename(ca_key_path, pw->pw_uid); |
|
if ((ca = load_identity(tmp)) == NULL) |
|
fatal("Couldn't load CA key \"%s\"", tmp); |
|
xfree(tmp); |
|
|
|
if (key_type_name != NULL) { |
if (key_type_name != NULL) { |
switch (key_type_from_name(key_type_name)) { |
switch (key_type_from_name(key_type_name)) { |
case KEY_RSA_CERT_V00: |
case KEY_RSA_CERT_V00: |
|
|
} |
} |
} |
} |
|
|
|
#ifdef ENABLE_PKCS11 |
|
pkcs11_init(1); |
|
#endif |
|
tmp = tilde_expand_filename(ca_key_path, pw->pw_uid); |
|
if (pkcs11provider != NULL) { |
|
if ((ca = load_pkcs11_key(tmp)) == NULL) |
|
fatal("No PKCS#11 key matching %s found", ca_key_path); |
|
} else if ((ca = load_identity(tmp)) == NULL) |
|
fatal("Couldn't load CA key \"%s\"", tmp); |
|
free(tmp); |
|
|
for (i = 0; i < argc; i++) { |
for (i = 0; i < argc; i++) { |
/* Split list of principals */ |
/* Split list of principals */ |
n = 0; |
n = 0; |
|
|
if (*(plist[n] = xstrdup(cp)) == '\0') |
if (*(plist[n] = xstrdup(cp)) == '\0') |
fatal("Empty principal name"); |
fatal("Empty principal name"); |
} |
} |
xfree(otmp); |
free(otmp); |
} |
} |
|
|
tmp = tilde_expand_filename(argv[i], pw->pw_uid); |
tmp = tilde_expand_filename(argv[i], pw->pw_uid); |
if ((public = key_load_public(tmp, &comment)) == NULL) |
if ((public = key_load_public(tmp, &comment)) == NULL) |
fatal("%s: unable to open \"%s\"", __func__, tmp); |
fatal("%s: unable to open \"%s\"", __func__, tmp); |
if (public->type != KEY_RSA && public->type != KEY_DSA) |
if (public->type != KEY_RSA && public->type != KEY_DSA && |
|
public->type != KEY_ECDSA && public->type != KEY_ED25519) |
fatal("%s: key \"%s\" type %s cannot be certified", |
fatal("%s: key \"%s\" type %s cannot be certified", |
__func__, tmp, key_type(public)); |
__func__, tmp, key_type(public)); |
|
|
|
|
public->cert->valid_after = cert_valid_from; |
public->cert->valid_after = cert_valid_from; |
public->cert->valid_before = cert_valid_to; |
public->cert->valid_before = cert_valid_to; |
if (v00) { |
if (v00) { |
prepare_options_buf(&public->cert->critical, |
prepare_options_buf(public->cert->critical, |
OPTIONS_CRITICAL|OPTIONS_EXTENSIONS); |
OPTIONS_CRITICAL|OPTIONS_EXTENSIONS); |
} else { |
} else { |
prepare_options_buf(&public->cert->critical, |
prepare_options_buf(public->cert->critical, |
OPTIONS_CRITICAL); |
OPTIONS_CRITICAL); |
prepare_options_buf(&public->cert->extensions, |
prepare_options_buf(public->cert->extensions, |
OPTIONS_EXTENSIONS); |
OPTIONS_EXTENSIONS); |
} |
} |
public->cert->signature_key = key_from_private(ca); |
public->cert->signature_key = key_from_private(ca); |
|
|
if ((cp = strrchr(tmp, '.')) != NULL && strcmp(cp, ".pub") == 0) |
if ((cp = strrchr(tmp, '.')) != NULL && strcmp(cp, ".pub") == 0) |
*cp = '\0'; |
*cp = '\0'; |
xasprintf(&out, "%s-cert.pub", tmp); |
xasprintf(&out, "%s-cert.pub", tmp); |
xfree(tmp); |
free(tmp); |
|
|
if ((fd = open(out, O_WRONLY|O_CREAT|O_TRUNC, 0644)) == -1) |
if ((fd = open(out, O_WRONLY|O_CREAT|O_TRUNC, 0644)) == -1) |
fatal("Could not open \"%s\" for writing: %s", out, |
fatal("Could not open \"%s\" for writing: %s", out, |
|
|
if (!quiet) { |
if (!quiet) { |
logit("Signed %s key %s: id \"%s\" serial %llu%s%s " |
logit("Signed %s key %s: id \"%s\" serial %llu%s%s " |
"valid %s", key_cert_type(public), |
"valid %s", key_cert_type(public), |
out, public->cert->key_id, public->cert->serial, |
out, public->cert->key_id, |
|
(unsigned long long)public->cert->serial, |
cert_principals != NULL ? " for " : "", |
cert_principals != NULL ? " for " : "", |
cert_principals != NULL ? cert_principals : "", |
cert_principals != NULL ? cert_principals : "", |
fmt_validity(cert_valid_from, cert_valid_to)); |
fmt_validity(cert_valid_from, cert_valid_to)); |
} |
} |
|
|
key_free(public); |
key_free(public); |
xfree(out); |
free(out); |
} |
} |
|
#ifdef ENABLE_PKCS11 |
|
pkcs11_terminate(); |
|
#endif |
exit(0); |
exit(0); |
} |
} |
|
|
|
|
fatal("Invalid certificate time format %s", s); |
fatal("Invalid certificate time format %s", s); |
} |
} |
|
|
bzero(&tm, sizeof(tm)); |
memset(&tm, 0, sizeof(tm)); |
if (strptime(buf, fmt, &tm) == NULL) |
if (strptime(buf, fmt, &tm) == NULL) |
fatal("Invalid certificate time %s", s); |
fatal("Invalid certificate time %s", s); |
if ((tt = mktime(&tm)) < 0) |
if ((tt = mktime(&tm)) < 0) |
|
|
cert_valid_from = parse_absolute_time(from); |
cert_valid_from = parse_absolute_time(from); |
|
|
if (*to == '-' || *to == '+') |
if (*to == '-' || *to == '+') |
cert_valid_to = parse_relative_time(to, cert_valid_from); |
cert_valid_to = parse_relative_time(to, now); |
else |
else |
cert_valid_to = parse_absolute_time(to); |
cert_valid_to = parse_absolute_time(to); |
|
|
if (cert_valid_to <= cert_valid_from) |
if (cert_valid_to <= cert_valid_from) |
fatal("Empty certificate validity interval"); |
fatal("Empty certificate validity interval"); |
xfree(from); |
free(from); |
} |
} |
|
|
static void |
static void |
|
|
{ |
{ |
char *val; |
char *val; |
|
|
if (strcmp(opt, "clear") == 0) |
if (strcasecmp(opt, "clear") == 0) |
certflags_flags = 0; |
certflags_flags = 0; |
else if (strcasecmp(opt, "no-x11-forwarding") == 0) |
else if (strcasecmp(opt, "no-x11-forwarding") == 0) |
certflags_flags &= ~CERTOPT_X_FWD; |
certflags_flags &= ~CERTOPT_X_FWD; |
|
|
static void |
static void |
show_options(const Buffer *optbuf, int v00, int in_critical) |
show_options(const Buffer *optbuf, int v00, int in_critical) |
{ |
{ |
u_char *name, *data; |
char *name, *arg; |
|
const u_char *data; |
u_int dlen; |
u_int dlen; |
Buffer options, option; |
Buffer options, option; |
|
|
|
|
else if ((v00 || in_critical) && |
else if ((v00 || in_critical) && |
(strcmp(name, "force-command") == 0 || |
(strcmp(name, "force-command") == 0 || |
strcmp(name, "source-address") == 0)) { |
strcmp(name, "source-address") == 0)) { |
data = buffer_get_string(&option, NULL); |
arg = buffer_get_cstring(&option, NULL); |
printf(" %s\n", data); |
printf(" %s\n", arg); |
xfree(data); |
free(arg); |
} else { |
} else { |
printf(" UNKNOWN OPTION (len %u)\n", |
printf(" UNKNOWN OPTION (len %u)\n", |
buffer_len(&option)); |
buffer_len(&option)); |
buffer_clear(&option); |
buffer_clear(&option); |
} |
} |
xfree(name); |
free(name); |
if (buffer_len(&option) != 0) |
if (buffer_len(&option) != 0) |
fatal("Option corrupt: extra data at end"); |
fatal("Option corrupt: extra data at end"); |
} |
} |
|
|
printf(" Signing CA: %s %s\n", |
printf(" Signing CA: %s %s\n", |
key_type(key->cert->signature_key), ca_fp); |
key_type(key->cert->signature_key), ca_fp); |
printf(" Key ID: \"%s\"\n", key->cert->key_id); |
printf(" Key ID: \"%s\"\n", key->cert->key_id); |
if (!v00) |
if (!v00) { |
printf(" Serial: %llu\n", key->cert->serial); |
printf(" Serial: %llu\n", |
|
(unsigned long long)key->cert->serial); |
|
} |
printf(" Valid: %s\n", |
printf(" Valid: %s\n", |
fmt_validity(key->cert->valid_after, key->cert->valid_before)); |
fmt_validity(key->cert->valid_after, key->cert->valid_before)); |
printf(" Principals: "); |
printf(" Principals: "); |
|
|
printf("\n"); |
printf("\n"); |
} |
} |
printf(" Critical Options: "); |
printf(" Critical Options: "); |
if (buffer_len(&key->cert->critical) == 0) |
if (buffer_len(key->cert->critical) == 0) |
printf("(none)\n"); |
printf("(none)\n"); |
else { |
else { |
printf("\n"); |
printf("\n"); |
show_options(&key->cert->critical, v00, 1); |
show_options(key->cert->critical, v00, 1); |
} |
} |
if (!v00) { |
if (!v00) { |
printf(" Extensions: "); |
printf(" Extensions: "); |
if (buffer_len(&key->cert->extensions) == 0) |
if (buffer_len(key->cert->extensions) == 0) |
printf("(none)\n"); |
printf("(none)\n"); |
else { |
else { |
printf("\n"); |
printf("\n"); |
show_options(&key->cert->extensions, v00, 0); |
show_options(key->cert->extensions, v00, 0); |
} |
} |
} |
} |
exit(0); |
exit(0); |
} |
} |
|
|
|
#ifdef WITH_OPENSSL |
static void |
static void |
|
load_krl(const char *path, struct ssh_krl **krlp) |
|
{ |
|
Buffer krlbuf; |
|
int fd; |
|
|
|
buffer_init(&krlbuf); |
|
if ((fd = open(path, O_RDONLY)) == -1) |
|
fatal("open %s: %s", path, strerror(errno)); |
|
if (!key_load_file(fd, path, &krlbuf)) |
|
fatal("Unable to load KRL"); |
|
close(fd); |
|
/* XXX check sigs */ |
|
if (ssh_krl_from_blob(&krlbuf, krlp, NULL, 0) != 0 || |
|
*krlp == NULL) |
|
fatal("Invalid KRL file"); |
|
buffer_free(&krlbuf); |
|
} |
|
|
|
static void |
|
update_krl_from_file(struct passwd *pw, const char *file, const Key *ca, |
|
struct ssh_krl *krl) |
|
{ |
|
Key *key = NULL; |
|
u_long lnum = 0; |
|
char *path, *cp, *ep, line[SSH_MAX_PUBKEY_BYTES]; |
|
unsigned long long serial, serial2; |
|
int i, was_explicit_key, was_sha1, r; |
|
FILE *krl_spec; |
|
|
|
path = tilde_expand_filename(file, pw->pw_uid); |
|
if (strcmp(path, "-") == 0) { |
|
krl_spec = stdin; |
|
free(path); |
|
path = xstrdup("(standard input)"); |
|
} else if ((krl_spec = fopen(path, "r")) == NULL) |
|
fatal("fopen %s: %s", path, strerror(errno)); |
|
|
|
if (!quiet) |
|
printf("Revoking from %s\n", path); |
|
while (read_keyfile_line(krl_spec, path, line, sizeof(line), |
|
&lnum) == 0) { |
|
was_explicit_key = was_sha1 = 0; |
|
cp = line + strspn(line, " \t"); |
|
/* Trim trailing space, comments and strip \n */ |
|
for (i = 0, r = -1; cp[i] != '\0'; i++) { |
|
if (cp[i] == '#' || cp[i] == '\n') { |
|
cp[i] = '\0'; |
|
break; |
|
} |
|
if (cp[i] == ' ' || cp[i] == '\t') { |
|
/* Remember the start of a span of whitespace */ |
|
if (r == -1) |
|
r = i; |
|
} else |
|
r = -1; |
|
} |
|
if (r != -1) |
|
cp[r] = '\0'; |
|
if (*cp == '\0') |
|
continue; |
|
if (strncasecmp(cp, "serial:", 7) == 0) { |
|
if (ca == NULL) { |
|
fatal("revoking certificates by serial number " |
|
"requires specification of a CA key"); |
|
} |
|
cp += 7; |
|
cp = cp + strspn(cp, " \t"); |
|
errno = 0; |
|
serial = strtoull(cp, &ep, 0); |
|
if (*cp == '\0' || (*ep != '\0' && *ep != '-')) |
|
fatal("%s:%lu: invalid serial \"%s\"", |
|
path, lnum, cp); |
|
if (errno == ERANGE && serial == ULLONG_MAX) |
|
fatal("%s:%lu: serial out of range", |
|
path, lnum); |
|
serial2 = serial; |
|
if (*ep == '-') { |
|
cp = ep + 1; |
|
errno = 0; |
|
serial2 = strtoull(cp, &ep, 0); |
|
if (*cp == '\0' || *ep != '\0') |
|
fatal("%s:%lu: invalid serial \"%s\"", |
|
path, lnum, cp); |
|
if (errno == ERANGE && serial2 == ULLONG_MAX) |
|
fatal("%s:%lu: serial out of range", |
|
path, lnum); |
|
if (serial2 <= serial) |
|
fatal("%s:%lu: invalid serial range " |
|
"%llu:%llu", path, lnum, |
|
(unsigned long long)serial, |
|
(unsigned long long)serial2); |
|
} |
|
if (ssh_krl_revoke_cert_by_serial_range(krl, |
|
ca, serial, serial2) != 0) { |
|
fatal("%s: revoke serial failed", |
|
__func__); |
|
} |
|
} else if (strncasecmp(cp, "id:", 3) == 0) { |
|
if (ca == NULL) { |
|
fatal("revoking certificates by key ID " |
|
"requires specification of a CA key"); |
|
} |
|
cp += 3; |
|
cp = cp + strspn(cp, " \t"); |
|
if (ssh_krl_revoke_cert_by_key_id(krl, ca, cp) != 0) |
|
fatal("%s: revoke key ID failed", __func__); |
|
} else { |
|
if (strncasecmp(cp, "key:", 4) == 0) { |
|
cp += 4; |
|
cp = cp + strspn(cp, " \t"); |
|
was_explicit_key = 1; |
|
} else if (strncasecmp(cp, "sha1:", 5) == 0) { |
|
cp += 5; |
|
cp = cp + strspn(cp, " \t"); |
|
was_sha1 = 1; |
|
} else { |
|
/* |
|
* Just try to process the line as a key. |
|
* Parsing will fail if it isn't. |
|
*/ |
|
} |
|
if ((key = key_new(KEY_UNSPEC)) == NULL) |
|
fatal("key_new"); |
|
if (key_read(key, &cp) != 1) |
|
fatal("%s:%lu: invalid key", path, lnum); |
|
if (was_explicit_key) |
|
r = ssh_krl_revoke_key_explicit(krl, key); |
|
else if (was_sha1) |
|
r = ssh_krl_revoke_key_sha1(krl, key); |
|
else |
|
r = ssh_krl_revoke_key(krl, key); |
|
if (r != 0) |
|
fatal("%s: revoke key failed", __func__); |
|
key_free(key); |
|
} |
|
} |
|
if (strcmp(path, "-") != 0) |
|
fclose(krl_spec); |
|
free(path); |
|
} |
|
|
|
static void |
|
do_gen_krl(struct passwd *pw, int updating, int argc, char **argv) |
|
{ |
|
struct ssh_krl *krl; |
|
struct stat sb; |
|
Key *ca = NULL; |
|
int fd, i; |
|
char *tmp; |
|
Buffer kbuf; |
|
|
|
if (*identity_file == '\0') |
|
fatal("KRL generation requires an output file"); |
|
if (stat(identity_file, &sb) == -1) { |
|
if (errno != ENOENT) |
|
fatal("Cannot access KRL \"%s\": %s", |
|
identity_file, strerror(errno)); |
|
if (updating) |
|
fatal("KRL \"%s\" does not exist", identity_file); |
|
} |
|
if (ca_key_path != NULL) { |
|
tmp = tilde_expand_filename(ca_key_path, pw->pw_uid); |
|
if ((ca = key_load_public(tmp, NULL)) == NULL) |
|
fatal("Cannot load CA public key %s", tmp); |
|
free(tmp); |
|
} |
|
|
|
if (updating) |
|
load_krl(identity_file, &krl); |
|
else if ((krl = ssh_krl_init()) == NULL) |
|
fatal("couldn't create KRL"); |
|
|
|
if (cert_serial != 0) |
|
ssh_krl_set_version(krl, cert_serial); |
|
if (identity_comment != NULL) |
|
ssh_krl_set_comment(krl, identity_comment); |
|
|
|
for (i = 0; i < argc; i++) |
|
update_krl_from_file(pw, argv[i], ca, krl); |
|
|
|
buffer_init(&kbuf); |
|
if (ssh_krl_to_blob(krl, &kbuf, NULL, 0) != 0) |
|
fatal("Couldn't generate KRL"); |
|
if ((fd = open(identity_file, O_WRONLY|O_CREAT|O_TRUNC, 0644)) == -1) |
|
fatal("open %s: %s", identity_file, strerror(errno)); |
|
if (atomicio(vwrite, fd, buffer_ptr(&kbuf), buffer_len(&kbuf)) != |
|
buffer_len(&kbuf)) |
|
fatal("write %s: %s", identity_file, strerror(errno)); |
|
close(fd); |
|
buffer_free(&kbuf); |
|
ssh_krl_free(krl); |
|
if (ca != NULL) |
|
key_free(ca); |
|
} |
|
|
|
static void |
|
do_check_krl(struct passwd *pw, int argc, char **argv) |
|
{ |
|
int i, r, ret = 0; |
|
char *comment; |
|
struct ssh_krl *krl; |
|
Key *k; |
|
|
|
if (*identity_file == '\0') |
|
fatal("KRL checking requires an input file"); |
|
load_krl(identity_file, &krl); |
|
for (i = 0; i < argc; i++) { |
|
if ((k = key_load_public(argv[i], &comment)) == NULL) |
|
fatal("Cannot load public key %s", argv[i]); |
|
r = ssh_krl_check_key(krl, k); |
|
printf("%s%s%s%s: %s\n", argv[i], |
|
*comment ? " (" : "", comment, *comment ? ")" : "", |
|
r == 0 ? "ok" : "REVOKED"); |
|
if (r != 0) |
|
ret = 1; |
|
key_free(k); |
|
free(comment); |
|
} |
|
ssh_krl_free(krl); |
|
exit(ret); |
|
} |
|
#endif |
|
|
|
static void |
usage(void) |
usage(void) |
{ |
{ |
fprintf(stderr, "usage: %s [options]\n", __progname); |
fprintf(stderr, |
fprintf(stderr, "Options:\n"); |
"usage: ssh-keygen [-q] [-b bits] [-t dsa | ecdsa | ed25519 | rsa | rsa1]\n" |
fprintf(stderr, " -a trials Number of trials for screening DH-GEX moduli.\n"); |
" [-N new_passphrase] [-C comment] [-f output_keyfile]\n" |
fprintf(stderr, " -B Show bubblebabble digest of key file.\n"); |
" ssh-keygen -p [-P old_passphrase] [-N new_passphrase] [-f keyfile]\n" |
fprintf(stderr, " -b bits Number of bits in the key to create.\n"); |
" ssh-keygen -i [-m key_format] [-f input_keyfile]\n" |
fprintf(stderr, " -C comment Provide new comment.\n"); |
" ssh-keygen -e [-m key_format] [-f input_keyfile]\n" |
fprintf(stderr, " -c Change comment in private and public key files.\n"); |
" ssh-keygen -y [-f input_keyfile]\n" |
|
" ssh-keygen -c [-P passphrase] [-C comment] [-f keyfile]\n" |
|
" ssh-keygen -l [-f input_keyfile]\n" |
|
" ssh-keygen -B [-f input_keyfile]\n"); |
#ifdef ENABLE_PKCS11 |
#ifdef ENABLE_PKCS11 |
fprintf(stderr, " -D pkcs11 Download public key from pkcs11 token.\n"); |
fprintf(stderr, |
|
" ssh-keygen -D pkcs11\n"); |
#endif |
#endif |
fprintf(stderr, " -e Export OpenSSH to foreign format key file.\n"); |
fprintf(stderr, |
fprintf(stderr, " -F hostname Find hostname in known hosts file.\n"); |
" ssh-keygen -F hostname [-f known_hosts_file] [-l]\n" |
fprintf(stderr, " -f filename Filename of the key file.\n"); |
" ssh-keygen -H [-f known_hosts_file]\n" |
fprintf(stderr, " -G file Generate candidates for DH-GEX moduli.\n"); |
" ssh-keygen -R hostname [-f known_hosts_file]\n" |
fprintf(stderr, " -g Use generic DNS resource record format.\n"); |
" ssh-keygen -r hostname [-f input_keyfile] [-g]\n" |
fprintf(stderr, " -H Hash names in known_hosts file.\n"); |
" ssh-keygen -G output_file [-v] [-b bits] [-M memory] [-S start_point]\n" |
fprintf(stderr, " -h Generate host certificate instead of a user certificate.\n"); |
" ssh-keygen -T output_file -f input_file [-v] [-a rounds] [-J num_lines]\n" |
fprintf(stderr, " -I key_id Key identifier to include in certificate.\n"); |
" [-j start_line] [-K checkpt] [-W generator]\n" |
fprintf(stderr, " -i Import foreign format to OpenSSH key file.\n"); |
" ssh-keygen -s ca_key -I certificate_identity [-h] [-n principals]\n" |
fprintf(stderr, " -L Print the contents of a certificate.\n"); |
" [-O option] [-V validity_interval] [-z serial_number] file ...\n" |
fprintf(stderr, " -l Show fingerprint of key file.\n"); |
" ssh-keygen -L [-f input_keyfile]\n" |
fprintf(stderr, " -M memory Amount of memory (MB) to use for generating DH-GEX moduli.\n"); |
" ssh-keygen -A\n" |
fprintf(stderr, " -m key_fmt Conversion format for -e/-i (PEM|PKCS8|RFC4716).\n"); |
" ssh-keygen -k -f krl_file [-u] [-s ca_public] [-z version_number]\n" |
fprintf(stderr, " -N phrase Provide new passphrase.\n"); |
" file ...\n" |
fprintf(stderr, " -n name,... User/host principal names to include in certificate\n"); |
" ssh-keygen -Q -f krl_file file ...\n"); |
fprintf(stderr, " -O option Specify a certificate option.\n"); |
|
fprintf(stderr, " -P phrase Provide old passphrase.\n"); |
|
fprintf(stderr, " -p Change passphrase of private key file.\n"); |
|
fprintf(stderr, " -q Quiet.\n"); |
|
fprintf(stderr, " -R hostname Remove host from known_hosts file.\n"); |
|
fprintf(stderr, " -r hostname Print DNS resource record.\n"); |
|
fprintf(stderr, " -S start Start point (hex) for generating DH-GEX moduli.\n"); |
|
fprintf(stderr, " -s ca_key Certify keys with CA key.\n"); |
|
fprintf(stderr, " -T file Screen candidates for DH-GEX moduli.\n"); |
|
fprintf(stderr, " -t type Specify type of key to create.\n"); |
|
fprintf(stderr, " -V from:to Specify certificate validity interval.\n"); |
|
fprintf(stderr, " -v Verbose.\n"); |
|
fprintf(stderr, " -W gen Generator to use for generating DH-GEX moduli.\n"); |
|
fprintf(stderr, " -y Read private key file and print public key.\n"); |
|
fprintf(stderr, " -z serial Specify a serial number.\n"); |
|
|
|
exit(1); |
exit(1); |
} |
} |
|
|
|
|
main(int argc, char **argv) |
main(int argc, char **argv) |
{ |
{ |
char dotsshdir[MAXPATHLEN], comment[1024], *passphrase1, *passphrase2; |
char dotsshdir[MAXPATHLEN], comment[1024], *passphrase1, *passphrase2; |
char out_file[MAXPATHLEN], *pkcs11provider = NULL; |
char *checkpoint = NULL; |
char *rr_hostname = NULL; |
char out_file[MAXPATHLEN], *ep, *rr_hostname = NULL; |
Key *private, *public; |
Key *private, *public; |
struct passwd *pw; |
struct passwd *pw; |
struct stat st; |
struct stat st; |
int opt, type, fd; |
int opt, type, fd; |
u_int maxbits; |
u_int32_t memory = 0, generator_wanted = 0; |
u_int32_t memory = 0, generator_wanted = 0, trials = 100; |
|
int do_gen_candidates = 0, do_screen_candidates = 0; |
int do_gen_candidates = 0, do_screen_candidates = 0; |
|
int gen_all_hostkeys = 0, gen_krl = 0, update_krl = 0, check_krl = 0; |
|
unsigned long start_lineno = 0, lines_to_process = 0; |
BIGNUM *start = NULL; |
BIGNUM *start = NULL; |
FILE *f; |
FILE *f; |
const char *errstr; |
const char *errstr; |
|
|
/* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */ |
/* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */ |
sanitise_stdfd(); |
sanitise_stdfd(); |
|
|
SSLeay_add_all_algorithms(); |
OpenSSL_add_all_algorithms(); |
log_init(argv[0], SYSLOG_LEVEL_INFO, SYSLOG_FACILITY_USER, 1); |
log_init(argv[0], SYSLOG_LEVEL_INFO, SYSLOG_FACILITY_USER, 1); |
|
|
/* we need this for the home * directory. */ |
/* we need this for the home * directory. */ |
pw = getpwuid(getuid()); |
pw = getpwuid(getuid()); |
if (!pw) { |
if (!pw) { |
printf("You don't exist, go away!\n"); |
printf("No user exists for uid %lu\n", (u_long)getuid()); |
exit(1); |
exit(1); |
} |
} |
if (gethostname(hostname, sizeof(hostname)) < 0) { |
if (gethostname(hostname, sizeof(hostname)) < 0) { |
|
|
exit(1); |
exit(1); |
} |
} |
|
|
while ((opt = getopt(argc, argv, "degiqpclBHLhvxXyF:b:f:t:D:I:P:m:N:n:" |
/* Remaining characters: EUYdw */ |
"O:C:r:g:R:T:G:M:S:s:a:V:W:z:")) != -1) { |
while ((opt = getopt(argc, argv, "ABHLQXceghiklopquvxy" |
|
"C:D:F:G:I:J:K:M:N:O:P:R:S:T:V:W:Z:a:b:f:g:j:m:n:r:s:t:z:")) != -1) { |
switch (opt) { |
switch (opt) { |
|
case 'A': |
|
gen_all_hostkeys = 1; |
|
break; |
case 'b': |
case 'b': |
bits = (u_int32_t)strtonum(optarg, 768, 32768, &errstr); |
bits = (u_int32_t)strtonum(optarg, 256, 32768, &errstr); |
if (errstr) |
if (errstr) |
fatal("Bits has bad value %s (%s)", |
fatal("Bits has bad value %s (%s)", |
optarg, errstr); |
optarg, errstr); |
|
|
case 'I': |
case 'I': |
cert_key_id = optarg; |
cert_key_id = optarg; |
break; |
break; |
|
case 'J': |
|
lines_to_process = strtoul(optarg, NULL, 10); |
|
break; |
|
case 'j': |
|
start_lineno = strtoul(optarg, NULL, 10); |
|
break; |
case 'R': |
case 'R': |
delete_host = 1; |
delete_host = 1; |
rr_hostname = optarg; |
rr_hostname = optarg; |
|
|
case 'n': |
case 'n': |
cert_principals = optarg; |
cert_principals = optarg; |
break; |
break; |
|
case 'o': |
|
use_new_format = 1; |
|
break; |
case 'p': |
case 'p': |
change_passphrase = 1; |
change_passphrase = 1; |
break; |
break; |
|
|
case 'N': |
case 'N': |
identity_new_passphrase = optarg; |
identity_new_passphrase = optarg; |
break; |
break; |
|
case 'Q': |
|
check_krl = 1; |
|
break; |
case 'O': |
case 'O': |
add_cert_option(optarg); |
add_cert_option(optarg); |
break; |
break; |
|
case 'Z': |
|
new_format_cipher = optarg; |
|
break; |
case 'C': |
case 'C': |
identity_comment = optarg; |
identity_comment = optarg; |
break; |
break; |
|
|
cert_key_type = SSH2_CERT_TYPE_HOST; |
cert_key_type = SSH2_CERT_TYPE_HOST; |
certflags_flags = 0; |
certflags_flags = 0; |
break; |
break; |
|
case 'k': |
|
gen_krl = 1; |
|
break; |
case 'i': |
case 'i': |
case 'X': |
case 'X': |
/* import key */ |
/* import key */ |
|
|
case 'y': |
case 'y': |
print_public = 1; |
print_public = 1; |
break; |
break; |
case 'd': |
|
key_type_name = "dsa"; |
|
break; |
|
case 's': |
case 's': |
ca_key_path = optarg; |
ca_key_path = optarg; |
break; |
break; |
|
|
case 'D': |
case 'D': |
pkcs11provider = optarg; |
pkcs11provider = optarg; |
break; |
break; |
|
case 'u': |
|
update_krl = 1; |
|
break; |
case 'v': |
case 'v': |
if (log_level == SYSLOG_LEVEL_INFO) |
if (log_level == SYSLOG_LEVEL_INFO) |
log_level = SYSLOG_LEVEL_DEBUG1; |
log_level = SYSLOG_LEVEL_DEBUG1; |
|
|
optarg, errstr); |
optarg, errstr); |
break; |
break; |
case 'a': |
case 'a': |
trials = (u_int32_t)strtonum(optarg, 1, UINT_MAX, &errstr); |
rounds = (int)strtonum(optarg, 1, INT_MAX, &errstr); |
if (errstr) |
if (errstr) |
fatal("Invalid number of trials: %s (%s)", |
fatal("Invalid number: %s (%s)", |
optarg, errstr); |
optarg, errstr); |
break; |
break; |
case 'M': |
case 'M': |
|
|
sizeof(out_file)) |
sizeof(out_file)) |
fatal("Output filename too long"); |
fatal("Output filename too long"); |
break; |
break; |
|
case 'K': |
|
if (strlen(optarg) >= MAXPATHLEN) |
|
fatal("Checkpoint filename too long"); |
|
checkpoint = xstrdup(optarg); |
|
break; |
case 'S': |
case 'S': |
/* XXX - also compare length against bits */ |
/* XXX - also compare length against bits */ |
if (BN_hex2bn(&start, optarg) == 0) |
if (BN_hex2bn(&start, optarg) == 0) |
|
|
parse_cert_times(optarg); |
parse_cert_times(optarg); |
break; |
break; |
case 'z': |
case 'z': |
cert_serial = strtonum(optarg, 0, LLONG_MAX, &errstr); |
errno = 0; |
if (errstr) |
cert_serial = strtoull(optarg, &ep, 10); |
fatal("Invalid serial number: %s", errstr); |
if (*optarg < '0' || *optarg > '9' || *ep != '\0' || |
|
(errno == ERANGE && cert_serial == ULLONG_MAX)) |
|
fatal("Invalid serial number \"%s\"", optarg); |
break; |
break; |
case '?': |
case '?': |
default: |
default: |
|
|
argc -= optind; |
argc -= optind; |
|
|
if (ca_key_path != NULL) { |
if (ca_key_path != NULL) { |
if (argc < 1) { |
if (argc < 1 && !gen_krl) { |
printf("Too few arguments.\n"); |
printf("Too few arguments.\n"); |
usage(); |
usage(); |
} |
} |
} else if (argc > 0) { |
} else if (argc > 0 && !gen_krl && !check_krl) { |
printf("Too many arguments.\n"); |
printf("Too many arguments.\n"); |
usage(); |
usage(); |
} |
} |
|
|
usage(); |
usage(); |
} |
} |
if (print_fingerprint && (delete_host || hash_hosts)) { |
if (print_fingerprint && (delete_host || hash_hosts)) { |
printf("Cannot use -l with -D or -R.\n"); |
printf("Cannot use -l with -H or -R.\n"); |
usage(); |
usage(); |
} |
} |
|
#ifdef WITH_OPENSSL |
|
if (gen_krl) { |
|
do_gen_krl(pw, update_krl, argc, argv); |
|
return (0); |
|
} |
|
if (check_krl) { |
|
do_check_krl(pw, argc, argv); |
|
return (0); |
|
} |
|
#endif |
if (ca_key_path != NULL) { |
if (ca_key_path != NULL) { |
if (cert_key_id == NULL) |
if (cert_key_id == NULL) |
fatal("Must specify key id (-I) when certifying"); |
fatal("Must specify key id (-I) when certifying"); |
|
|
do_show_cert(pw); |
do_show_cert(pw); |
if (delete_host || hash_hosts || find_host) |
if (delete_host || hash_hosts || find_host) |
do_known_hosts(pw, rr_hostname); |
do_known_hosts(pw, rr_hostname); |
|
if (pkcs11provider != NULL) |
|
do_download(pw); |
if (print_fingerprint || print_bubblebabble) |
if (print_fingerprint || print_bubblebabble) |
do_fingerprint(pw); |
do_fingerprint(pw); |
if (change_passphrase) |
if (change_passphrase) |
do_change_passphrase(pw); |
do_change_passphrase(pw); |
if (change_comment) |
if (change_comment) |
do_change_comment(pw); |
do_change_comment(pw); |
|
#ifdef WITH_OPENSSL |
if (convert_to) |
if (convert_to) |
do_convert_to(pw); |
do_convert_to(pw); |
if (convert_from) |
if (convert_from) |
do_convert_from(pw); |
do_convert_from(pw); |
|
#endif |
if (print_public) |
if (print_public) |
do_print_public(pw); |
do_print_public(pw); |
if (rr_hostname != NULL) { |
if (rr_hostname != NULL) { |
|
|
_PATH_HOST_RSA_KEY_FILE, rr_hostname); |
_PATH_HOST_RSA_KEY_FILE, rr_hostname); |
n += do_print_resource_record(pw, |
n += do_print_resource_record(pw, |
_PATH_HOST_DSA_KEY_FILE, rr_hostname); |
_PATH_HOST_DSA_KEY_FILE, rr_hostname); |
|
n += do_print_resource_record(pw, |
|
_PATH_HOST_ECDSA_KEY_FILE, rr_hostname); |
|
n += do_print_resource_record(pw, |
|
_PATH_HOST_ED25519_KEY_FILE, rr_hostname); |
if (n == 0) |
if (n == 0) |
fatal("no keys found."); |
fatal("no keys found."); |
exit(0); |
exit(0); |
} |
} |
} |
} |
if (pkcs11provider != NULL) |
|
do_download(pw, pkcs11provider); |
|
|
|
if (do_gen_candidates) { |
if (do_gen_candidates) { |
FILE *out = fopen(out_file, "w"); |
FILE *out = fopen(out_file, "w"); |
|
|
|
|
if (do_screen_candidates) { |
if (do_screen_candidates) { |
FILE *in; |
FILE *in; |
FILE *out = fopen(out_file, "w"); |
FILE *out = fopen(out_file, "a"); |
|
|
if (have_identity && strcmp(identity_file, "-") != 0) { |
if (have_identity && strcmp(identity_file, "-") != 0) { |
if ((in = fopen(identity_file, "r")) == NULL) { |
if ((in = fopen(identity_file, "r")) == NULL) { |
|
|
fatal("Couldn't open moduli file \"%s\": %s", |
fatal("Couldn't open moduli file \"%s\": %s", |
out_file, strerror(errno)); |
out_file, strerror(errno)); |
} |
} |
if (prime_test(in, out, trials, generator_wanted) != 0) |
if (prime_test(in, out, rounds == 0 ? 100 : rounds, |
|
generator_wanted, checkpoint, |
|
start_lineno, lines_to_process) != 0) |
fatal("modulus screening failed"); |
fatal("modulus screening failed"); |
return (0); |
return (0); |
} |
} |
|
|
arc4random_stir(); |
if (gen_all_hostkeys) { |
|
do_gen_all_hostkeys(pw); |
|
return (0); |
|
} |
|
|
if (key_type_name == NULL) |
if (key_type_name == NULL) |
key_type_name = "rsa"; |
key_type_name = "rsa"; |
|
|
type = key_type_from_name(key_type_name); |
type = key_type_from_name(key_type_name); |
if (type == KEY_UNSPEC) { |
type_bits_valid(type, &bits); |
fprintf(stderr, "unknown key type %s\n", key_type_name); |
|
exit(1); |
|
} |
|
if (bits == 0) |
|
bits = (type == KEY_DSA) ? DEFAULT_BITS_DSA : DEFAULT_BITS; |
|
maxbits = (type == KEY_DSA) ? |
|
OPENSSL_DSA_MAX_MODULUS_BITS : OPENSSL_RSA_MAX_MODULUS_BITS; |
|
if (bits > maxbits) { |
|
fprintf(stderr, "key bits exceeds maximum %d\n", maxbits); |
|
exit(1); |
|
} |
|
if (type == KEY_DSA && bits != 1024) |
|
fatal("DSA keys must be 1024 bits"); |
|
if (!quiet) |
if (!quiet) |
printf("Generating public/private %s key pair.\n", key_type_name); |
printf("Generating public/private %s key pair.\n", key_type_name); |
private = key_generate(type, bits); |
private = key_generate(type, bits); |
|
|
* The passphrases do not match. Clear them and |
* The passphrases do not match. Clear them and |
* retry. |
* retry. |
*/ |
*/ |
memset(passphrase1, 0, strlen(passphrase1)); |
explicit_bzero(passphrase1, strlen(passphrase1)); |
memset(passphrase2, 0, strlen(passphrase2)); |
explicit_bzero(passphrase2, strlen(passphrase2)); |
xfree(passphrase1); |
free(passphrase1); |
xfree(passphrase2); |
free(passphrase2); |
printf("Passphrases do not match. Try again.\n"); |
printf("Passphrases do not match. Try again.\n"); |
goto passphrase_again; |
goto passphrase_again; |
} |
} |
/* Clear the other copy of the passphrase. */ |
/* Clear the other copy of the passphrase. */ |
memset(passphrase2, 0, strlen(passphrase2)); |
explicit_bzero(passphrase2, strlen(passphrase2)); |
xfree(passphrase2); |
free(passphrase2); |
} |
} |
|
|
if (identity_comment) { |
if (identity_comment) { |
|
|
} |
} |
|
|
/* Save the key with the given passphrase and comment. */ |
/* Save the key with the given passphrase and comment. */ |
if (!key_save_private(private, identity_file, passphrase1, comment)) { |
if (!key_save_private(private, identity_file, passphrase1, comment, |
|
use_new_format, new_format_cipher, rounds)) { |
printf("Saving the key failed: %s.\n", identity_file); |
printf("Saving the key failed: %s.\n", identity_file); |
memset(passphrase1, 0, strlen(passphrase1)); |
explicit_bzero(passphrase1, strlen(passphrase1)); |
xfree(passphrase1); |
free(passphrase1); |
exit(1); |
exit(1); |
} |
} |
/* Clear the passphrase. */ |
/* Clear the passphrase. */ |
memset(passphrase1, 0, strlen(passphrase1)); |
explicit_bzero(passphrase1, strlen(passphrase1)); |
xfree(passphrase1); |
free(passphrase1); |
|
|
/* Clear the private key and the random number generator. */ |
/* Clear the private key and the random number generator. */ |
key_free(private); |
key_free(private); |
arc4random_stir(); |
|
|
|
if (!quiet) |
if (!quiet) |
printf("Your identification has been saved in %s.\n", identity_file); |
printf("Your identification has been saved in %s.\n", identity_file); |
|
|
printf("%s %s\n", fp, comment); |
printf("%s %s\n", fp, comment); |
printf("The key's randomart image is:\n"); |
printf("The key's randomart image is:\n"); |
printf("%s\n", ra); |
printf("%s\n", ra); |
xfree(ra); |
free(ra); |
xfree(fp); |
free(fp); |
} |
} |
|
|
key_free(public); |
key_free(public); |