version 1.413, 2020/06/26 05:02:03 |
version 1.471, 2023/09/04 10:29:58 |
|
|
#include <fcntl.h> |
#include <fcntl.h> |
#include <netdb.h> |
#include <netdb.h> |
#include <pwd.h> |
#include <pwd.h> |
|
#include <stdarg.h> |
#include <stdio.h> |
#include <stdio.h> |
#include <stdlib.h> |
#include <stdlib.h> |
#include <string.h> |
#include <string.h> |
#include <stdarg.h> |
|
#include <unistd.h> |
#include <unistd.h> |
#include <limits.h> |
#include <limits.h> |
#include <locale.h> |
#include <locale.h> |
|
|
#include "sshsig.h" |
#include "sshsig.h" |
#include "ssh-sk.h" |
#include "ssh-sk.h" |
#include "sk-api.h" /* XXX for SSH_SK_USER_PRESENCE_REQD; remove */ |
#include "sk-api.h" /* XXX for SSH_SK_USER_PRESENCE_REQD; remove */ |
|
#include "cipher.h" |
|
|
#ifdef ENABLE_PKCS11 |
#ifdef ENABLE_PKCS11 |
#include "ssh-pkcs11.h" |
#include "ssh-pkcs11.h" |
#endif |
#endif |
|
|
#ifdef WITH_OPENSSL |
#define DEFAULT_KEY_TYPE_NAME "ed25519" |
# define DEFAULT_KEY_TYPE_NAME "rsa" |
|
#else |
|
# define DEFAULT_KEY_TYPE_NAME "ed25519" |
|
#endif |
|
|
|
/* |
/* |
* Default number of bits in the RSA, DSA and ECDSA keys. These value can be |
* Default number of bits in the RSA, DSA and ECDSA keys. These value can be |
|
|
#define CERTOPT_PTY (1<<3) |
#define CERTOPT_PTY (1<<3) |
#define CERTOPT_USER_RC (1<<4) |
#define CERTOPT_USER_RC (1<<4) |
#define CERTOPT_NO_REQUIRE_USER_PRESENCE (1<<5) |
#define CERTOPT_NO_REQUIRE_USER_PRESENCE (1<<5) |
|
#define CERTOPT_REQUIRE_VERIFY (1<<6) |
#define CERTOPT_DEFAULT (CERTOPT_X_FWD|CERTOPT_AGENT_FWD| \ |
#define CERTOPT_DEFAULT (CERTOPT_X_FWD|CERTOPT_AGENT_FWD| \ |
CERTOPT_PORT_FWD|CERTOPT_PTY|CERTOPT_USER_RC) |
CERTOPT_PORT_FWD|CERTOPT_PTY|CERTOPT_USER_RC) |
static u_int32_t certflags_flags = CERTOPT_DEFAULT; |
static u_int32_t certflags_flags = CERTOPT_DEFAULT; |
|
|
static char *certflags_src_addr = NULL; |
static char *certflags_src_addr = NULL; |
|
|
/* Arbitrary extensions specified by user */ |
/* Arbitrary extensions specified by user */ |
struct cert_userext { |
struct cert_ext { |
char *key; |
char *key; |
char *val; |
char *val; |
int crit; |
int crit; |
}; |
}; |
static struct cert_userext *cert_userext; |
static struct cert_ext *cert_ext; |
static size_t ncert_userext; |
static size_t ncert_ext; |
|
|
/* Conversion to/from various formats */ |
/* Conversion to/from various formats */ |
enum { |
enum { |
|
|
fatal("unknown key type %s", key_type_name); |
fatal("unknown key type %s", key_type_name); |
if (*bitsp == 0) { |
if (*bitsp == 0) { |
#ifdef WITH_OPENSSL |
#ifdef WITH_OPENSSL |
u_int nid; |
int nid; |
|
|
switch(type) { |
switch(type) { |
case KEY_DSA: |
case KEY_DSA: |
|
|
char *name = NULL; |
char *name = NULL; |
|
|
if (key_type_name == NULL) |
if (key_type_name == NULL) |
name = _PATH_SSH_CLIENT_ID_RSA; |
name = _PATH_SSH_CLIENT_ID_ED25519; |
else { |
else { |
switch (sshkey_type_from_name(key_type_name)) { |
switch (sshkey_type_from_name(key_type_name)) { |
case KEY_DSA_CERT: |
case KEY_DSA_CERT: |
|
|
if ((r = sshkey_load_private(filename, "", &prv, commentp)) == 0) |
if ((r = sshkey_load_private(filename, "", &prv, commentp)) == 0) |
return prv; |
return prv; |
if (r != SSH_ERR_KEY_WRONG_PASSPHRASE) |
if (r != SSH_ERR_KEY_WRONG_PASSPHRASE) |
fatal("Load key \"%s\": %s", filename, ssh_err(r)); |
fatal_r(r, "Load key \"%s\"", filename); |
if (identity_passphrase) |
if (identity_passphrase) |
pass = xstrdup(identity_passphrase); |
pass = xstrdup(identity_passphrase); |
else |
else |
|
|
r = sshkey_load_private(filename, pass, &prv, commentp); |
r = sshkey_load_private(filename, pass, &prv, commentp); |
freezero(pass, strlen(pass)); |
freezero(pass, strlen(pass)); |
if (r != 0) |
if (r != 0) |
fatal("Load key \"%s\": %s", filename, ssh_err(r)); |
fatal_r(r, "Load key \"%s\"", filename); |
return prv; |
return prv; |
} |
} |
|
|
|
|
int r; |
int r; |
|
|
if ((b = sshbuf_new()) == NULL) |
if ((b = sshbuf_new()) == NULL) |
fatal("%s: sshbuf_new failed", __func__); |
fatal_f("sshbuf_new failed"); |
if ((r = sshkey_putb(k, b)) != 0) |
if ((r = sshkey_putb(k, b)) != 0) |
fatal("key_to_blob failed: %s", ssh_err(r)); |
fatal_fr(r, "put key"); |
if ((b64 = sshbuf_dtob64_string(b, 1)) == NULL) |
if ((b64 = sshbuf_dtob64_string(b, 1)) == NULL) |
fatal("%s: sshbuf_dtob64_string failed", __func__); |
fatal_f("sshbuf_dtob64_string failed"); |
|
|
/* Comment + surrounds must fit into 72 chars (RFC 4716 sec 3.3) */ |
/* Comment + surrounds must fit into 72 chars (RFC 4716 sec 3.3) */ |
snprintf(comment, sizeof(comment), |
snprintf(comment, sizeof(comment), |
|
|
fatal("PEM_write_EC_PUBKEY failed"); |
fatal("PEM_write_EC_PUBKEY failed"); |
break; |
break; |
default: |
default: |
fatal("%s: unsupported key type %s", __func__, sshkey_type(k)); |
fatal_f("unsupported key type %s", sshkey_type(k)); |
} |
} |
exit(0); |
exit(0); |
} |
} |
|
|
fatal("PEM_write_EC_PUBKEY failed"); |
fatal("PEM_write_EC_PUBKEY failed"); |
break; |
break; |
default: |
default: |
fatal("%s: unsupported key type %s", __func__, sshkey_type(k)); |
fatal_f("unsupported key type %s", sshkey_type(k)); |
} |
} |
exit(0); |
exit(0); |
} |
} |
|
|
do_convert_to_pem(k); |
do_convert_to_pem(k); |
break; |
break; |
default: |
default: |
fatal("%s: unknown key format %d", __func__, convert_format); |
fatal_f("unknown key format %d", convert_format); |
} |
} |
exit(0); |
exit(0); |
} |
} |
|
|
int r; |
int r; |
|
|
if ((r = sshbuf_get_u32(b, &bignum_bits)) != 0) |
if ((r = sshbuf_get_u32(b, &bignum_bits)) != 0) |
fatal("%s: buffer error: %s", __func__, ssh_err(r)); |
fatal_fr(r, "parse"); |
bytes = (bignum_bits + 7) / 8; |
bytes = (bignum_bits + 7) / 8; |
if (sshbuf_len(b) < bytes) |
if (sshbuf_len(b) < bytes) |
fatal("%s: input buffer too small: need %d have %zu", |
fatal_f("input buffer too small: need %d have %zu", |
__func__, bytes, sshbuf_len(b)); |
bytes, sshbuf_len(b)); |
if (BN_bin2bn(sshbuf_ptr(b), bytes, value) == NULL) |
if (BN_bin2bn(sshbuf_ptr(b), bytes, value) == NULL) |
fatal("%s: BN_bin2bn failed", __func__); |
fatal_f("BN_bin2bn failed"); |
if ((r = sshbuf_consume(b, bytes)) != 0) |
if ((r = sshbuf_consume(b, bytes)) != 0) |
fatal("%s: buffer error: %s", __func__, ssh_err(r)); |
fatal_fr(r, "consume"); |
} |
} |
|
|
static struct sshkey * |
static struct sshkey * |
|
|
{ |
{ |
struct sshkey *key = NULL; |
struct sshkey *key = NULL; |
char *type, *cipher; |
char *type, *cipher; |
|
const char *alg = NULL; |
u_char e1, e2, e3, *sig = NULL, data[] = "abcde12345"; |
u_char e1, e2, e3, *sig = NULL, data[] = "abcde12345"; |
int r, rlen, ktype; |
int r, rlen, ktype; |
u_int magic, i1, i2, i3, i4; |
u_int magic, i1, i2, i3, i4; |
|
|
BIGNUM *rsa_p = NULL, *rsa_q = NULL, *rsa_iqmp = NULL; |
BIGNUM *rsa_p = NULL, *rsa_q = NULL, *rsa_iqmp = NULL; |
|
|
if ((r = sshbuf_get_u32(b, &magic)) != 0) |
if ((r = sshbuf_get_u32(b, &magic)) != 0) |
fatal("%s: buffer error: %s", __func__, ssh_err(r)); |
fatal_fr(r, "parse magic"); |
|
|
if (magic != SSH_COM_PRIVATE_KEY_MAGIC) { |
if (magic != SSH_COM_PRIVATE_KEY_MAGIC) { |
error("bad magic 0x%x != 0x%x", magic, |
error("bad magic 0x%x != 0x%x", magic, |
|
|
(r = sshbuf_get_u32(b, &i2)) != 0 || |
(r = sshbuf_get_u32(b, &i2)) != 0 || |
(r = sshbuf_get_u32(b, &i3)) != 0 || |
(r = sshbuf_get_u32(b, &i3)) != 0 || |
(r = sshbuf_get_u32(b, &i4)) != 0) |
(r = sshbuf_get_u32(b, &i4)) != 0) |
fatal("%s: buffer error: %s", __func__, ssh_err(r)); |
fatal_fr(r, "parse"); |
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); |
|
|
(dsa_g = BN_new()) == NULL || |
(dsa_g = BN_new()) == NULL || |
(dsa_pub_key = BN_new()) == NULL || |
(dsa_pub_key = BN_new()) == NULL || |
(dsa_priv_key = BN_new()) == NULL) |
(dsa_priv_key = BN_new()) == NULL) |
fatal("%s: BN_new", __func__); |
fatal_f("BN_new"); |
buffer_get_bignum_bits(b, dsa_p); |
buffer_get_bignum_bits(b, dsa_p); |
buffer_get_bignum_bits(b, dsa_g); |
buffer_get_bignum_bits(b, dsa_g); |
buffer_get_bignum_bits(b, dsa_q); |
buffer_get_bignum_bits(b, dsa_q); |
buffer_get_bignum_bits(b, dsa_pub_key); |
buffer_get_bignum_bits(b, dsa_pub_key); |
buffer_get_bignum_bits(b, dsa_priv_key); |
buffer_get_bignum_bits(b, dsa_priv_key); |
if (!DSA_set0_pqg(key->dsa, dsa_p, dsa_q, dsa_g)) |
if (!DSA_set0_pqg(key->dsa, dsa_p, dsa_q, dsa_g)) |
fatal("%s: DSA_set0_pqg failed", __func__); |
fatal_f("DSA_set0_pqg failed"); |
dsa_p = dsa_q = dsa_g = NULL; /* transferred */ |
dsa_p = dsa_q = dsa_g = NULL; /* transferred */ |
if (!DSA_set0_key(key->dsa, dsa_pub_key, dsa_priv_key)) |
if (!DSA_set0_key(key->dsa, dsa_pub_key, dsa_priv_key)) |
fatal("%s: DSA_set0_key failed", __func__); |
fatal_f("DSA_set0_key failed"); |
dsa_pub_key = dsa_priv_key = NULL; /* transferred */ |
dsa_pub_key = dsa_priv_key = NULL; /* transferred */ |
break; |
break; |
case KEY_RSA: |
case KEY_RSA: |
if ((r = sshbuf_get_u8(b, &e1)) != 0 || |
if ((r = sshbuf_get_u8(b, &e1)) != 0 || |
(e1 < 30 && (r = sshbuf_get_u8(b, &e2)) != 0) || |
(e1 < 30 && (r = sshbuf_get_u8(b, &e2)) != 0) || |
(e1 < 30 && (r = sshbuf_get_u8(b, &e3)) != 0)) |
(e1 < 30 && (r = sshbuf_get_u8(b, &e3)) != 0)) |
fatal("%s: buffer error: %s", __func__, ssh_err(r)); |
fatal_fr(r, "parse RSA"); |
e = e1; |
e = e1; |
debug("e %lx", e); |
debug("e %lx", e); |
if (e < 30) { |
if (e < 30) { |
|
|
debug("e %lx", e); |
debug("e %lx", e); |
} |
} |
if ((rsa_e = BN_new()) == NULL) |
if ((rsa_e = BN_new()) == NULL) |
fatal("%s: BN_new", __func__); |
fatal_f("BN_new"); |
if (!BN_set_word(rsa_e, e)) { |
if (!BN_set_word(rsa_e, e)) { |
BN_clear_free(rsa_e); |
BN_clear_free(rsa_e); |
sshkey_free(key); |
sshkey_free(key); |
|
|
(rsa_p = BN_new()) == NULL || |
(rsa_p = BN_new()) == NULL || |
(rsa_q = BN_new()) == NULL || |
(rsa_q = BN_new()) == NULL || |
(rsa_iqmp = BN_new()) == NULL) |
(rsa_iqmp = BN_new()) == NULL) |
fatal("%s: BN_new", __func__); |
fatal_f("BN_new"); |
buffer_get_bignum_bits(b, rsa_d); |
buffer_get_bignum_bits(b, rsa_d); |
buffer_get_bignum_bits(b, rsa_n); |
buffer_get_bignum_bits(b, rsa_n); |
buffer_get_bignum_bits(b, rsa_iqmp); |
buffer_get_bignum_bits(b, rsa_iqmp); |
buffer_get_bignum_bits(b, rsa_q); |
buffer_get_bignum_bits(b, rsa_q); |
buffer_get_bignum_bits(b, rsa_p); |
buffer_get_bignum_bits(b, rsa_p); |
if (!RSA_set0_key(key->rsa, rsa_n, rsa_e, rsa_d)) |
if (!RSA_set0_key(key->rsa, rsa_n, rsa_e, rsa_d)) |
fatal("%s: RSA_set0_key failed", __func__); |
fatal_f("RSA_set0_key failed"); |
rsa_n = rsa_e = rsa_d = NULL; /* transferred */ |
rsa_n = rsa_e = rsa_d = NULL; /* transferred */ |
if (!RSA_set0_factors(key->rsa, rsa_p, rsa_q)) |
if (!RSA_set0_factors(key->rsa, rsa_p, rsa_q)) |
fatal("%s: RSA_set0_factors failed", __func__); |
fatal_f("RSA_set0_factors failed"); |
rsa_p = rsa_q = NULL; /* transferred */ |
rsa_p = rsa_q = NULL; /* transferred */ |
if ((r = ssh_rsa_complete_crt_parameters(key, rsa_iqmp)) != 0) |
if ((r = ssh_rsa_complete_crt_parameters(key, rsa_iqmp)) != 0) |
fatal("generate RSA parameters failed: %s", ssh_err(r)); |
fatal_fr(r, "generate RSA parameters"); |
BN_clear_free(rsa_iqmp); |
BN_clear_free(rsa_iqmp); |
|
alg = "rsa-sha2-256"; |
break; |
break; |
} |
} |
rlen = sshbuf_len(b); |
rlen = sshbuf_len(b); |
if (rlen != 0) |
if (rlen != 0) |
error("%s: remaining bytes in key blob %d", __func__, rlen); |
error_f("remaining bytes in key blob %d", rlen); |
|
|
/* try the key */ |
/* try the key */ |
if (sshkey_sign(key, &sig, &slen, data, sizeof(data), |
if ((r = sshkey_sign(key, &sig, &slen, data, sizeof(data), |
NULL, NULL, 0) != 0 || |
alg, NULL, NULL, 0)) != 0) |
sshkey_verify(key, sig, slen, data, sizeof(data), |
error_fr(r, "signing with converted key failed"); |
NULL, 0, NULL) != 0) { |
else if ((r = sshkey_verify(key, sig, slen, data, sizeof(data), |
|
alg, 0, NULL)) != 0) |
|
error_fr(r, "verification with converted key failed"); |
|
if (r != 0) { |
sshkey_free(key); |
sshkey_free(key); |
free(sig); |
free(sig); |
return NULL; |
return NULL; |
|
|
(encoded[len-3] == '=')) |
(encoded[len-3] == '=')) |
encoded[len-3] = '\0'; |
encoded[len-3] = '\0'; |
if ((r = sshbuf_b64tod(buf, encoded)) != 0) |
if ((r = sshbuf_b64tod(buf, encoded)) != 0) |
fatal("%s: base64 decoding failed: %s", __func__, ssh_err(r)); |
fatal_fr(r, "base64 decode"); |
if (*private) { |
if (*private) { |
if ((*k = do_convert_private_ssh2(buf)) == NULL) |
if ((*k = do_convert_private_ssh2(buf)) == NULL) |
fatal("%s: private key conversion failed", __func__); |
fatal_f("private key conversion failed"); |
} else if ((r = sshkey_fromb(buf, k)) != 0) |
} else if ((r = sshkey_fromb(buf, k)) != 0) |
fatal("decode blob failed: %s", ssh_err(r)); |
fatal_fr(r, "parse key"); |
sshbuf_free(buf); |
sshbuf_free(buf); |
fclose(fp); |
fclose(fp); |
} |
} |
|
|
if ((fp = fopen(identity_file, "r")) == NULL) |
if ((fp = fopen(identity_file, "r")) == NULL) |
fatal("%s: %s: %s", __progname, identity_file, strerror(errno)); |
fatal("%s: %s: %s", __progname, identity_file, strerror(errno)); |
if ((pubkey = PEM_read_PUBKEY(fp, NULL, NULL, NULL)) == NULL) { |
if ((pubkey = PEM_read_PUBKEY(fp, NULL, NULL, NULL)) == NULL) { |
fatal("%s: %s is not a recognised public key format", __func__, |
fatal_f("%s is not a recognised public key format", |
identity_file); |
identity_file); |
} |
} |
fclose(fp); |
fclose(fp); |
|
|
(*k)->ecdsa_nid = sshkey_ecdsa_key_to_nid((*k)->ecdsa); |
(*k)->ecdsa_nid = sshkey_ecdsa_key_to_nid((*k)->ecdsa); |
break; |
break; |
default: |
default: |
fatal("%s: unsupported pubkey type %d", __func__, |
fatal_f("unsupported pubkey type %d", |
EVP_PKEY_base_id(pubkey)); |
EVP_PKEY_base_id(pubkey)); |
} |
} |
EVP_PKEY_free(pubkey); |
EVP_PKEY_free(pubkey); |
|
|
fclose(fp); |
fclose(fp); |
return; |
return; |
} |
} |
fatal("%s: unrecognised raw private key format", __func__); |
fatal_f("unrecognised raw private key format"); |
} |
} |
|
|
static void |
static void |
|
|
do_convert_from_pem(&k, &private); |
do_convert_from_pem(&k, &private); |
break; |
break; |
default: |
default: |
fatal("%s: unknown key format %d", __func__, convert_format); |
fatal_f("unknown key format %d", convert_format); |
} |
} |
|
|
if (!private) { |
if (!private) { |
|
|
NULL, 0, NULL, NULL); |
NULL, 0, NULL, NULL); |
break; |
break; |
default: |
default: |
fatal("%s: unsupported key type %s", __func__, |
fatal_f("unsupported key type %s", sshkey_type(k)); |
sshkey_type(k)); |
|
} |
} |
} |
} |
|
|
|
|
fatal("%s: %s", identity_file, strerror(errno)); |
fatal("%s: %s", identity_file, strerror(errno)); |
prv = load_identity(identity_file, &comment); |
prv = load_identity(identity_file, &comment); |
if ((r = sshkey_write(prv, stdout)) != 0) |
if ((r = sshkey_write(prv, stdout)) != 0) |
error("sshkey_write failed: %s", ssh_err(r)); |
fatal_fr(r, "write key"); |
sshkey_free(prv); |
|
if (comment != NULL && *comment != '\0') |
if (comment != NULL && *comment != '\0') |
fprintf(stdout, " %s", comment); |
fprintf(stdout, " %s", comment); |
fprintf(stdout, "\n"); |
fprintf(stdout, "\n"); |
|
if (sshkey_is_sk(prv)) { |
|
debug("sk_application: \"%s\", sk_flags 0x%02x", |
|
prv->sk_application, prv->sk_flags); |
|
} |
|
sshkey_free(prv); |
free(comment); |
free(comment); |
exit(0); |
exit(0); |
} |
} |
|
|
ra = sshkey_fingerprint(keys[i], fingerprint_hash, |
ra = sshkey_fingerprint(keys[i], fingerprint_hash, |
SSH_FP_RANDOMART); |
SSH_FP_RANDOMART); |
if (fp == NULL || ra == NULL) |
if (fp == NULL || ra == NULL) |
fatal("%s: sshkey_fingerprint fail", __func__); |
fatal_f("sshkey_fingerprint fail"); |
printf("%u %s %s (PKCS11 key)\n", sshkey_size(keys[i]), |
printf("%u %s %s (PKCS11 key)\n", sshkey_size(keys[i]), |
fp, sshkey_type(keys[i])); |
fp, sshkey_type(keys[i])); |
if (log_level_get() >= SYSLOG_LEVEL_VERBOSE) |
if (log_level_get() >= SYSLOG_LEVEL_VERBOSE) |
|
|
fp = sshkey_fingerprint(public, fptype, rep); |
fp = sshkey_fingerprint(public, fptype, rep); |
ra = sshkey_fingerprint(public, fingerprint_hash, SSH_FP_RANDOMART); |
ra = sshkey_fingerprint(public, fingerprint_hash, SSH_FP_RANDOMART); |
if (fp == NULL || ra == NULL) |
if (fp == NULL || ra == NULL) |
fatal("%s: sshkey_fingerprint failed", __func__); |
fatal_f("sshkey_fingerprint failed"); |
mprintf("%u %s %s (%s)\n", sshkey_size(public), fp, |
mprintf("%u %s %s (%s)\n", sshkey_size(public), fp, |
comment ? comment : "no comment", sshkey_type(public)); |
comment ? comment : "no comment", sshkey_type(public)); |
if (log_level_get() >= SYSLOG_LEVEL_VERBOSE) |
if (log_level_get() >= SYSLOG_LEVEL_VERBOSE) |
|
|
if (stat(identity_file, &st) == -1) |
if (stat(identity_file, &st) == -1) |
fatal("%s: %s", path, strerror(errno)); |
fatal("%s: %s", path, strerror(errno)); |
if ((r = sshkey_load_public(path, &pubkey, &comment)) != 0) |
if ((r = sshkey_load_public(path, &pubkey, &comment)) != 0) |
debug("load public \"%s\": %s", path, ssh_err(r)); |
debug_r(r, "load public \"%s\"", path); |
if (pubkey == NULL || comment == NULL || *comment == '\0') { |
if (pubkey == NULL || comment == NULL || *comment == '\0') { |
free(comment); |
free(comment); |
if ((r = sshkey_load_private(path, NULL, |
if ((r = sshkey_load_private(path, NULL, |
&privkey, &comment)) != 0) |
&privkey, &comment)) != 0) |
debug("load private \"%s\": %s", path, ssh_err(r)); |
debug_r(r, "load private \"%s\"", path); |
} |
} |
if (pubkey == NULL && privkey == NULL) |
if (pubkey == NULL && privkey == NULL) |
fatal("%s is not a key file.", path); |
fatal("%s is not a key file.", path); |
|
|
* accept a public key prefixed with a hostname or options. |
* accept a public key prefixed with a hostname or options. |
* Try a bare key first, otherwise skip the leading stuff. |
* Try a bare key first, otherwise skip the leading stuff. |
*/ |
*/ |
|
comment = NULL; |
if ((public = try_read_key(&cp)) == NULL) { |
if ((public = try_read_key(&cp)) == NULL) { |
i = strtol(cp, &ep, 10); |
i = strtol(cp, &ep, 10); |
if (i == 0 || ep == NULL || |
if (i == 0 || ep == NULL || |
|
|
} key_types[] = { |
} key_types[] = { |
#ifdef WITH_OPENSSL |
#ifdef WITH_OPENSSL |
{ "rsa", "RSA" ,_PATH_HOST_RSA_KEY_FILE }, |
{ "rsa", "RSA" ,_PATH_HOST_RSA_KEY_FILE }, |
{ "dsa", "DSA", _PATH_HOST_DSA_KEY_FILE }, |
|
{ "ecdsa", "ECDSA",_PATH_HOST_ECDSA_KEY_FILE }, |
{ "ecdsa", "ECDSA",_PATH_HOST_ECDSA_KEY_FILE }, |
#endif /* WITH_OPENSSL */ |
#endif /* WITH_OPENSSL */ |
{ "ed25519", "ED25519",_PATH_HOST_ED25519_KEY_FILE }, |
{ "ed25519", "ED25519",_PATH_HOST_ED25519_KEY_FILE }, |
|
|
bits = 0; |
bits = 0; |
type_bits_valid(type, NULL, &bits); |
type_bits_valid(type, NULL, &bits); |
if ((r = sshkey_generate(type, bits, &private)) != 0) { |
if ((r = sshkey_generate(type, bits, &private)) != 0) { |
error("sshkey_generate failed: %s", ssh_err(r)); |
error_r(r, "sshkey_generate failed"); |
goto failnext; |
goto failnext; |
} |
} |
if ((r = sshkey_from_private(private, &public)) != 0) |
if ((r = sshkey_from_private(private, &public)) != 0) |
fatal("sshkey_from_private failed: %s", ssh_err(r)); |
fatal_fr(r, "sshkey_from_private"); |
snprintf(comment, sizeof comment, "%s@%s", pw->pw_name, |
snprintf(comment, sizeof comment, "%s@%s", pw->pw_name, |
hostname); |
hostname); |
if ((r = sshkey_save_private(private, prv_tmp, "", |
if ((r = sshkey_save_private(private, prv_tmp, "", |
comment, private_key_format, openssh_format_cipher, |
comment, private_key_format, openssh_format_cipher, |
rounds)) != 0) { |
rounds)) != 0) { |
error("Saving key \"%s\" failed: %s", |
error_r(r, "Saving key \"%s\" failed", prv_tmp); |
prv_tmp, ssh_err(r)); |
|
goto failnext; |
goto failnext; |
} |
} |
if ((fd = mkstemp(pub_tmp)) == -1) { |
if ((fd = mkstemp(pub_tmp)) == -1) { |
|
|
(void)fchmod(fd, 0644); |
(void)fchmod(fd, 0644); |
(void)close(fd); |
(void)close(fd); |
if ((r = sshkey_save_public(public, pub_tmp, comment)) != 0) { |
if ((r = sshkey_save_public(public, pub_tmp, comment)) != 0) { |
fatal("Unable to save public key to %s: %s", |
error_r(r, "Unable to save public key to %s", |
identity_file, ssh_err(r)); |
identity_file); |
goto failnext; |
goto failnext; |
} |
} |
|
|
|
|
case HKF_STATUS_OK: |
case HKF_STATUS_OK: |
case HKF_STATUS_MATCHED: |
case HKF_STATUS_MATCHED: |
/* |
/* |
* Don't hash hosts already already hashed, with wildcard |
* Don't hash hosts already hashed, with wildcard |
* characters or a CA/revocation marker. |
* characters or a CA/revocation marker. |
*/ |
*/ |
if (was_hashed || has_wild || l->marker != MRK_NONE) { |
if (was_hashed || has_wild || l->marker != MRK_NONE) { |
|
|
if ((hashed = host_hash(cp, NULL, 0)) == NULL) |
if ((hashed = host_hash(cp, NULL, 0)) == NULL) |
fatal("hash_host failed"); |
fatal("hash_host failed"); |
fprintf(ctx->out, "%s %s\n", hashed, l->rawkey); |
fprintf(ctx->out, "%s %s\n", hashed, l->rawkey); |
|
free(hashed); |
ctx->has_unhashed = 1; |
ctx->has_unhashed = 1; |
} |
} |
free(ohosts); |
free(ohosts); |
|
|
ra = sshkey_fingerprint(l->key, |
ra = sshkey_fingerprint(l->key, |
fingerprint_hash, SSH_FP_RANDOMART); |
fingerprint_hash, SSH_FP_RANDOMART); |
if (fp == NULL || ra == NULL) |
if (fp == NULL || ra == NULL) |
fatal("%s: sshkey_fingerprint failed", |
fatal_f("sshkey_fingerprint failed"); |
__func__); |
|
mprintf("%s %s %s%s%s\n", ctx->host, |
mprintf("%s %s %s%s%s\n", ctx->host, |
sshkey_type(l->key), fp, |
sshkey_type(l->key), fp, |
l->comment[0] ? " " : "", |
l->comment[0] ? " " : "", |
|
|
unlink(tmp); |
unlink(tmp); |
fatal("fdopen: %s", strerror(oerrno)); |
fatal("fdopen: %s", strerror(oerrno)); |
} |
} |
fchmod(fd, sb.st_mode & 0644); |
(void)fchmod(fd, sb.st_mode & 0644); |
inplace = 1; |
inplace = 1; |
} |
} |
/* XXX support identity_file == "-" for stdin */ |
/* XXX support identity_file == "-" for stdin */ |
|
|
foreach_options |= print_fingerprint ? HKF_WANT_PARSE_KEY : 0; |
foreach_options |= print_fingerprint ? HKF_WANT_PARSE_KEY : 0; |
if ((r = hostkeys_foreach(identity_file, (find_host || !hash_hosts) ? |
if ((r = hostkeys_foreach(identity_file, (find_host || !hash_hosts) ? |
known_hosts_find_delete : known_hosts_hash, &ctx, name, NULL, |
known_hosts_find_delete : known_hosts_hash, &ctx, name, NULL, |
foreach_options)) != 0) { |
foreach_options, 0)) != 0) { |
if (inplace) |
if (inplace) |
unlink(tmp); |
unlink(tmp); |
fatal("%s: hostkeys_foreach failed: %s", __func__, ssh_err(r)); |
fatal_fr(r, "hostkeys_foreach"); |
} |
} |
|
|
if (inplace) |
if (inplace) |
|
|
goto badkey; |
goto badkey; |
} else if (r != 0) { |
} else if (r != 0) { |
badkey: |
badkey: |
fatal("Failed to load key %s: %s", identity_file, ssh_err(r)); |
fatal_r(r, "Failed to load key %s", identity_file); |
} |
} |
if (comment) |
if (comment) |
mprintf("Key has comment '%s'\n", comment); |
mprintf("Key has comment '%s'\n", comment); |
|
|
/* Save the file using the new passphrase. */ |
/* Save the file using the new passphrase. */ |
if ((r = sshkey_save_private(private, identity_file, passphrase1, |
if ((r = sshkey_save_private(private, identity_file, passphrase1, |
comment, private_key_format, openssh_format_cipher, rounds)) != 0) { |
comment, private_key_format, openssh_format_cipher, rounds)) != 0) { |
error("Saving key \"%s\" failed: %s.", |
error_r(r, "Saving key \"%s\" failed", identity_file); |
identity_file, ssh_err(r)); |
|
freezero(passphrase1, strlen(passphrase1)); |
freezero(passphrase1, strlen(passphrase1)); |
sshkey_free(private); |
sshkey_free(private); |
free(comment); |
free(comment); |
|
|
*/ |
*/ |
static int |
static int |
do_print_resource_record(struct passwd *pw, char *fname, char *hname, |
do_print_resource_record(struct passwd *pw, char *fname, char *hname, |
int print_generic) |
int print_generic, char * const *opts, size_t nopts) |
{ |
{ |
struct sshkey *public; |
struct sshkey *public; |
char *comment = NULL; |
char *comment = NULL; |
struct stat st; |
struct stat st; |
int r; |
int r, hash = -1; |
|
size_t i; |
|
|
|
for (i = 0; i < nopts; i++) { |
|
if (strncasecmp(opts[i], "hashalg=", 8) == 0) { |
|
if ((hash = ssh_digest_alg_by_name(opts[i] + 8)) == -1) |
|
fatal("Unsupported hash algorithm"); |
|
} else { |
|
error("Invalid option \"%s\"", opts[i]); |
|
return SSH_ERR_INVALID_ARGUMENT; |
|
} |
|
} |
if (fname == NULL) |
if (fname == NULL) |
fatal("%s: no filename", __func__); |
fatal_f("no filename"); |
if (stat(fname, &st) == -1) { |
if (stat(fname, &st) == -1) { |
if (errno == ENOENT) |
if (errno == ENOENT) |
return 0; |
return 0; |
fatal("%s: %s", fname, strerror(errno)); |
fatal("%s: %s", fname, strerror(errno)); |
} |
} |
if ((r = sshkey_load_public(fname, &public, &comment)) != 0) |
if ((r = sshkey_load_public(fname, &public, &comment)) != 0) |
fatal("Failed to read v2 public key from \"%s\": %s.", |
fatal_r(r, "Failed to read v2 public key from \"%s\"", fname); |
fname, ssh_err(r)); |
export_dns_rr(hname, public, stdout, print_generic, hash); |
export_dns_rr(hname, public, stdout, print_generic); |
|
sshkey_free(public); |
sshkey_free(public); |
free(comment); |
free(comment); |
return 1; |
return 1; |
|
|
&private, &comment)) == 0) |
&private, &comment)) == 0) |
passphrase = xstrdup(""); |
passphrase = xstrdup(""); |
else if (r != SSH_ERR_KEY_WRONG_PASSPHRASE) |
else if (r != SSH_ERR_KEY_WRONG_PASSPHRASE) |
fatal("Cannot load private key \"%s\": %s.", |
fatal_r(r, "Cannot load private key \"%s\"", identity_file); |
identity_file, ssh_err(r)); |
|
else { |
else { |
if (identity_passphrase) |
if (identity_passphrase) |
passphrase = xstrdup(identity_passphrase); |
passphrase = xstrdup(identity_passphrase); |
|
|
if ((r = sshkey_load_private(identity_file, passphrase, |
if ((r = sshkey_load_private(identity_file, passphrase, |
&private, &comment)) != 0) { |
&private, &comment)) != 0) { |
freezero(passphrase, strlen(passphrase)); |
freezero(passphrase, strlen(passphrase)); |
fatal("Cannot load private key \"%s\": %s.", |
fatal_r(r, "Cannot load private key \"%s\"", |
identity_file, ssh_err(r)); |
identity_file); |
} |
} |
} |
} |
|
|
|
|
if ((r = sshkey_save_private(private, identity_file, passphrase, |
if ((r = sshkey_save_private(private, identity_file, passphrase, |
new_comment, private_key_format, openssh_format_cipher, |
new_comment, private_key_format, openssh_format_cipher, |
rounds)) != 0) { |
rounds)) != 0) { |
error("Saving key \"%s\" failed: %s", |
error_r(r, "Saving key \"%s\" failed", identity_file); |
identity_file, ssh_err(r)); |
|
freezero(passphrase, strlen(passphrase)); |
freezero(passphrase, strlen(passphrase)); |
sshkey_free(private); |
sshkey_free(private); |
free(comment); |
free(comment); |
|
|
} |
} |
freezero(passphrase, strlen(passphrase)); |
freezero(passphrase, strlen(passphrase)); |
if ((r = sshkey_from_private(private, &public)) != 0) |
if ((r = sshkey_from_private(private, &public)) != 0) |
fatal("sshkey_from_private failed: %s", ssh_err(r)); |
fatal_fr(r, "sshkey_from_private"); |
sshkey_free(private); |
sshkey_free(private); |
|
|
strlcat(identity_file, ".pub", sizeof(identity_file)); |
strlcat(identity_file, ".pub", sizeof(identity_file)); |
if ((r = sshkey_save_public(public, identity_file, new_comment)) != 0) { |
if ((r = sshkey_save_public(public, identity_file, new_comment)) != 0) |
fatal("Unable to save public key to %s: %s", |
fatal_r(r, "Unable to save public key to %s", identity_file); |
identity_file, ssh_err(r)); |
|
} |
|
sshkey_free(public); |
sshkey_free(public); |
free(comment); |
free(comment); |
|
|
|
|
} |
} |
|
|
static void |
static void |
add_flag_option(struct sshbuf *c, const char *name) |
cert_ext_add(const char *key, const char *value, int iscrit) |
{ |
{ |
int r; |
cert_ext = xreallocarray(cert_ext, ncert_ext + 1, sizeof(*cert_ext)); |
|
cert_ext[ncert_ext].key = xstrdup(key); |
debug3("%s: %s", __func__, name); |
cert_ext[ncert_ext].val = value == NULL ? NULL : xstrdup(value); |
if ((r = sshbuf_put_cstring(c, name)) != 0 || |
cert_ext[ncert_ext].crit = iscrit; |
(r = sshbuf_put_string(c, NULL, 0)) != 0) |
ncert_ext++; |
fatal("%s: buffer error: %s", __func__, ssh_err(r)); |
|
} |
} |
|
|
static void |
/* qsort(3) comparison function for certificate extensions */ |
add_string_option(struct sshbuf *c, const char *name, const char *value) |
static int |
|
cert_ext_cmp(const void *_a, const void *_b) |
{ |
{ |
struct sshbuf *b; |
const struct cert_ext *a = (const struct cert_ext *)_a; |
|
const struct cert_ext *b = (const struct cert_ext *)_b; |
int r; |
int r; |
|
|
debug3("%s: %s=%s", __func__, name, value); |
if (a->crit != b->crit) |
if ((b = sshbuf_new()) == NULL) |
return (a->crit < b->crit) ? -1 : 1; |
fatal("%s: sshbuf_new failed", __func__); |
if ((r = strcmp(a->key, b->key)) != 0) |
if ((r = sshbuf_put_cstring(b, value)) != 0 || |
return r; |
(r = sshbuf_put_cstring(c, name)) != 0 || |
if ((a->val == NULL) != (b->val == NULL)) |
(r = sshbuf_put_stringb(c, b)) != 0) |
return (a->val == NULL) ? -1 : 1; |
fatal("%s: buffer error: %s", __func__, ssh_err(r)); |
if (a->val != NULL && (r = strcmp(a->val, b->val)) != 0) |
|
return r; |
sshbuf_free(b); |
return 0; |
} |
} |
|
|
#define OPTIONS_CRITICAL 1 |
#define OPTIONS_CRITICAL 1 |
|
|
static void |
static void |
prepare_options_buf(struct sshbuf *c, int which) |
prepare_options_buf(struct sshbuf *c, int which) |
{ |
{ |
|
struct sshbuf *b; |
size_t i; |
size_t i; |
|
int r; |
|
const struct cert_ext *ext; |
|
|
|
if ((b = sshbuf_new()) == NULL) |
|
fatal_f("sshbuf_new failed"); |
sshbuf_reset(c); |
sshbuf_reset(c); |
if ((which & OPTIONS_CRITICAL) != 0 && |
for (i = 0; i < ncert_ext; i++) { |
certflags_command != NULL) |
ext = &cert_ext[i]; |
add_string_option(c, "force-command", certflags_command); |
if ((ext->crit && (which & OPTIONS_EXTENSIONS)) || |
if ((which & OPTIONS_EXTENSIONS) != 0 && |
(!ext->crit && (which & OPTIONS_CRITICAL))) |
(certflags_flags & CERTOPT_X_FWD) != 0) |
|
add_flag_option(c, "permit-X11-forwarding"); |
|
if ((which & OPTIONS_EXTENSIONS) != 0 && |
|
(certflags_flags & CERTOPT_AGENT_FWD) != 0) |
|
add_flag_option(c, "permit-agent-forwarding"); |
|
if ((which & OPTIONS_EXTENSIONS) != 0 && |
|
(certflags_flags & CERTOPT_PORT_FWD) != 0) |
|
add_flag_option(c, "permit-port-forwarding"); |
|
if ((which & OPTIONS_EXTENSIONS) != 0 && |
|
(certflags_flags & CERTOPT_PTY) != 0) |
|
add_flag_option(c, "permit-pty"); |
|
if ((which & OPTIONS_EXTENSIONS) != 0 && |
|
(certflags_flags & CERTOPT_USER_RC) != 0) |
|
add_flag_option(c, "permit-user-rc"); |
|
if ((which & OPTIONS_EXTENSIONS) != 0 && |
|
(certflags_flags & CERTOPT_NO_REQUIRE_USER_PRESENCE) != 0) |
|
add_flag_option(c, "no-touch-required"); |
|
if ((which & OPTIONS_CRITICAL) != 0 && |
|
certflags_src_addr != NULL) |
|
add_string_option(c, "source-address", certflags_src_addr); |
|
for (i = 0; i < ncert_userext; i++) { |
|
if ((cert_userext[i].crit && (which & OPTIONS_EXTENSIONS)) || |
|
(!cert_userext[i].crit && (which & OPTIONS_CRITICAL))) |
|
continue; |
continue; |
if (cert_userext[i].val == NULL) |
if (ext->val == NULL) { |
add_flag_option(c, cert_userext[i].key); |
/* flag option */ |
else { |
debug3_f("%s", ext->key); |
add_string_option(c, cert_userext[i].key, |
if ((r = sshbuf_put_cstring(c, ext->key)) != 0 || |
cert_userext[i].val); |
(r = sshbuf_put_string(c, NULL, 0)) != 0) |
|
fatal_fr(r, "prepare flag"); |
|
} else { |
|
/* key/value option */ |
|
debug3_f("%s=%s", ext->key, ext->val); |
|
sshbuf_reset(b); |
|
if ((r = sshbuf_put_cstring(c, ext->key)) != 0 || |
|
(r = sshbuf_put_cstring(b, ext->val)) != 0 || |
|
(r = sshbuf_put_stringb(c, b)) != 0) |
|
fatal_fr(r, "prepare k/v"); |
} |
} |
} |
} |
|
sshbuf_free(b); |
} |
} |
|
|
|
static void |
|
finalise_cert_exts(void) |
|
{ |
|
/* critical options */ |
|
if (certflags_command != NULL) |
|
cert_ext_add("force-command", certflags_command, 1); |
|
if (certflags_src_addr != NULL) |
|
cert_ext_add("source-address", certflags_src_addr, 1); |
|
if ((certflags_flags & CERTOPT_REQUIRE_VERIFY) != 0) |
|
cert_ext_add("verify-required", NULL, 1); |
|
/* extensions */ |
|
if ((certflags_flags & CERTOPT_X_FWD) != 0) |
|
cert_ext_add("permit-X11-forwarding", NULL, 0); |
|
if ((certflags_flags & CERTOPT_AGENT_FWD) != 0) |
|
cert_ext_add("permit-agent-forwarding", NULL, 0); |
|
if ((certflags_flags & CERTOPT_PORT_FWD) != 0) |
|
cert_ext_add("permit-port-forwarding", NULL, 0); |
|
if ((certflags_flags & CERTOPT_PTY) != 0) |
|
cert_ext_add("permit-pty", NULL, 0); |
|
if ((certflags_flags & CERTOPT_USER_RC) != 0) |
|
cert_ext_add("permit-user-rc", NULL, 0); |
|
if ((certflags_flags & CERTOPT_NO_REQUIRE_USER_PRESENCE) != 0) |
|
cert_ext_add("no-touch-required", NULL, 0); |
|
/* order lexically by key */ |
|
if (ncert_ext > 0) |
|
qsort(cert_ext, ncert_ext, sizeof(*cert_ext), cert_ext_cmp); |
|
} |
|
|
static struct sshkey * |
static struct sshkey * |
load_pkcs11_key(char *path) |
load_pkcs11_key(char *path) |
{ |
{ |
|
|
int r, i, nkeys; |
int r, i, nkeys; |
|
|
if ((r = sshkey_load_public(path, &public, NULL)) != 0) |
if ((r = sshkey_load_public(path, &public, NULL)) != 0) |
fatal("Couldn't load CA public key \"%s\": %s", |
fatal_r(r, "Couldn't load CA public key \"%s\"", path); |
path, ssh_err(r)); |
|
|
|
nkeys = pkcs11_add_provider(pkcs11provider, identity_passphrase, |
nkeys = pkcs11_add_provider(pkcs11provider, identity_passphrase, |
&keys, NULL); |
&keys, NULL); |
debug3("%s: %d keys", __func__, nkeys); |
debug3_f("%d keys", nkeys); |
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++) { |
|
|
static int |
static int |
agent_signer(struct sshkey *key, u_char **sigp, size_t *lenp, |
agent_signer(struct sshkey *key, u_char **sigp, size_t *lenp, |
const u_char *data, size_t datalen, |
const u_char *data, size_t datalen, |
const char *alg, const char *provider, u_int compat, void *ctx) |
const char *alg, const char *provider, const char *pin, |
|
u_int compat, void *ctx) |
{ |
{ |
int *agent_fdp = (int *)ctx; |
int *agent_fdp = (int *)ctx; |
|
|
|
|
u_int n; |
u_int n; |
struct sshkey *ca, *public; |
struct sshkey *ca, *public; |
char valid[64], *otmp, *tmp, *cp, *out, *comment; |
char valid[64], *otmp, *tmp, *cp, *out, *comment; |
char *ca_fp = NULL, **plist = NULL; |
char *ca_fp = NULL, **plist = NULL, *pin = NULL; |
struct ssh_identitylist *agent_ids; |
struct ssh_identitylist *agent_ids; |
size_t j; |
size_t j; |
struct notifier_ctx *notifier = NULL; |
struct notifier_ctx *notifier = NULL; |
|
|
* agent. |
* agent. |
*/ |
*/ |
if ((r = sshkey_load_public(tmp, &ca, NULL)) != 0) |
if ((r = sshkey_load_public(tmp, &ca, NULL)) != 0) |
fatal("Cannot load CA public key %s: %s", |
fatal_r(r, "Cannot load CA public key %s", tmp); |
tmp, ssh_err(r)); |
|
if ((r = ssh_get_authentication_socket(&agent_fd)) != 0) |
if ((r = ssh_get_authentication_socket(&agent_fd)) != 0) |
fatal("Cannot use public key for CA signature: %s", |
fatal_r(r, "Cannot use public key for CA signature"); |
ssh_err(r)); |
|
if ((r = ssh_fetch_identitylist(agent_fd, &agent_ids)) != 0) |
if ((r = ssh_fetch_identitylist(agent_fd, &agent_ids)) != 0) |
fatal("Retrieve agent key list: %s", ssh_err(r)); |
fatal_r(r, "Retrieve agent key list"); |
found = 0; |
found = 0; |
for (j = 0; j < agent_ids->nkeys; j++) { |
for (j = 0; j < agent_ids->nkeys; j++) { |
if (sshkey_equal(ca, agent_ids->keys[j])) { |
if (sshkey_equal(ca, agent_ids->keys[j])) { |
|
|
} else { |
} else { |
/* CA key is assumed to be a private key on the filesystem */ |
/* CA key is assumed to be a private key on the filesystem */ |
ca = load_identity(tmp, NULL); |
ca = load_identity(tmp, NULL); |
|
if (sshkey_is_sk(ca) && |
|
(ca->sk_flags & SSH_SK_USER_VERIFICATION_REQD)) { |
|
if ((pin = read_passphrase("Enter PIN for CA key: ", |
|
RP_ALLOW_STDIN)) == NULL) |
|
fatal_f("couldn't read PIN"); |
|
} |
} |
} |
free(tmp); |
free(tmp); |
|
|
|
|
} |
} |
ca_fp = sshkey_fingerprint(ca, fingerprint_hash, SSH_FP_DEFAULT); |
ca_fp = sshkey_fingerprint(ca, fingerprint_hash, SSH_FP_DEFAULT); |
|
|
|
finalise_cert_exts(); |
for (i = 0; i < argc; i++) { |
for (i = 0; i < argc; i++) { |
/* Split list of principals */ |
/* Split list of principals */ |
n = 0; |
n = 0; |
|
|
|
|
tmp = tilde_expand_filename(argv[i], pw->pw_uid); |
tmp = tilde_expand_filename(argv[i], pw->pw_uid); |
if ((r = sshkey_load_public(tmp, &public, &comment)) != 0) |
if ((r = sshkey_load_public(tmp, &public, &comment)) != 0) |
fatal("%s: unable to open \"%s\": %s", |
fatal_r(r, "load pubkey \"%s\"", tmp); |
__func__, tmp, ssh_err(r)); |
|
if (sshkey_is_cert(public)) |
if (sshkey_is_cert(public)) |
fatal("%s: key \"%s\" type %s cannot be certified", |
fatal_f("key \"%s\" type %s cannot be certified", |
__func__, tmp, sshkey_type(public)); |
tmp, sshkey_type(public)); |
|
|
/* Prepare certificate to sign */ |
/* Prepare certificate to sign */ |
if ((r = sshkey_to_certified(public)) != 0) |
if ((r = sshkey_to_certified(public)) != 0) |
fatal("Could not upgrade key %s to certificate: %s", |
fatal_r(r, "Could not upgrade key %s to certificate", tmp); |
tmp, ssh_err(r)); |
|
public->cert->type = cert_key_type; |
public->cert->type = cert_key_type; |
public->cert->serial = (u_int64_t)cert_serial; |
public->cert->serial = (u_int64_t)cert_serial; |
public->cert->key_id = xstrdup(cert_key_id); |
public->cert->key_id = xstrdup(cert_key_id); |
|
|
OPTIONS_EXTENSIONS); |
OPTIONS_EXTENSIONS); |
if ((r = sshkey_from_private(ca, |
if ((r = sshkey_from_private(ca, |
&public->cert->signature_key)) != 0) |
&public->cert->signature_key)) != 0) |
fatal("sshkey_from_private (ca key): %s", ssh_err(r)); |
fatal_r(r, "sshkey_from_private (ca key)"); |
|
|
if (agent_fd != -1 && (ca->flags & SSHKEY_FLAG_EXT) != 0) { |
if (agent_fd != -1 && (ca->flags & SSHKEY_FLAG_EXT) != 0) { |
if ((r = sshkey_certify_custom(public, ca, |
if ((r = sshkey_certify_custom(public, ca, |
key_type_name, sk_provider, agent_signer, |
key_type_name, sk_provider, NULL, agent_signer, |
&agent_fd)) != 0) |
&agent_fd)) != 0) |
fatal("Couldn't certify key %s via agent: %s", |
fatal_r(r, "Couldn't certify %s via agent", tmp); |
tmp, ssh_err(r)); |
|
} else { |
} else { |
if (sshkey_is_sk(ca) && |
if (sshkey_is_sk(ca) && |
(ca->sk_flags & SSH_SK_USER_PRESENCE_REQD)) { |
(ca->sk_flags & SSH_SK_USER_PRESENCE_REQD)) { |
|
|
sshkey_type(ca), ca_fp); |
sshkey_type(ca), ca_fp); |
} |
} |
r = sshkey_certify(public, ca, key_type_name, |
r = sshkey_certify(public, ca, key_type_name, |
sk_provider); |
sk_provider, pin); |
notify_complete(notifier); |
notify_complete(notifier, "User presence confirmed"); |
if (r != 0) |
if (r != 0) |
fatal("Couldn't certify key %s: %s", |
fatal_r(r, "Couldn't certify key %s", tmp); |
tmp, ssh_err(r)); |
|
} |
} |
|
|
if ((cp = strrchr(tmp, '.')) != NULL && strcmp(cp, ".pub") == 0) |
if ((cp = strrchr(tmp, '.')) != NULL && strcmp(cp, ".pub") == 0) |
|
|
free(tmp); |
free(tmp); |
|
|
if ((r = sshkey_save_public(public, out, comment)) != 0) { |
if ((r = sshkey_save_public(public, out, comment)) != 0) { |
fatal("Unable to save public key to %s: %s", |
fatal_r(r, "Unable to save public key to %s", |
identity_file, ssh_err(r)); |
identity_file); |
} |
} |
|
|
if (!quiet) { |
if (!quiet) { |
|
|
if (cert_serial_autoinc) |
if (cert_serial_autoinc) |
cert_serial++; |
cert_serial++; |
} |
} |
|
if (pin != NULL) |
|
freezero(pin, strlen(pin)); |
free(ca_fp); |
free(ca_fp); |
#ifdef ENABLE_PKCS11 |
#ifdef ENABLE_PKCS11 |
pkcs11_terminate(); |
pkcs11_terminate(); |
|
|
} |
} |
|
|
static void |
static void |
|
parse_hex_u64(const char *s, uint64_t *up) |
|
{ |
|
char *ep; |
|
unsigned long long ull; |
|
|
|
errno = 0; |
|
ull = strtoull(s, &ep, 16); |
|
if (*s == '\0' || *ep != '\0') |
|
fatal("Invalid certificate time: not a number"); |
|
if (errno == ERANGE && ull == ULONG_MAX) |
|
fatal_fr(SSH_ERR_SYSTEM_ERROR, "Invalid certificate time"); |
|
*up = (uint64_t)ull; |
|
} |
|
|
|
static void |
parse_cert_times(char *timespec) |
parse_cert_times(char *timespec) |
{ |
{ |
char *from, *to; |
char *from, *to; |
|
|
|
|
/* |
/* |
* from:to, where |
* from:to, where |
* from := [+-]timespec | YYYYMMDD | YYYYMMDDHHMMSS | "always" |
* from := [+-]timespec | YYYYMMDD | YYYYMMDDHHMMSS | 0x... | "always" |
* to := [+-]timespec | YYYYMMDD | YYYYMMDDHHMMSS | "forever" |
* to := [+-]timespec | YYYYMMDD | YYYYMMDDHHMMSS | 0x... | "forever" |
*/ |
*/ |
from = xstrdup(timespec); |
from = xstrdup(timespec); |
to = strchr(from, ':'); |
to = strchr(from, ':'); |
|
|
cert_valid_from = parse_relative_time(from, now); |
cert_valid_from = parse_relative_time(from, now); |
else if (strcmp(from, "always") == 0) |
else if (strcmp(from, "always") == 0) |
cert_valid_from = 0; |
cert_valid_from = 0; |
|
else if (strncmp(from, "0x", 2) == 0) |
|
parse_hex_u64(from, &cert_valid_from); |
else if (parse_absolute_time(from, &cert_valid_from) != 0) |
else if (parse_absolute_time(from, &cert_valid_from) != 0) |
fatal("Invalid from time \"%s\"", from); |
fatal("Invalid from time \"%s\"", from); |
|
|
|
|
cert_valid_to = parse_relative_time(to, now); |
cert_valid_to = parse_relative_time(to, now); |
else if (strcmp(to, "forever") == 0) |
else if (strcmp(to, "forever") == 0) |
cert_valid_to = ~(u_int64_t)0; |
cert_valid_to = ~(u_int64_t)0; |
|
else if (strncmp(to, "0x", 2) == 0) |
|
parse_hex_u64(to, &cert_valid_to); |
else if (parse_absolute_time(to, &cert_valid_to) != 0) |
else if (parse_absolute_time(to, &cert_valid_to) != 0) |
fatal("Invalid to time \"%s\"", to); |
fatal("Invalid to time \"%s\"", to); |
|
|
|
|
certflags_flags &= ~CERTOPT_NO_REQUIRE_USER_PRESENCE; |
certflags_flags &= ~CERTOPT_NO_REQUIRE_USER_PRESENCE; |
else if (strcasecmp(opt, "no-touch-required") == 0) |
else if (strcasecmp(opt, "no-touch-required") == 0) |
certflags_flags |= CERTOPT_NO_REQUIRE_USER_PRESENCE; |
certflags_flags |= CERTOPT_NO_REQUIRE_USER_PRESENCE; |
|
else if (strcasecmp(opt, "no-verify-required") == 0) |
|
certflags_flags &= ~CERTOPT_REQUIRE_VERIFY; |
|
else if (strcasecmp(opt, "verify-required") == 0) |
|
certflags_flags |= CERTOPT_REQUIRE_VERIFY; |
else if (strncasecmp(opt, "force-command=", 14) == 0) { |
else if (strncasecmp(opt, "force-command=", 14) == 0) { |
val = opt + 14; |
val = opt + 14; |
if (*val == '\0') |
if (*val == '\0') |
|
|
fatal("Invalid source-address list"); |
fatal("Invalid source-address list"); |
certflags_src_addr = xstrdup(val); |
certflags_src_addr = xstrdup(val); |
} else if (strncasecmp(opt, "extension:", 10) == 0 || |
} else if (strncasecmp(opt, "extension:", 10) == 0 || |
(iscrit = (strncasecmp(opt, "critical:", 9) == 0))) { |
(iscrit = (strncasecmp(opt, "critical:", 9) == 0))) { |
val = xstrdup(strchr(opt, ':') + 1); |
val = xstrdup(strchr(opt, ':') + 1); |
if ((cp = strchr(val, '=')) != NULL) |
if ((cp = strchr(val, '=')) != NULL) |
*cp++ = '\0'; |
*cp++ = '\0'; |
cert_userext = xreallocarray(cert_userext, ncert_userext + 1, |
cert_ext_add(val, cp, iscrit); |
sizeof(*cert_userext)); |
free(val); |
cert_userext[ncert_userext].key = val; |
|
cert_userext[ncert_userext].val = cp == NULL ? |
|
NULL : xstrdup(cp); |
|
cert_userext[ncert_userext].crit = iscrit; |
|
ncert_userext++; |
|
} else |
} else |
fatal("Unsupported certificate option \"%s\"", opt); |
fatal("Unsupported certificate option \"%s\"", opt); |
} |
} |
|
|
static void |
static void |
show_options(struct sshbuf *optbuf, int in_critical) |
show_options(struct sshbuf *optbuf, int in_critical) |
{ |
{ |
char *name, *arg; |
char *name, *arg, *hex; |
struct sshbuf *options, *option = NULL; |
struct sshbuf *options, *option = NULL; |
int r; |
int r; |
|
|
if ((options = sshbuf_fromb(optbuf)) == NULL) |
if ((options = sshbuf_fromb(optbuf)) == NULL) |
fatal("%s: sshbuf_fromb failed", __func__); |
fatal_f("sshbuf_fromb failed"); |
while (sshbuf_len(options) != 0) { |
while (sshbuf_len(options) != 0) { |
sshbuf_free(option); |
sshbuf_free(option); |
option = NULL; |
option = NULL; |
if ((r = sshbuf_get_cstring(options, &name, NULL)) != 0 || |
if ((r = sshbuf_get_cstring(options, &name, NULL)) != 0 || |
(r = sshbuf_froms(options, &option)) != 0) |
(r = sshbuf_froms(options, &option)) != 0) |
fatal("%s: buffer error: %s", __func__, ssh_err(r)); |
fatal_fr(r, "parse option"); |
printf(" %s", name); |
printf(" %s", name); |
if (!in_critical && |
if (!in_critical && |
(strcmp(name, "permit-X11-forwarding") == 0 || |
(strcmp(name, "permit-X11-forwarding") == 0 || |
|
|
(strcmp(name, "force-command") == 0 || |
(strcmp(name, "force-command") == 0 || |
strcmp(name, "source-address") == 0)) { |
strcmp(name, "source-address") == 0)) { |
if ((r = sshbuf_get_cstring(option, &arg, NULL)) != 0) |
if ((r = sshbuf_get_cstring(option, &arg, NULL)) != 0) |
fatal("%s: buffer error: %s", |
fatal_fr(r, "parse critical"); |
__func__, ssh_err(r)); |
|
printf(" %s\n", arg); |
printf(" %s\n", arg); |
free(arg); |
free(arg); |
} else { |
} else if (in_critical && |
printf(" UNKNOWN OPTION (len %zu)\n", |
strcmp(name, "verify-required") == 0) { |
sshbuf_len(option)); |
printf("\n"); |
|
} else if (sshbuf_len(option) > 0) { |
|
hex = sshbuf_dtob16(option); |
|
printf(" UNKNOWN OPTION: %s (len %zu)\n", |
|
hex, sshbuf_len(option)); |
sshbuf_reset(option); |
sshbuf_reset(option); |
} |
free(hex); |
|
} else |
|
printf(" UNKNOWN FLAG OPTION\n"); |
free(name); |
free(name); |
if (sshbuf_len(option) != 0) |
if (sshbuf_len(option) != 0) |
fatal("Option corrupt: extra data at end"); |
fatal("Option corrupt: extra data at end"); |
|
|
ca_fp = sshkey_fingerprint(key->cert->signature_key, |
ca_fp = sshkey_fingerprint(key->cert->signature_key, |
fingerprint_hash, SSH_FP_DEFAULT); |
fingerprint_hash, SSH_FP_DEFAULT); |
if (key_fp == NULL || ca_fp == NULL) |
if (key_fp == NULL || ca_fp == NULL) |
fatal("%s: sshkey_fingerprint fail", __func__); |
fatal_f("sshkey_fingerprint fail"); |
sshkey_format_cert_validity(key->cert, valid, sizeof(valid)); |
sshkey_format_cert_validity(key->cert, valid, sizeof(valid)); |
|
|
printf(" Type: %s %s certificate\n", sshkey_ssh_name(key), |
printf(" Type: %s %s certificate\n", sshkey_ssh_name(key), |
|
|
if ((key = sshkey_new(KEY_UNSPEC)) == NULL) |
if ((key = sshkey_new(KEY_UNSPEC)) == NULL) |
fatal("sshkey_new"); |
fatal("sshkey_new"); |
if ((r = sshkey_read(key, &cp)) != 0) { |
if ((r = sshkey_read(key, &cp)) != 0) { |
error("%s:%lu: invalid key: %s", path, |
error_r(r, "%s:%lu: invalid key", path, lnum); |
lnum, ssh_err(r)); |
|
continue; |
continue; |
} |
} |
if (!sshkey_is_cert(key)) { |
if (!sshkey_is_cert(key)) { |
|
|
int r; |
int r; |
|
|
if ((r = sshbuf_load_file(path, &krlbuf)) != 0) |
if ((r = sshbuf_load_file(path, &krlbuf)) != 0) |
fatal("Unable to load KRL: %s", ssh_err(r)); |
fatal_r(r, "Unable to load KRL %s", path); |
/* XXX check sigs */ |
/* XXX check sigs */ |
if ((r = ssh_krl_from_blob(krlbuf, krlp, NULL, 0)) != 0 || |
if ((r = ssh_krl_from_blob(krlbuf, krlp)) != 0 || |
*krlp == NULL) |
*krlp == NULL) |
fatal("Invalid KRL file: %s", ssh_err(r)); |
fatal_r(r, "Invalid KRL file %s", path); |
sshbuf_free(krlbuf); |
sshbuf_free(krlbuf); |
} |
} |
|
|
|
|
* OpenSSH base64 hashes omit trailing '=' |
* OpenSSH base64 hashes omit trailing '=' |
* characters; put them back for decode. |
* characters; put them back for decode. |
*/ |
*/ |
tlen = strlen(cp); |
if ((tlen = strlen(cp)) >= SIZE_MAX - 5) |
|
fatal_f("hash too long: %zu bytes", tlen); |
tmp = xmalloc(tlen + 4 + 1); |
tmp = xmalloc(tlen + 4 + 1); |
strlcpy(tmp, cp, tlen + 1); |
strlcpy(tmp, cp, tlen + 1); |
while ((tlen % 4) != 0) { |
while ((tlen % 4) != 0) { |
|
|
tmp[tlen] = '\0'; |
tmp[tlen] = '\0'; |
} |
} |
if ((b = sshbuf_new()) == NULL) |
if ((b = sshbuf_new()) == NULL) |
fatal("%s: sshbuf_new failed", __func__); |
fatal_f("sshbuf_new failed"); |
if ((r = sshbuf_b64tod(b, tmp)) != 0) |
if ((r = sshbuf_b64tod(b, tmp)) != 0) |
fatal("%s:%lu: decode hash failed: %s", file, lnum, ssh_err(r)); |
fatal_r(r, "%s:%lu: decode hash failed", file, lnum); |
free(tmp); |
free(tmp); |
*lenp = sshbuf_len(b); |
*lenp = sshbuf_len(b); |
*blobp = xmalloc(*lenp); |
*blobp = xmalloc(*lenp); |
|
|
if (!quiet) |
if (!quiet) |
printf("Revoking from %s\n", path); |
printf("Revoking from %s\n", path); |
while (getline(&line, &linesize, krl_spec) != -1) { |
while (getline(&line, &linesize, krl_spec) != -1) { |
|
if (linesize >= INT_MAX) { |
|
fatal_f("%s contains unparsable line, len=%zu", |
|
path, linesize); |
|
} |
lnum++; |
lnum++; |
was_explicit_key = was_sha1 = was_sha256 = was_hash = 0; |
was_explicit_key = was_sha1 = was_sha256 = was_hash = 0; |
cp = line + strspn(line, " \t"); |
cp = line + strspn(line, " \t"); |
|
|
} |
} |
if (ssh_krl_revoke_cert_by_serial_range(krl, |
if (ssh_krl_revoke_cert_by_serial_range(krl, |
ca, serial, serial2) != 0) { |
ca, serial, serial2) != 0) { |
fatal("%s: revoke serial failed", |
fatal_f("revoke serial failed"); |
__func__); |
|
} |
} |
} else if (strncasecmp(cp, "id:", 3) == 0) { |
} else if (strncasecmp(cp, "id:", 3) == 0) { |
if (ca == NULL && !wild_ca) { |
if (ca == NULL && !wild_ca) { |
|
|
cp += 3; |
cp += 3; |
cp = cp + strspn(cp, " \t"); |
cp = cp + strspn(cp, " \t"); |
if (ssh_krl_revoke_cert_by_key_id(krl, ca, cp) != 0) |
if (ssh_krl_revoke_cert_by_key_id(krl, ca, cp) != 0) |
fatal("%s: revoke key ID failed", __func__); |
fatal_f("revoke key ID failed"); |
} else if (strncasecmp(cp, "hash:", 5) == 0) { |
} else if (strncasecmp(cp, "hash:", 5) == 0) { |
cp += 5; |
cp += 5; |
cp = cp + strspn(cp, " \t"); |
cp = cp + strspn(cp, " \t"); |
hash_to_blob(cp, &blob, &blen, file, lnum); |
hash_to_blob(cp, &blob, &blen, file, lnum); |
r = ssh_krl_revoke_key_sha256(krl, blob, blen); |
r = ssh_krl_revoke_key_sha256(krl, blob, blen); |
if (r != 0) |
if (r != 0) |
fatal("%s: revoke key failed: %s", |
fatal_fr(r, "revoke key failed"); |
__func__, ssh_err(r)); |
|
} else { |
} else { |
if (strncasecmp(cp, "key:", 4) == 0) { |
if (strncasecmp(cp, "key:", 4) == 0) { |
cp += 4; |
cp += 4; |
|
|
if ((key = sshkey_new(KEY_UNSPEC)) == NULL) |
if ((key = sshkey_new(KEY_UNSPEC)) == NULL) |
fatal("sshkey_new"); |
fatal("sshkey_new"); |
if ((r = sshkey_read(key, &cp)) != 0) |
if ((r = sshkey_read(key, &cp)) != 0) |
fatal("%s:%lu: invalid key: %s", |
fatal_r(r, "%s:%lu: invalid key", path, lnum); |
path, lnum, ssh_err(r)); |
|
if (was_explicit_key) |
if (was_explicit_key) |
r = ssh_krl_revoke_key_explicit(krl, key); |
r = ssh_krl_revoke_key_explicit(krl, key); |
else if (was_sha1) { |
else if (was_sha1) { |
|
|
} else |
} else |
r = ssh_krl_revoke_key(krl, key); |
r = ssh_krl_revoke_key(krl, key); |
if (r != 0) |
if (r != 0) |
fatal("%s: revoke key failed: %s", |
fatal_fr(r, "revoke key failed"); |
__func__, ssh_err(r)); |
|
freezero(blob, blen); |
freezero(blob, blen); |
blob = NULL; |
blob = NULL; |
blen = 0; |
blen = 0; |
|
|
else { |
else { |
tmp = tilde_expand_filename(ca_key_path, pw->pw_uid); |
tmp = tilde_expand_filename(ca_key_path, pw->pw_uid); |
if ((r = sshkey_load_public(tmp, &ca, NULL)) != 0) |
if ((r = sshkey_load_public(tmp, &ca, NULL)) != 0) |
fatal("Cannot load CA public key %s: %s", |
fatal_r(r, "Cannot load CA public key %s", tmp); |
tmp, ssh_err(r)); |
|
free(tmp); |
free(tmp); |
} |
} |
} |
} |
|
|
|
|
if ((kbuf = sshbuf_new()) == NULL) |
if ((kbuf = sshbuf_new()) == NULL) |
fatal("sshbuf_new failed"); |
fatal("sshbuf_new failed"); |
if (ssh_krl_to_blob(krl, kbuf, NULL, 0) != 0) |
if (ssh_krl_to_blob(krl, kbuf) != 0) |
fatal("Couldn't generate KRL"); |
fatal("Couldn't generate KRL"); |
if ((r = sshbuf_write_file(identity_file, kbuf)) != 0) |
if ((r = sshbuf_write_file(identity_file, kbuf)) != 0) |
fatal("write %s: %s", identity_file, strerror(errno)); |
fatal("write %s: %s", identity_file, strerror(errno)); |
|
|
krl_dump(krl, stdout); |
krl_dump(krl, stdout); |
for (i = 0; i < argc; i++) { |
for (i = 0; i < argc; i++) { |
if ((r = sshkey_load_public(argv[i], &k, &comment)) != 0) |
if ((r = sshkey_load_public(argv[i], &k, &comment)) != 0) |
fatal("Cannot load public key %s: %s", |
fatal_r(r, "Cannot load public key %s", argv[i]); |
argv[i], ssh_err(r)); |
|
r = ssh_krl_check_key(krl, k); |
r = ssh_krl_check_key(krl, k); |
printf("%s%s%s%s: %s\n", argv[i], |
printf("%s%s%s%s: %s\n", argv[i], |
*comment ? " (" : "", comment, *comment ? ")" : "", |
*comment ? " (" : "", comment, *comment ? ")" : "", |
|
|
{ |
{ |
size_t i, slen, plen = strlen(keypath); |
size_t i, slen, plen = strlen(keypath); |
char *privpath = xstrdup(keypath); |
char *privpath = xstrdup(keypath); |
const char *suffixes[] = { "-cert.pub", ".pub", NULL }; |
static const char * const suffixes[] = { "-cert.pub", ".pub", NULL }; |
struct sshkey *ret = NULL, *privkey = NULL; |
struct sshkey *ret = NULL, *privkey = NULL; |
int r; |
int r, waspub = 0; |
|
struct stat st; |
|
|
/* |
/* |
* If passed a public key filename, then try to locate the corresponding |
* If passed a public key filename, then try to locate the corresponding |
|
|
strcmp(privpath + plen - slen, suffixes[i]) != 0) |
strcmp(privpath + plen - slen, suffixes[i]) != 0) |
continue; |
continue; |
privpath[plen - slen] = '\0'; |
privpath[plen - slen] = '\0'; |
debug("%s: %s looks like a public key, using private key " |
debug_f("%s looks like a public key, using private key " |
"path %s instead", __func__, keypath, privpath); |
"path %s instead", keypath, privpath); |
|
waspub = 1; |
} |
} |
if ((privkey = load_identity(privpath, NULL)) == NULL) { |
if (waspub && stat(privpath, &st) != 0 && errno == ENOENT) |
error("Couldn't load identity %s", keypath); |
fatal("No private key found for public key \"%s\"", keypath); |
goto done; |
if ((r = sshkey_load_private(privpath, "", &privkey, NULL)) != 0 && |
} |
(r != SSH_ERR_KEY_WRONG_PASSPHRASE)) { |
|
debug_fr(r, "load private key \"%s\"", privpath); |
|
fatal("No private key found for \"%s\"", privpath); |
|
} else if (privkey == NULL) |
|
privkey = load_identity(privpath, NULL); |
|
|
if (!sshkey_equal_public(pubkey, privkey)) { |
if (!sshkey_equal_public(pubkey, privkey)) { |
error("Public key %s doesn't match private %s", |
error("Public key %s doesn't match private %s", |
keypath, privpath); |
keypath, privpath); |
|
|
* it capable of signing. |
* it capable of signing. |
*/ |
*/ |
if ((r = sshkey_to_certified(privkey)) != 0) { |
if ((r = sshkey_to_certified(privkey)) != 0) { |
error("%s: sshkey_to_certified: %s", __func__, |
error_fr(r, "sshkey_to_certified"); |
ssh_err(r)); |
|
goto done; |
goto done; |
} |
} |
if ((r = sshkey_cert_copy(pubkey, privkey)) != 0) { |
if ((r = sshkey_cert_copy(pubkey, privkey)) != 0) { |
error("%s: sshkey_cert_copy: %s", __func__, ssh_err(r)); |
error_fr(r, "sshkey_cert_copy"); |
goto done; |
goto done; |
} |
} |
} |
} |
|
|
|
|
static int |
static int |
sign_one(struct sshkey *signkey, const char *filename, int fd, |
sign_one(struct sshkey *signkey, const char *filename, int fd, |
const char *sig_namespace, sshsig_signer *signer, void *signer_ctx) |
const char *sig_namespace, const char *hashalg, sshsig_signer *signer, |
|
void *signer_ctx) |
{ |
{ |
struct sshbuf *sigbuf = NULL, *abuf = NULL; |
struct sshbuf *sigbuf = NULL, *abuf = NULL; |
int r = SSH_ERR_INTERNAL_ERROR, wfd = -1, oerrno; |
int r = SSH_ERR_INTERNAL_ERROR, wfd = -1, oerrno; |
char *wfile = NULL, *asig = NULL, *fp = NULL; |
char *wfile = NULL, *asig = NULL, *fp = NULL; |
|
char *pin = NULL, *prompt = NULL; |
|
|
if (!quiet) { |
if (!quiet) { |
if (fd == STDIN_FILENO) |
if (fd == STDIN_FILENO) |
|
|
else |
else |
fprintf(stderr, "Signing file %s\n", filename); |
fprintf(stderr, "Signing file %s\n", filename); |
} |
} |
if (signer == NULL && sshkey_is_sk(signkey) && |
if (signer == NULL && sshkey_is_sk(signkey)) { |
(signkey->sk_flags & SSH_SK_USER_PRESENCE_REQD)) { |
if ((signkey->sk_flags & SSH_SK_USER_VERIFICATION_REQD)) { |
if ((fp = sshkey_fingerprint(signkey, fingerprint_hash, |
xasprintf(&prompt, "Enter PIN for %s key: ", |
SSH_FP_DEFAULT)) == NULL) |
sshkey_type(signkey)); |
fatal("%s: sshkey_fingerprint failed", __func__); |
if ((pin = read_passphrase(prompt, |
fprintf(stderr, "Confirm user presence for key %s %s\n", |
RP_ALLOW_STDIN)) == NULL) |
sshkey_type(signkey), fp); |
fatal_f("couldn't read PIN"); |
free(fp); |
} |
|
if ((signkey->sk_flags & SSH_SK_USER_PRESENCE_REQD)) { |
|
if ((fp = sshkey_fingerprint(signkey, fingerprint_hash, |
|
SSH_FP_DEFAULT)) == NULL) |
|
fatal_f("fingerprint failed"); |
|
fprintf(stderr, "Confirm user presence for key %s %s\n", |
|
sshkey_type(signkey), fp); |
|
free(fp); |
|
} |
} |
} |
if ((r = sshsig_sign_fd(signkey, NULL, sk_provider, fd, sig_namespace, |
if ((r = sshsig_sign_fd(signkey, hashalg, sk_provider, pin, |
&sigbuf, signer, signer_ctx)) != 0) { |
fd, sig_namespace, &sigbuf, signer, signer_ctx)) != 0) { |
error("Signing %s failed: %s", filename, ssh_err(r)); |
error_r(r, "Signing %s failed", filename); |
goto out; |
goto out; |
} |
} |
if ((r = sshsig_armor(sigbuf, &abuf)) != 0) { |
if ((r = sshsig_armor(sigbuf, &abuf)) != 0) { |
error("%s: sshsig_armor: %s", __func__, ssh_err(r)); |
error_fr(r, "sshsig_armor"); |
goto out; |
goto out; |
} |
} |
if ((asig = sshbuf_dup_string(abuf)) == NULL) { |
if ((asig = sshbuf_dup_string(abuf)) == NULL) { |
error("%s: buffer error", __func__); |
error_f("buffer error"); |
r = SSH_ERR_ALLOC_FAIL; |
r = SSH_ERR_ALLOC_FAIL; |
goto out; |
goto out; |
} |
} |
|
|
r = 0; |
r = 0; |
out: |
out: |
free(wfile); |
free(wfile); |
|
free(prompt); |
free(asig); |
free(asig); |
|
if (pin != NULL) |
|
freezero(pin, strlen(pin)); |
sshbuf_free(abuf); |
sshbuf_free(abuf); |
sshbuf_free(sigbuf); |
sshbuf_free(sigbuf); |
if (wfd != -1) |
if (wfd != -1) |
|
|
} |
} |
|
|
static int |
static int |
sig_sign(const char *keypath, const char *sig_namespace, int argc, char **argv) |
sig_process_opts(char * const *opts, size_t nopts, char **hashalgp, |
|
uint64_t *verify_timep, int *print_pubkey) |
{ |
{ |
|
size_t i; |
|
time_t now; |
|
|
|
if (verify_timep != NULL) |
|
*verify_timep = 0; |
|
if (print_pubkey != NULL) |
|
*print_pubkey = 0; |
|
if (hashalgp != NULL) |
|
*hashalgp = NULL; |
|
for (i = 0; i < nopts; i++) { |
|
if (hashalgp != NULL && |
|
strncasecmp(opts[i], "hashalg=", 8) == 0) { |
|
*hashalgp = xstrdup(opts[i] + 8); |
|
} else if (verify_timep && |
|
strncasecmp(opts[i], "verify-time=", 12) == 0) { |
|
if (parse_absolute_time(opts[i] + 12, |
|
verify_timep) != 0 || *verify_timep == 0) { |
|
error("Invalid \"verify-time\" option"); |
|
return SSH_ERR_INVALID_ARGUMENT; |
|
} |
|
} else if (print_pubkey && |
|
strcasecmp(opts[i], "print-pubkey") == 0) { |
|
*print_pubkey = 1; |
|
} else { |
|
error("Invalid option \"%s\"", opts[i]); |
|
return SSH_ERR_INVALID_ARGUMENT; |
|
} |
|
} |
|
if (verify_timep && *verify_timep == 0) { |
|
if ((now = time(NULL)) < 0) { |
|
error("Time is before epoch"); |
|
return SSH_ERR_INVALID_ARGUMENT; |
|
} |
|
*verify_timep = (uint64_t)now; |
|
} |
|
return 0; |
|
} |
|
|
|
|
|
static int |
|
sig_sign(const char *keypath, const char *sig_namespace, int require_agent, |
|
int argc, char **argv, char * const *opts, size_t nopts) |
|
{ |
int i, fd = -1, r, ret = -1; |
int i, fd = -1, r, ret = -1; |
int agent_fd = -1; |
int agent_fd = -1; |
struct sshkey *pubkey = NULL, *privkey = NULL, *signkey = NULL; |
struct sshkey *pubkey = NULL, *privkey = NULL, *signkey = NULL; |
sshsig_signer *signer = NULL; |
sshsig_signer *signer = NULL; |
|
char *hashalg = NULL; |
|
|
/* Check file arguments. */ |
/* Check file arguments. */ |
for (i = 0; i < argc; i++) { |
for (i = 0; i < argc; i++) { |
|
|
fatal("Cannot sign mix of paths and standard input"); |
fatal("Cannot sign mix of paths and standard input"); |
} |
} |
|
|
|
if (sig_process_opts(opts, nopts, &hashalg, NULL, NULL) != 0) |
|
goto done; /* error already logged */ |
|
|
if ((r = sshkey_load_public(keypath, &pubkey, NULL)) != 0) { |
if ((r = sshkey_load_public(keypath, &pubkey, NULL)) != 0) { |
error("Couldn't load public key %s: %s", keypath, ssh_err(r)); |
error_r(r, "Couldn't load public key %s", keypath); |
goto done; |
goto done; |
} |
} |
|
|
if ((r = ssh_get_authentication_socket(&agent_fd)) != 0) |
if ((r = ssh_get_authentication_socket(&agent_fd)) != 0) { |
debug("Couldn't get agent socket: %s", ssh_err(r)); |
if (require_agent) |
else { |
fatal("Couldn't get agent socket"); |
|
debug_r(r, "Couldn't get agent socket"); |
|
} else { |
if ((r = ssh_agent_has_key(agent_fd, pubkey)) == 0) |
if ((r = ssh_agent_has_key(agent_fd, pubkey)) == 0) |
signer = agent_signer; |
signer = agent_signer; |
else |
else { |
debug("Couldn't find key in agent: %s", ssh_err(r)); |
if (require_agent) |
|
fatal("Couldn't find key in agent"); |
|
debug_r(r, "Couldn't find key in agent"); |
|
} |
} |
} |
|
|
if (signer == NULL) { |
if (signer == NULL) { |
|
|
|
|
if (argc == 0) { |
if (argc == 0) { |
if ((r = sign_one(signkey, "(stdin)", STDIN_FILENO, |
if ((r = sign_one(signkey, "(stdin)", STDIN_FILENO, |
sig_namespace, signer, &agent_fd)) != 0) |
sig_namespace, hashalg, signer, &agent_fd)) != 0) |
goto done; |
goto done; |
} else { |
} else { |
for (i = 0; i < argc; i++) { |
for (i = 0; i < argc; i++) { |
|
|
goto done; |
goto done; |
} |
} |
if ((r = sign_one(signkey, argv[i], fd, sig_namespace, |
if ((r = sign_one(signkey, argv[i], fd, sig_namespace, |
signer, &agent_fd)) != 0) |
hashalg, signer, &agent_fd)) != 0) |
goto done; |
goto done; |
if (fd != STDIN_FILENO) |
if (fd != STDIN_FILENO) |
close(fd); |
close(fd); |
|
|
close(fd); |
close(fd); |
sshkey_free(pubkey); |
sshkey_free(pubkey); |
sshkey_free(privkey); |
sshkey_free(privkey); |
|
free(hashalg); |
return ret; |
return ret; |
} |
} |
|
|
static int |
static int |
sig_verify(const char *signature, const char *sig_namespace, |
sig_verify(const char *signature, const char *sig_namespace, |
const char *principal, const char *allowed_keys, const char *revoked_keys) |
const char *principal, const char *allowed_keys, const char *revoked_keys, |
|
char * const *opts, size_t nopts) |
{ |
{ |
int r, ret = -1; |
int r, ret = -1; |
|
int print_pubkey = 0; |
struct sshbuf *sigbuf = NULL, *abuf = NULL; |
struct sshbuf *sigbuf = NULL, *abuf = NULL; |
struct sshkey *sign_key = NULL; |
struct sshkey *sign_key = NULL; |
char *fp = NULL; |
char *fp = NULL; |
struct sshkey_sig_details *sig_details = NULL; |
struct sshkey_sig_details *sig_details = NULL; |
|
uint64_t verify_time = 0; |
|
|
|
if (sig_process_opts(opts, nopts, NULL, &verify_time, |
|
&print_pubkey) != 0) |
|
goto done; /* error already logged */ |
|
|
memset(&sig_details, 0, sizeof(sig_details)); |
memset(&sig_details, 0, sizeof(sig_details)); |
if ((r = sshbuf_load_file(signature, &abuf)) != 0) { |
if ((r = sshbuf_load_file(signature, &abuf)) != 0) { |
error("Couldn't read signature file: %s", ssh_err(r)); |
error_r(r, "Couldn't read signature file"); |
goto done; |
goto done; |
} |
} |
|
|
if ((r = sshsig_dearmor(abuf, &sigbuf)) != 0) { |
if ((r = sshsig_dearmor(abuf, &sigbuf)) != 0) { |
error("%s: sshsig_armor: %s", __func__, ssh_err(r)); |
error_fr(r, "sshsig_armor"); |
goto done; |
goto done; |
} |
} |
if ((r = sshsig_verify_fd(sigbuf, STDIN_FILENO, sig_namespace, |
if ((r = sshsig_verify_fd(sigbuf, STDIN_FILENO, sig_namespace, |
|
|
|
|
if ((fp = sshkey_fingerprint(sign_key, fingerprint_hash, |
if ((fp = sshkey_fingerprint(sign_key, fingerprint_hash, |
SSH_FP_DEFAULT)) == NULL) |
SSH_FP_DEFAULT)) == NULL) |
fatal("%s: sshkey_fingerprint failed", __func__); |
fatal_f("sshkey_fingerprint failed"); |
debug("Valid (unverified) signature from key %s", fp); |
debug("Valid (unverified) signature from key %s", fp); |
if (sig_details != NULL) { |
if (sig_details != NULL) { |
debug2("%s: signature details: counter = %u, flags = 0x%02x", |
debug2_f("signature details: counter = %u, flags = 0x%02x", |
__func__, sig_details->sk_counter, sig_details->sk_flags); |
sig_details->sk_counter, sig_details->sk_flags); |
} |
} |
free(fp); |
free(fp); |
fp = NULL; |
fp = NULL; |
|
|
if (revoked_keys != NULL) { |
if (revoked_keys != NULL) { |
if ((r = sshkey_check_revoked(sign_key, revoked_keys)) != 0) { |
if ((r = sshkey_check_revoked(sign_key, revoked_keys)) != 0) { |
debug3("sshkey_check_revoked failed: %s", ssh_err(r)); |
debug3_fr(r, "sshkey_check_revoked"); |
goto done; |
goto done; |
} |
} |
} |
} |
|
|
if (allowed_keys != NULL && |
if (allowed_keys != NULL && (r = sshsig_check_allowed_keys(allowed_keys, |
(r = sshsig_check_allowed_keys(allowed_keys, sign_key, |
sign_key, principal, sig_namespace, verify_time)) != 0) { |
principal, sig_namespace)) != 0) { |
debug3_fr(r, "sshsig_check_allowed_keys"); |
debug3("sshsig_check_allowed_keys failed: %s", ssh_err(r)); |
|
goto done; |
goto done; |
} |
} |
/* success */ |
/* success */ |
|
|
if (!quiet) { |
if (!quiet) { |
if (ret == 0) { |
if (ret == 0) { |
if ((fp = sshkey_fingerprint(sign_key, fingerprint_hash, |
if ((fp = sshkey_fingerprint(sign_key, fingerprint_hash, |
SSH_FP_DEFAULT)) == NULL) { |
SSH_FP_DEFAULT)) == NULL) |
fatal("%s: sshkey_fingerprint failed", |
fatal_f("sshkey_fingerprint failed"); |
__func__); |
|
} |
|
if (principal == NULL) { |
if (principal == NULL) { |
printf("Good \"%s\" signature with %s key %s\n", |
printf("Good \"%s\" signature with %s key %s\n", |
sig_namespace, sshkey_type(sign_key), fp); |
sig_namespace, sshkey_type(sign_key), fp); |
|
|
} else { |
} else { |
printf("Good \"%s\" signature for %s with %s key %s\n", |
printf("Good \"%s\" signature for %s with %s key %s\n", |
sig_namespace, principal, |
sig_namespace, principal, |
sshkey_type(sign_key), fp); |
sshkey_type(sign_key), fp); |
} |
} |
} else { |
} else { |
printf("Could not verify signature.\n"); |
printf("Could not verify signature.\n"); |
} |
} |
} |
} |
|
/* Print the signature key if requested */ |
|
if (ret == 0 && print_pubkey && sign_key != NULL) { |
|
if ((r = sshkey_write(sign_key, stdout)) == 0) |
|
fputc('\n', stdout); |
|
else { |
|
error_r(r, "Could not print public key.\n"); |
|
ret = -1; |
|
} |
|
} |
sshbuf_free(sigbuf); |
sshbuf_free(sigbuf); |
sshbuf_free(abuf); |
sshbuf_free(abuf); |
sshkey_free(sign_key); |
sshkey_free(sign_key); |
|
|
} |
} |
|
|
static int |
static int |
sig_find_principals(const char *signature, const char *allowed_keys) { |
sig_find_principals(const char *signature, const char *allowed_keys, |
|
char * const *opts, size_t nopts) |
|
{ |
int r, ret = -1; |
int r, ret = -1; |
struct sshbuf *sigbuf = NULL, *abuf = NULL; |
struct sshbuf *sigbuf = NULL, *abuf = NULL; |
struct sshkey *sign_key = NULL; |
struct sshkey *sign_key = NULL; |
char *principals = NULL, *cp, *tmp; |
char *principals = NULL, *cp, *tmp; |
|
uint64_t verify_time = 0; |
|
|
|
if (sig_process_opts(opts, nopts, NULL, &verify_time, NULL) != 0) |
|
goto done; /* error already logged */ |
|
|
if ((r = sshbuf_load_file(signature, &abuf)) != 0) { |
if ((r = sshbuf_load_file(signature, &abuf)) != 0) { |
error("Couldn't read signature file: %s", ssh_err(r)); |
error_r(r, "Couldn't read signature file"); |
goto done; |
goto done; |
} |
} |
if ((r = sshsig_dearmor(abuf, &sigbuf)) != 0) { |
if ((r = sshsig_dearmor(abuf, &sigbuf)) != 0) { |
error("%s: sshsig_armor: %s", __func__, ssh_err(r)); |
error_fr(r, "sshsig_armor"); |
goto done; |
goto done; |
} |
} |
if ((r = sshsig_get_pubkey(sigbuf, &sign_key)) != 0) { |
if ((r = sshsig_get_pubkey(sigbuf, &sign_key)) != 0) { |
error("%s: sshsig_get_pubkey: %s", |
error_fr(r, "sshsig_get_pubkey"); |
__func__, ssh_err(r)); |
|
goto done; |
goto done; |
} |
} |
if ((r = sshsig_find_principals(allowed_keys, sign_key, |
if ((r = sshsig_find_principals(allowed_keys, sign_key, |
&principals)) != 0) { |
verify_time, &principals)) != 0) { |
error("%s: sshsig_get_principal: %s", |
if (r != SSH_ERR_KEY_NOT_FOUND) |
__func__, ssh_err(r)); |
error_fr(r, "sshsig_find_principal"); |
goto done; |
goto done; |
} |
} |
ret = 0; |
ret = 0; |
|
|
return ret; |
return ret; |
} |
} |
|
|
|
static int |
|
sig_match_principals(const char *allowed_keys, char *principal, |
|
char * const *opts, size_t nopts) |
|
{ |
|
int r; |
|
char **principals = NULL; |
|
size_t i, nprincipals = 0; |
|
|
|
if ((r = sig_process_opts(opts, nopts, NULL, NULL, NULL)) != 0) |
|
return r; /* error already logged */ |
|
|
|
if ((r = sshsig_match_principals(allowed_keys, principal, |
|
&principals, &nprincipals)) != 0) { |
|
debug_f("match: %s", ssh_err(r)); |
|
fprintf(stderr, "No principal matched.\n"); |
|
return r; |
|
} |
|
for (i = 0; i < nprincipals; i++) { |
|
printf("%s\n", principals[i]); |
|
free(principals[i]); |
|
} |
|
free(principals); |
|
|
|
return 0; |
|
} |
|
|
static void |
static void |
do_moduli_gen(const char *out_file, char **opts, size_t nopts) |
do_moduli_gen(const char *out_file, char **opts, size_t nopts) |
{ |
{ |
|
|
} else if (strncmp(opts[i], "start-line=", 11) == 0) { |
} else if (strncmp(opts[i], "start-line=", 11) == 0) { |
start_lineno = strtoul(opts[i]+11, NULL, 10); |
start_lineno = strtoul(opts[i]+11, NULL, 10); |
} else if (strncmp(opts[i], "checkpoint=", 11) == 0) { |
} else if (strncmp(opts[i], "checkpoint=", 11) == 0) { |
|
free(checkpoint); |
checkpoint = xstrdup(opts[i]+11); |
checkpoint = xstrdup(opts[i]+11); |
} else if (strncmp(opts[i], "generator=", 10) == 0) { |
} else if (strncmp(opts[i], "generator=", 10) == 0) { |
generator_wanted = (u_int32_t)strtonum( |
generator_wanted = (u_int32_t)strtonum( |
|
|
generator_wanted, checkpoint, |
generator_wanted, checkpoint, |
start_lineno, lines_to_process) != 0) |
start_lineno, lines_to_process) != 0) |
fatal("modulus screening failed"); |
fatal("modulus screening failed"); |
|
if (in != stdin) |
|
(void)fclose(in); |
|
free(checkpoint); |
#else /* WITH_OPENSSL */ |
#else /* WITH_OPENSSL */ |
fatal("Moduli screening is not supported"); |
fatal("Moduli screening is not supported"); |
#endif /* WITH_OPENSSL */ |
#endif /* WITH_OPENSSL */ |
} |
} |
|
|
|
/* Read and confirm a passphrase */ |
static char * |
static char * |
private_key_passphrase(void) |
read_check_passphrase(const char *prompt1, const char *prompt2, |
|
const char *retry_prompt) |
{ |
{ |
char *passphrase1, *passphrase2; |
char *passphrase1, *passphrase2; |
|
|
/* Ask for a passphrase (twice). */ |
for (;;) { |
if (identity_passphrase) |
passphrase1 = read_passphrase(prompt1, RP_ALLOW_STDIN); |
passphrase1 = xstrdup(identity_passphrase); |
passphrase2 = read_passphrase(prompt2, RP_ALLOW_STDIN); |
else if (identity_new_passphrase) |
if (strcmp(passphrase1, passphrase2) == 0) { |
passphrase1 = xstrdup(identity_new_passphrase); |
|
else { |
|
passphrase_again: |
|
passphrase1 = |
|
read_passphrase("Enter passphrase (empty for no " |
|
"passphrase): ", RP_ALLOW_STDIN); |
|
passphrase2 = read_passphrase("Enter same passphrase again: ", |
|
RP_ALLOW_STDIN); |
|
if (strcmp(passphrase1, passphrase2) != 0) { |
|
/* |
|
* The passphrases do not match. Clear them and |
|
* retry. |
|
*/ |
|
freezero(passphrase1, strlen(passphrase1)); |
|
freezero(passphrase2, strlen(passphrase2)); |
freezero(passphrase2, strlen(passphrase2)); |
printf("Passphrases do not match. Try again.\n"); |
return passphrase1; |
goto passphrase_again; |
|
} |
} |
/* Clear the other copy of the passphrase. */ |
/* The passphrases do not match. Clear them and retry. */ |
|
freezero(passphrase1, strlen(passphrase1)); |
freezero(passphrase2, strlen(passphrase2)); |
freezero(passphrase2, strlen(passphrase2)); |
|
fputs(retry_prompt, stdout); |
|
fputc('\n', stdout); |
|
fflush(stdout); |
} |
} |
return passphrase1; |
/* NOTREACHED */ |
|
return NULL; |
} |
} |
|
|
static const char * |
static char * |
skip_ssh_url_preamble(const char *s) |
private_key_passphrase(void) |
{ |
{ |
if (strncmp(s, "ssh://", 6) == 0) |
if (identity_passphrase) |
return s + 6; |
return xstrdup(identity_passphrase); |
else if (strncmp(s, "ssh:", 4) == 0) |
if (identity_new_passphrase) |
return s + 4; |
return xstrdup(identity_new_passphrase); |
return s; |
|
|
return read_check_passphrase( |
|
"Enter passphrase (empty for no passphrase): ", |
|
"Enter same passphrase again: ", |
|
"Passphrases do not match. Try again."); |
} |
} |
|
|
|
static char * |
|
sk_suffix(const char *application, const uint8_t *user, size_t userlen) |
|
{ |
|
char *ret, *cp; |
|
size_t slen, i; |
|
|
|
/* Trim off URL-like preamble */ |
|
if (strncmp(application, "ssh://", 6) == 0) |
|
ret = xstrdup(application + 6); |
|
else if (strncmp(application, "ssh:", 4) == 0) |
|
ret = xstrdup(application + 4); |
|
else |
|
ret = xstrdup(application); |
|
|
|
/* Count trailing zeros in user */ |
|
for (i = 0; i < userlen; i++) { |
|
if (user[userlen - i - 1] != 0) |
|
break; |
|
} |
|
if (i >= userlen) |
|
return ret; /* user-id was default all-zeros */ |
|
|
|
/* Append user-id, escaping non-UTF-8 characters */ |
|
slen = userlen - i; |
|
if (asmprintf(&cp, INT_MAX, NULL, "%.*s", (int)slen, user) == -1) |
|
fatal_f("asmprintf failed"); |
|
/* Don't emit a user-id that contains path or control characters */ |
|
if (strchr(cp, '/') != NULL || strstr(cp, "..") != NULL || |
|
strchr(cp, '\\') != NULL) { |
|
free(cp); |
|
cp = tohex(user, slen); |
|
} |
|
xextendf(&ret, "_", "%s", cp); |
|
free(cp); |
|
return ret; |
|
} |
|
|
static int |
static int |
do_download_sk(const char *skprovider, const char *device) |
do_download_sk(const char *skprovider, const char *device) |
{ |
{ |
struct sshkey **keys; |
struct sshsk_resident_key **srks; |
size_t nkeys, i; |
size_t nsrks, i; |
int r, ret = -1; |
int r, ret = -1; |
char *fp, *pin = NULL, *pass = NULL, *path, *pubpath; |
char *fp, *pin = NULL, *pass = NULL, *path, *pubpath; |
const char *ext; |
const char *ext; |
|
struct sshkey *key; |
|
|
if (skprovider == NULL) |
if (skprovider == NULL) |
fatal("Cannot download keys without provider"); |
fatal("Cannot download keys without provider"); |
|
|
for (i = 0; i < 2; i++) { |
pin = read_passphrase("Enter PIN for authenticator: ", RP_ALLOW_STDIN); |
if (i == 1) { |
if (!quiet) { |
pin = read_passphrase("Enter PIN for authenticator: ", |
printf("You may need to touch your authenticator " |
RP_ALLOW_STDIN); |
"to authorize key download.\n"); |
} |
|
if ((r = sshsk_load_resident(skprovider, device, pin, |
|
&keys, &nkeys)) != 0) { |
|
if (i == 0 && r == SSH_ERR_KEY_WRONG_PASSPHRASE) |
|
continue; |
|
if (pin != NULL) |
|
freezero(pin, strlen(pin)); |
|
error("Unable to load resident keys: %s", ssh_err(r)); |
|
return -1; |
|
} |
|
} |
} |
if (nkeys == 0) |
if ((r = sshsk_load_resident(skprovider, device, pin, 0, |
|
&srks, &nsrks)) != 0) { |
|
if (pin != NULL) |
|
freezero(pin, strlen(pin)); |
|
error_r(r, "Unable to load resident keys"); |
|
return -1; |
|
} |
|
if (nsrks == 0) |
logit("No keys to download"); |
logit("No keys to download"); |
if (pin != NULL) |
if (pin != NULL) |
freezero(pin, strlen(pin)); |
freezero(pin, strlen(pin)); |
|
|
for (i = 0; i < nkeys; i++) { |
for (i = 0; i < nsrks; i++) { |
if (keys[i]->type != KEY_ECDSA_SK && |
key = srks[i]->key; |
keys[i]->type != KEY_ED25519_SK) { |
if (key->type != KEY_ECDSA_SK && key->type != KEY_ED25519_SK) { |
error("Unsupported key type %s (%d)", |
error("Unsupported key type %s (%d)", |
sshkey_type(keys[i]), keys[i]->type); |
sshkey_type(key), key->type); |
continue; |
continue; |
} |
} |
if ((fp = sshkey_fingerprint(keys[i], |
if ((fp = sshkey_fingerprint(key, fingerprint_hash, |
fingerprint_hash, SSH_FP_DEFAULT)) == NULL) |
SSH_FP_DEFAULT)) == NULL) |
fatal("%s: sshkey_fingerprint failed", __func__); |
fatal_f("sshkey_fingerprint failed"); |
debug("%s: key %zu: %s %s %s (flags 0x%02x)", __func__, i, |
debug_f("key %zu: %s %s %s (flags 0x%02x)", i, |
sshkey_type(keys[i]), fp, keys[i]->sk_application, |
sshkey_type(key), fp, key->sk_application, key->sk_flags); |
keys[i]->sk_flags); |
ext = sk_suffix(key->sk_application, |
ext = skip_ssh_url_preamble(keys[i]->sk_application); |
srks[i]->user_id, srks[i]->user_id_len); |
xasprintf(&path, "id_%s_rk%s%s", |
xasprintf(&path, "id_%s_rk%s%s", |
keys[i]->type == KEY_ECDSA_SK ? "ecdsa_sk" : "ed25519_sk", |
key->type == KEY_ECDSA_SK ? "ecdsa_sk" : "ed25519_sk", |
*ext == '\0' ? "" : "_", ext); |
*ext == '\0' ? "" : "_", ext); |
|
|
/* If the file already exists, ask the user to confirm. */ |
/* If the file already exists, ask the user to confirm. */ |
|
|
/* Save the key with the application string as the comment */ |
/* Save the key with the application string as the comment */ |
if (pass == NULL) |
if (pass == NULL) |
pass = private_key_passphrase(); |
pass = private_key_passphrase(); |
if ((r = sshkey_save_private(keys[i], path, pass, |
if ((r = sshkey_save_private(key, path, pass, |
keys[i]->sk_application, private_key_format, |
key->sk_application, private_key_format, |
openssh_format_cipher, rounds)) != 0) { |
openssh_format_cipher, rounds)) != 0) { |
error("Saving key \"%s\" failed: %s", |
error_r(r, "Saving key \"%s\" failed", path); |
path, ssh_err(r)); |
|
free(path); |
free(path); |
break; |
break; |
} |
} |
if (!quiet) { |
if (!quiet) { |
printf("Saved %s key%s%s to %s\n", |
printf("Saved %s key%s%s to %s\n", sshkey_type(key), |
sshkey_type(keys[i]), |
|
*ext != '\0' ? " " : "", |
*ext != '\0' ? " " : "", |
*ext != '\0' ? keys[i]->sk_application : "", |
*ext != '\0' ? key->sk_application : "", |
path); |
path); |
} |
} |
|
|
/* Save public key too */ |
/* Save public key too */ |
xasprintf(&pubpath, "%s.pub", path); |
xasprintf(&pubpath, "%s.pub", path); |
free(path); |
free(path); |
if ((r = sshkey_save_public(keys[i], pubpath, |
if ((r = sshkey_save_public(key, pubpath, |
keys[i]->sk_application)) != 0) { |
key->sk_application)) != 0) { |
error("Saving public key \"%s\" failed: %s", |
error_r(r, "Saving public key \"%s\" failed", pubpath); |
pubpath, ssh_err(r)); |
|
free(pubpath); |
free(pubpath); |
break; |
break; |
} |
} |
free(pubpath); |
free(pubpath); |
} |
} |
|
|
if (i >= nkeys) |
if (i >= nsrks) |
ret = 0; /* success */ |
ret = 0; /* success */ |
if (pass != NULL) |
if (pass != NULL) |
freezero(pass, strlen(pass)); |
freezero(pass, strlen(pass)); |
for (i = 0; i < nkeys; i++) |
sshsk_free_resident_keys(srks, nsrks); |
sshkey_free(keys[i]); |
|
free(keys); |
|
return ret; |
return ret; |
} |
} |
|
|
static void |
static void |
|
save_attestation(struct sshbuf *attest, const char *path) |
|
{ |
|
mode_t omask; |
|
int r; |
|
|
|
if (path == NULL) |
|
return; /* nothing to do */ |
|
if (attest == NULL || sshbuf_len(attest) == 0) |
|
fatal("Enrollment did not return attestation data"); |
|
omask = umask(077); |
|
r = sshbuf_write_file(path, attest); |
|
umask(omask); |
|
if (r != 0) |
|
fatal_r(r, "Unable to write attestation data \"%s\"", path); |
|
if (!quiet) |
|
printf("Your FIDO attestation certificate has been saved in " |
|
"%s\n", path); |
|
} |
|
|
|
static int |
|
confirm_sk_overwrite(const char *application, const char *user) |
|
{ |
|
char yesno[3]; |
|
|
|
printf("A resident key scoped to '%s' with user id '%s' already " |
|
"exists.\n", application == NULL ? "ssh:" : application, |
|
user == NULL ? "null" : user); |
|
printf("Overwrite key in token (y/n)? "); |
|
fflush(stdout); |
|
if (fgets(yesno, sizeof(yesno), stdin) == NULL) |
|
return 0; |
|
if (yesno[0] != 'y' && yesno[0] != 'Y') |
|
return 0; |
|
return 1; |
|
} |
|
|
|
static void |
usage(void) |
usage(void) |
{ |
{ |
fprintf(stderr, |
fprintf(stderr, |
"usage: ssh-keygen [-q] [-b bits] [-C comment] [-f output_keyfile] [-m format]\n" |
"usage: ssh-keygen [-q] [-a rounds] [-b bits] [-C comment] [-f output_keyfile]\n" |
|
" [-m format] [-N new_passphrase] [-O option]\n" |
" [-t dsa | ecdsa | ecdsa-sk | ed25519 | ed25519-sk | rsa]\n" |
" [-t dsa | ecdsa | ecdsa-sk | ed25519 | ed25519-sk | rsa]\n" |
" [-N new_passphrase] [-O option] [-w provider]\n" |
" [-w provider] [-Z cipher]\n" |
" ssh-keygen -p [-f keyfile] [-m format] [-N new_passphrase]\n" |
" ssh-keygen -p [-a rounds] [-f keyfile] [-m format] [-N new_passphrase]\n" |
" [-P old_passphrase]\n" |
" [-P old_passphrase] [-Z cipher]\n" |
|
#ifdef WITH_OPENSSL |
" ssh-keygen -i [-f input_keyfile] [-m key_format]\n" |
" ssh-keygen -i [-f input_keyfile] [-m key_format]\n" |
" ssh-keygen -e [-f input_keyfile] [-m key_format]\n" |
" ssh-keygen -e [-f input_keyfile] [-m key_format]\n" |
|
#endif |
" ssh-keygen -y [-f input_keyfile]\n" |
" ssh-keygen -y [-f input_keyfile]\n" |
" ssh-keygen -c [-C comment] [-f keyfile] [-P passphrase]\n" |
" ssh-keygen -c [-a rounds] [-C comment] [-f keyfile] [-P passphrase]\n" |
" ssh-keygen -l [-v] [-E fingerprint_hash] [-f input_keyfile]\n" |
" ssh-keygen -l [-v] [-E fingerprint_hash] [-f input_keyfile]\n" |
" ssh-keygen -B [-f input_keyfile]\n"); |
" ssh-keygen -B [-f input_keyfile]\n"); |
#ifdef ENABLE_PKCS11 |
#ifdef ENABLE_PKCS11 |
|
|
fprintf(stderr, |
fprintf(stderr, |
" ssh-keygen -F hostname [-lv] [-f known_hosts_file]\n" |
" ssh-keygen -F hostname [-lv] [-f known_hosts_file]\n" |
" ssh-keygen -H [-f known_hosts_file]\n" |
" ssh-keygen -H [-f known_hosts_file]\n" |
" ssh-keygen -K [-w provider]\n" |
" ssh-keygen -K [-a rounds] [-w provider]\n" |
" ssh-keygen -R hostname [-f known_hosts_file]\n" |
" ssh-keygen -R hostname [-f known_hosts_file]\n" |
" ssh-keygen -r hostname [-g] [-f input_keyfile]\n" |
" ssh-keygen -r hostname [-g] [-f input_keyfile]\n" |
#ifdef WITH_OPENSSL |
#ifdef WITH_OPENSSL |
|
|
" [-n principals] [-O option] [-V validity_interval]\n" |
" [-n principals] [-O option] [-V validity_interval]\n" |
" [-z serial_number] file ...\n" |
" [-z serial_number] file ...\n" |
" ssh-keygen -L [-f input_keyfile]\n" |
" ssh-keygen -L [-f input_keyfile]\n" |
" ssh-keygen -A [-f prefix_path]\n" |
" ssh-keygen -A [-a rounds] [-f prefix_path]\n" |
" ssh-keygen -k -f krl_file [-u] [-s ca_public] [-z version_number]\n" |
" ssh-keygen -k -f krl_file [-u] [-s ca_public] [-z version_number]\n" |
" file ...\n" |
" file ...\n" |
" ssh-keygen -Q [-l] -f krl_file [file ...]\n" |
" ssh-keygen -Q [-l] -f krl_file [file ...]\n" |
" ssh-keygen -Y find-principals -s signature_file -f allowed_signers_file\n" |
" ssh-keygen -Y find-principals -s signature_file -f allowed_signers_file\n" |
|
" ssh-keygen -Y match-principals -I signer_identity -f allowed_signers_file\n" |
" ssh-keygen -Y check-novalidate -n namespace -s signature_file\n" |
" ssh-keygen -Y check-novalidate -n namespace -s signature_file\n" |
" ssh-keygen -Y sign -f key_file -n namespace file ...\n" |
" ssh-keygen -Y sign -f key_file -n namespace file [-O option] ...\n" |
" ssh-keygen -Y verify -f allowed_signers_file -I signer_identity\n" |
" ssh-keygen -Y verify -f allowed_signers_file -I signer_identity\n" |
" -n namespace -s signature_file [-r revocation_file]\n"); |
" -n namespace -s signature_file [-r krl_file] [-O option]\n"); |
exit(1); |
exit(1); |
} |
} |
|
|
|
|
int |
int |
main(int argc, char **argv) |
main(int argc, char **argv) |
{ |
{ |
char comment[1024], *passphrase; |
char comment[1024], *passphrase = NULL; |
char *rr_hostname = NULL, *ep, *fp, *ra; |
char *rr_hostname = NULL, *ep, *fp, *ra; |
struct sshkey *private, *public; |
struct sshkey *private, *public; |
struct passwd *pw; |
struct passwd *pw; |
|
|
unsigned long long cert_serial = 0; |
unsigned long long cert_serial = 0; |
char *identity_comment = NULL, *ca_key_path = NULL, **opts = NULL; |
char *identity_comment = NULL, *ca_key_path = NULL, **opts = NULL; |
char *sk_application = NULL, *sk_device = NULL, *sk_user = NULL; |
char *sk_application = NULL, *sk_device = NULL, *sk_user = NULL; |
char *sk_attestaion_path = NULL; |
char *sk_attestation_path = NULL; |
struct sshbuf *challenge = NULL, *attest = NULL; |
struct sshbuf *challenge = NULL, *attest = NULL; |
size_t i, nopts = 0; |
size_t i, nopts = 0; |
u_int32_t bits = 0; |
u_int32_t bits = 0; |
|
|
pw = getpwuid(getuid()); |
pw = getpwuid(getuid()); |
if (!pw) |
if (!pw) |
fatal("No user exists for uid %lu", (u_long)getuid()); |
fatal("No user exists for uid %lu", (u_long)getuid()); |
|
pw = pwcopy(pw); |
if (gethostname(hostname, sizeof(hostname)) == -1) |
if (gethostname(hostname, sizeof(hostname)) == -1) |
fatal("gethostname: %s", strerror(errno)); |
fatal("gethostname: %s", strerror(errno)); |
|
|
|
|
break; |
break; |
case 'Z': |
case 'Z': |
openssh_format_cipher = optarg; |
openssh_format_cipher = optarg; |
|
if (cipher_by_name(openssh_format_cipher) == NULL) |
|
fatal("Invalid OpenSSH-format cipher '%s'", |
|
openssh_format_cipher); |
break; |
break; |
case 'C': |
case 'C': |
identity_comment = optarg; |
identity_comment = optarg; |
|
|
else |
else |
fatal("Unsupported moduli option %s", optarg); |
fatal("Unsupported moduli option %s", optarg); |
break; |
break; |
case '?': |
|
default: |
default: |
usage(); |
usage(); |
} |
} |
|
|
if (strncmp(sign_op, "find-principals", 15) == 0) { |
if (strncmp(sign_op, "find-principals", 15) == 0) { |
if (ca_key_path == NULL) { |
if (ca_key_path == NULL) { |
error("Too few arguments for find-principals:" |
error("Too few arguments for find-principals:" |
"missing signature file"); |
"missing signature file"); |
exit(1); |
exit(1); |
} |
} |
if (!have_identity) { |
if (!have_identity) { |
error("Too few arguments for find-principals:" |
error("Too few arguments for find-principals:" |
"missing allowed keys file"); |
"missing allowed keys file"); |
exit(1); |
exit(1); |
} |
} |
return sig_find_principals(ca_key_path, identity_file); |
return sig_find_principals(ca_key_path, identity_file, |
|
opts, nopts); |
|
} else if (strncmp(sign_op, "match-principals", 16) == 0) { |
|
if (!have_identity) { |
|
error("Too few arguments for match-principals:" |
|
"missing allowed keys file"); |
|
exit(1); |
|
} |
|
if (cert_key_id == NULL) { |
|
error("Too few arguments for match-principals: " |
|
"missing principal ID"); |
|
exit(1); |
|
} |
|
return sig_match_principals(identity_file, cert_key_id, |
|
opts, nopts); |
} else if (strncmp(sign_op, "sign", 4) == 0) { |
} else if (strncmp(sign_op, "sign", 4) == 0) { |
|
/* NB. cert_principals is actually namespace, via -n */ |
if (cert_principals == NULL || |
if (cert_principals == NULL || |
*cert_principals == '\0') { |
*cert_principals == '\0') { |
error("Too few arguments for sign: " |
error("Too few arguments for sign: " |
|
|
exit(1); |
exit(1); |
} |
} |
return sig_sign(identity_file, cert_principals, |
return sig_sign(identity_file, cert_principals, |
argc, argv); |
prefer_agent, argc, argv, opts, nopts); |
} else if (strncmp(sign_op, "check-novalidate", 16) == 0) { |
} else if (strncmp(sign_op, "check-novalidate", 16) == 0) { |
|
/* NB. cert_principals is actually namespace, via -n */ |
|
if (cert_principals == NULL || |
|
*cert_principals == '\0') { |
|
error("Too few arguments for check-novalidate: " |
|
"missing namespace"); |
|
exit(1); |
|
} |
if (ca_key_path == NULL) { |
if (ca_key_path == NULL) { |
error("Too few arguments for check-novalidate: " |
error("Too few arguments for check-novalidate: " |
"missing signature file"); |
"missing signature file"); |
exit(1); |
exit(1); |
} |
} |
return sig_verify(ca_key_path, cert_principals, |
return sig_verify(ca_key_path, cert_principals, |
NULL, NULL, NULL); |
NULL, NULL, NULL, opts, nopts); |
} else if (strncmp(sign_op, "verify", 6) == 0) { |
} else if (strncmp(sign_op, "verify", 6) == 0) { |
|
/* NB. cert_principals is actually namespace, via -n */ |
if (cert_principals == NULL || |
if (cert_principals == NULL || |
*cert_principals == '\0') { |
*cert_principals == '\0') { |
error("Too few arguments for verify: " |
error("Too few arguments for verify: " |
|
|
} |
} |
if (cert_key_id == NULL) { |
if (cert_key_id == NULL) { |
error("Too few arguments for verify: " |
error("Too few arguments for verify: " |
"missing principal ID"); |
"missing principal identity"); |
exit(1); |
exit(1); |
} |
} |
return sig_verify(ca_key_path, cert_principals, |
return sig_verify(ca_key_path, cert_principals, |
cert_key_id, identity_file, rr_hostname); |
cert_key_id, identity_file, rr_hostname, |
|
opts, nopts); |
} |
} |
error("Unsupported operation for -Y: \"%s\"", sign_op); |
error("Unsupported operation for -Y: \"%s\"", sign_op); |
usage(); |
usage(); |
|
|
|
|
if (have_identity) { |
if (have_identity) { |
n = do_print_resource_record(pw, identity_file, |
n = do_print_resource_record(pw, identity_file, |
rr_hostname, print_generic); |
rr_hostname, print_generic, opts, nopts); |
if (n == 0) |
if (n == 0) |
fatal("%s: %s", identity_file, strerror(errno)); |
fatal("%s: %s", identity_file, strerror(errno)); |
exit(0); |
exit(0); |
|
|
|
|
n += do_print_resource_record(pw, |
n += do_print_resource_record(pw, |
_PATH_HOST_RSA_KEY_FILE, rr_hostname, |
_PATH_HOST_RSA_KEY_FILE, rr_hostname, |
print_generic); |
print_generic, opts, nopts); |
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, |
print_generic); |
print_generic, opts, nopts); |
n += do_print_resource_record(pw, |
n += do_print_resource_record(pw, |
_PATH_HOST_ECDSA_KEY_FILE, rr_hostname, |
_PATH_HOST_ECDSA_KEY_FILE, rr_hostname, |
print_generic); |
print_generic, opts, nopts); |
n += do_print_resource_record(pw, |
n += do_print_resource_record(pw, |
_PATH_HOST_ED25519_KEY_FILE, rr_hostname, |
_PATH_HOST_ED25519_KEY_FILE, rr_hostname, |
print_generic); |
print_generic, opts, nopts); |
n += do_print_resource_record(pw, |
n += do_print_resource_record(pw, |
_PATH_HOST_XMSS_KEY_FILE, rr_hostname, |
_PATH_HOST_XMSS_KEY_FILE, rr_hostname, |
print_generic); |
print_generic, opts, nopts); |
if (n == 0) |
if (n == 0) |
fatal("no keys found."); |
fatal("no keys found."); |
exit(0); |
exit(0); |
|
|
for (i = 0; i < nopts; i++) { |
for (i = 0; i < nopts; i++) { |
if (strcasecmp(opts[i], "no-touch-required") == 0) { |
if (strcasecmp(opts[i], "no-touch-required") == 0) { |
sk_flags &= ~SSH_SK_USER_PRESENCE_REQD; |
sk_flags &= ~SSH_SK_USER_PRESENCE_REQD; |
|
} else if (strcasecmp(opts[i], "verify-required") == 0) { |
|
sk_flags |= SSH_SK_USER_VERIFICATION_REQD; |
} else if (strcasecmp(opts[i], "resident") == 0) { |
} else if (strcasecmp(opts[i], "resident") == 0) { |
sk_flags |= SSH_SK_RESIDENT_KEY; |
sk_flags |= SSH_SK_RESIDENT_KEY; |
} else if (strncasecmp(opts[i], "device=", 7) == 0) { |
} else if (strncasecmp(opts[i], "device=", 7) == 0) { |
|
|
} else if (strncasecmp(opts[i], "challenge=", 10) == 0) { |
} else if (strncasecmp(opts[i], "challenge=", 10) == 0) { |
if ((r = sshbuf_load_file(opts[i] + 10, |
if ((r = sshbuf_load_file(opts[i] + 10, |
&challenge)) != 0) { |
&challenge)) != 0) { |
fatal("Unable to load FIDO enrollment " |
fatal_r(r, "Unable to load FIDO " |
"challenge \"%s\": %s", |
"enrollment challenge \"%s\"", |
opts[i] + 10, ssh_err(r)); |
opts[i] + 10); |
} |
} |
} else if (strncasecmp(opts[i], |
} else if (strncasecmp(opts[i], |
"write-attestation=", 18) == 0) { |
"write-attestation=", 18) == 0) { |
sk_attestaion_path = opts[i] + 18; |
sk_attestation_path = opts[i] + 18; |
} else if (strncasecmp(opts[i], |
} else if (strncasecmp(opts[i], |
"application=", 12) == 0) { |
"application=", 12) == 0) { |
sk_application = xstrdup(opts[i] + 12); |
sk_application = xstrdup(opts[i] + 12); |
|
|
"FIDO authenticator enrollment", opts[i]); |
"FIDO authenticator enrollment", opts[i]); |
} |
} |
} |
} |
if (!quiet) { |
|
printf("You may need to touch your authenticator " |
|
"to authorize key generation.\n"); |
|
} |
|
passphrase = NULL; |
|
if ((attest = sshbuf_new()) == NULL) |
if ((attest = sshbuf_new()) == NULL) |
fatal("sshbuf_new failed"); |
fatal("sshbuf_new failed"); |
for (i = 0 ; ; i++) { |
r = 0; |
|
for (i = 0 ;;) { |
|
if (!quiet) { |
|
printf("You may need to touch your " |
|
"authenticator%s to authorize key " |
|
"generation.\n", |
|
r == 0 ? "" : " again"); |
|
} |
fflush(stdout); |
fflush(stdout); |
r = sshsk_enroll(type, sk_provider, sk_device, |
r = sshsk_enroll(type, sk_provider, sk_device, |
sk_application == NULL ? "ssh:" : sk_application, |
sk_application == NULL ? "ssh:" : sk_application, |
|
|
&private, attest); |
&private, attest); |
if (r == 0) |
if (r == 0) |
break; |
break; |
|
if (r == SSH_ERR_KEY_BAD_PERMISSIONS && |
|
(sk_flags & SSH_SK_RESIDENT_KEY) != 0 && |
|
(sk_flags & SSH_SK_FORCE_OPERATION) == 0 && |
|
confirm_sk_overwrite(sk_application, sk_user)) { |
|
sk_flags |= SSH_SK_FORCE_OPERATION; |
|
continue; |
|
} |
if (r != SSH_ERR_KEY_WRONG_PASSPHRASE) |
if (r != SSH_ERR_KEY_WRONG_PASSPHRASE) |
fatal("Key enrollment failed: %s", ssh_err(r)); |
fatal_r(r, "Key enrollment failed"); |
else if (i > 0) |
else if (passphrase != NULL) { |
error("PIN incorrect"); |
error("PIN incorrect"); |
if (passphrase != NULL) { |
|
freezero(passphrase, strlen(passphrase)); |
freezero(passphrase, strlen(passphrase)); |
passphrase = NULL; |
passphrase = NULL; |
} |
} |
if (i >= 3) |
if (++i >= 3) |
fatal("Too many incorrect PINs"); |
fatal("Too many incorrect PINs"); |
passphrase = read_passphrase("Enter PIN for " |
passphrase = read_passphrase("Enter PIN for " |
"authenticator: ", RP_ALLOW_STDIN); |
"authenticator: ", RP_ALLOW_STDIN); |
|
|
break; |
break; |
} |
} |
if ((r = sshkey_from_private(private, &public)) != 0) |
if ((r = sshkey_from_private(private, &public)) != 0) |
fatal("sshkey_from_private failed: %s\n", ssh_err(r)); |
fatal_r(r, "sshkey_from_private"); |
|
|
if (!have_identity) |
if (!have_identity) |
ask_filename(pw, "Enter file in which to save the key"); |
ask_filename(pw, "Enter file in which to save the key"); |
|
|
/* Save the key with the given passphrase and comment. */ |
/* Save the key with the given passphrase and comment. */ |
if ((r = sshkey_save_private(private, identity_file, passphrase, |
if ((r = sshkey_save_private(private, identity_file, passphrase, |
comment, private_key_format, openssh_format_cipher, rounds)) != 0) { |
comment, private_key_format, openssh_format_cipher, rounds)) != 0) { |
error("Saving key \"%s\" failed: %s", |
error_r(r, "Saving key \"%s\" failed", identity_file); |
identity_file, ssh_err(r)); |
|
freezero(passphrase, strlen(passphrase)); |
freezero(passphrase, strlen(passphrase)); |
exit(1); |
exit(1); |
} |
} |
|
|
} |
} |
|
|
strlcat(identity_file, ".pub", sizeof(identity_file)); |
strlcat(identity_file, ".pub", sizeof(identity_file)); |
if ((r = sshkey_save_public(public, identity_file, comment)) != 0) { |
if ((r = sshkey_save_public(public, identity_file, comment)) != 0) |
fatal("Unable to save public key to %s: %s", |
fatal_r(r, "Unable to save public key to %s", identity_file); |
identity_file, ssh_err(r)); |
|
} |
|
|
|
if (!quiet) { |
if (!quiet) { |
fp = sshkey_fingerprint(public, fingerprint_hash, |
fp = sshkey_fingerprint(public, fingerprint_hash, |
|
|
free(fp); |
free(fp); |
} |
} |
|
|
if (sk_attestaion_path != NULL) { |
if (sk_attestation_path != NULL) |
if (attest == NULL || sshbuf_len(attest) == 0) { |
save_attestation(attest, sk_attestation_path); |
fatal("Enrollment did not return attestation " |
|
"certificate"); |
|
} |
|
if ((r = sshbuf_write_file(sk_attestaion_path, attest)) != 0) { |
|
fatal("Unable to write attestation certificate " |
|
"\"%s\": %s", sk_attestaion_path, ssh_err(r)); |
|
} |
|
if (!quiet) { |
|
printf("Your FIDO attestation certificate has been " |
|
"saved in %s\n", sk_attestaion_path); |
|
} |
|
} |
|
sshbuf_free(attest); |
sshbuf_free(attest); |
sshkey_free(public); |
sshkey_free(public); |
|
|