version 1.280, 2015/11/18 08:37:28 |
version 1.352, 2019/09/29 16:31:57 |
|
|
#include <sys/socket.h> |
#include <sys/socket.h> |
#include <sys/stat.h> |
#include <sys/stat.h> |
|
|
|
#ifdef WITH_OPENSSL |
#include <openssl/evp.h> |
#include <openssl/evp.h> |
#include <openssl/pem.h> |
#include <openssl/pem.h> |
|
#endif |
|
|
|
#include <stdint.h> |
#include <errno.h> |
#include <errno.h> |
#include <fcntl.h> |
#include <fcntl.h> |
#include <netdb.h> |
#include <netdb.h> |
|
|
#include <string.h> |
#include <string.h> |
#include <unistd.h> |
#include <unistd.h> |
#include <limits.h> |
#include <limits.h> |
|
#include <locale.h> |
|
|
#include "xmalloc.h" |
#include "xmalloc.h" |
#include "sshkey.h" |
#include "sshkey.h" |
#include "rsa.h" |
|
#include "authfile.h" |
#include "authfile.h" |
#include "uuencode.h" |
|
#include "sshbuf.h" |
#include "sshbuf.h" |
#include "pathnames.h" |
#include "pathnames.h" |
#include "log.h" |
#include "log.h" |
|
|
#include "atomicio.h" |
#include "atomicio.h" |
#include "krl.h" |
#include "krl.h" |
#include "digest.h" |
#include "digest.h" |
|
#include "utf8.h" |
|
#include "authfd.h" |
|
#include "sshsig.h" |
|
|
#ifdef ENABLE_PKCS11 |
#ifdef ENABLE_PKCS11 |
#include "ssh-pkcs11.h" |
#include "ssh-pkcs11.h" |
|
|
# define DEFAULT_KEY_TYPE_NAME "ed25519" |
# define DEFAULT_KEY_TYPE_NAME "ed25519" |
#endif |
#endif |
|
|
/* Number of bits in the RSA/DSA key. This value can be set on the command line. */ |
/* |
#define DEFAULT_BITS 2048 |
* Default number of bits in the RSA, DSA and ECDSA keys. These value can be |
|
* overridden on the command line. |
|
* |
|
* These values, with the exception of DSA, provide security equivalent to at |
|
* least 128 bits of security according to NIST Special Publication 800-57: |
|
* Recommendation for Key Management Part 1 rev 4 section 5.6.1. |
|
* For DSA it (and FIPS-186-4 section 4.2) specifies that the only size for |
|
* which a 160bit hash is acceptable is 1kbit, and since ssh-dss specifies only |
|
* SHA1 we limit the DSA key size 1k bits. |
|
*/ |
|
#define DEFAULT_BITS 3072 |
#define DEFAULT_BITS_DSA 1024 |
#define DEFAULT_BITS_DSA 1024 |
#define DEFAULT_BITS_ECDSA 256 |
#define DEFAULT_BITS_ECDSA 256 |
u_int32_t bits = 0; |
|
|
|
/* |
static int quiet = 0; |
* Flag indicating that we just want to change the passphrase. This can be |
|
* set on the command line. |
|
*/ |
|
int change_passphrase = 0; |
|
|
|
/* |
|
* Flag indicating that we just want to change the comment. This can be set |
|
* on the command line. |
|
*/ |
|
int change_comment = 0; |
|
|
|
int quiet = 0; |
|
|
|
int log_level = SYSLOG_LEVEL_INFO; |
|
|
|
/* Flag indicating that we want to hash a known_hosts file */ |
|
int hash_hosts = 0; |
|
/* Flag indicating that we want lookup a host in known_hosts file */ |
|
int find_host = 0; |
|
/* Flag indicating that we want to delete a host from a known_hosts file */ |
|
int delete_host = 0; |
|
|
|
/* Flag indicating that we want to show the contents of a certificate */ |
|
int show_cert = 0; |
|
|
|
/* Flag indicating that we just want to see the key fingerprint */ |
/* Flag indicating that we just want to see the key fingerprint */ |
int print_fingerprint = 0; |
static int print_fingerprint = 0; |
int print_bubblebabble = 0; |
static int print_bubblebabble = 0; |
|
|
/* Hash algorithm to use for fingerprints. */ |
/* Hash algorithm to use for fingerprints. */ |
int fingerprint_hash = SSH_FP_HASH_DEFAULT; |
static int fingerprint_hash = SSH_FP_HASH_DEFAULT; |
|
|
/* The identity file name, given on the command line or entered by the user. */ |
/* The identity file name, given on the command line or entered by the user. */ |
char identity_file[1024]; |
static char identity_file[PATH_MAX]; |
int have_identity = 0; |
static int have_identity = 0; |
|
|
/* This is set to the passphrase if given on the command line. */ |
/* This is set to the passphrase if given on the command line. */ |
char *identity_passphrase = NULL; |
static char *identity_passphrase = NULL; |
|
|
/* This is set to the new passphrase if given on the command line. */ |
/* This is set to the new passphrase if given on the command line. */ |
char *identity_new_passphrase = NULL; |
static char *identity_new_passphrase = NULL; |
|
|
/* This is set to the new comment if given on the command line. */ |
|
char *identity_comment = NULL; |
|
|
|
/* Path to CA key when certifying keys. */ |
|
char *ca_key_path = NULL; |
|
|
|
/* Certificate serial number */ |
|
unsigned long long cert_serial = 0; |
|
|
|
/* Key type when certifying */ |
/* Key type when certifying */ |
u_int cert_key_type = SSH2_CERT_TYPE_USER; |
static u_int cert_key_type = SSH2_CERT_TYPE_USER; |
|
|
/* "key ID" of signed key */ |
/* "key ID" of signed key */ |
char *cert_key_id = NULL; |
static char *cert_key_id = NULL; |
|
|
/* Comma-separated list of principal names for certifying keys */ |
/* Comma-separated list of principal names for certifying keys */ |
char *cert_principals = NULL; |
static char *cert_principals = NULL; |
|
|
/* Validity period for certificates */ |
/* Validity period for certificates */ |
u_int64_t cert_valid_from = 0; |
static u_int64_t cert_valid_from = 0; |
u_int64_t cert_valid_to = ~0ULL; |
static u_int64_t cert_valid_to = ~0ULL; |
|
|
/* Certificate options */ |
/* Certificate options */ |
#define CERTOPT_X_FWD (1) |
#define CERTOPT_X_FWD (1) |
|
|
#define CERTOPT_USER_RC (1<<4) |
#define CERTOPT_USER_RC (1<<4) |
#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) |
u_int32_t certflags_flags = CERTOPT_DEFAULT; |
static u_int32_t certflags_flags = CERTOPT_DEFAULT; |
char *certflags_command = NULL; |
static char *certflags_command = NULL; |
char *certflags_src_addr = NULL; |
static char *certflags_src_addr = NULL; |
|
|
|
/* Arbitrary extensions specified by user */ |
|
struct cert_userext { |
|
char *key; |
|
char *val; |
|
int crit; |
|
}; |
|
static struct cert_userext *cert_userext; |
|
static size_t ncert_userext; |
|
|
/* Conversion to/from various formats */ |
/* Conversion to/from various formats */ |
int convert_to = 0; |
|
int convert_from = 0; |
|
enum { |
enum { |
FMT_RFC4716, |
FMT_RFC4716, |
FMT_PKCS8, |
FMT_PKCS8, |
FMT_PEM |
FMT_PEM |
} convert_format = FMT_RFC4716; |
} convert_format = FMT_RFC4716; |
int print_public = 0; |
|
int print_generic = 0; |
|
|
|
char *key_type_name = NULL; |
static char *key_type_name = NULL; |
|
|
/* Load key from this PKCS#11 provider */ |
/* Load key from this PKCS#11 provider */ |
char *pkcs11provider = NULL; |
static char *pkcs11provider = NULL; |
|
|
/* Use new OpenSSH private key format when writing SSH2 keys instead of PEM */ |
/* Format for writing private keys */ |
int use_new_format = 0; |
static int private_key_format = SSHKEY_PRIVATE_OPENSSH; |
|
|
/* Cipher for new-format private keys */ |
/* Cipher for new-format private keys */ |
char *new_format_cipher = NULL; |
static char *openssh_format_cipher = NULL; |
|
|
/* |
/* |
* Number of KDF rounds to derive new format keys / |
* Number of KDF rounds to derive new format keys / |
* number of primality trials when screening moduli. |
* number of primality trials when screening moduli. |
*/ |
*/ |
int rounds = 0; |
static int rounds = 0; |
|
|
/* argv0 */ |
/* argv0 */ |
extern char *__progname; |
extern char *__progname; |
|
|
char hostname[NI_MAXHOST]; |
static char hostname[NI_MAXHOST]; |
|
|
#ifdef WITH_OPENSSL |
#ifdef WITH_OPENSSL |
/* moduli.c */ |
/* moduli.c */ |
|
|
static void |
static void |
type_bits_valid(int type, const char *name, u_int32_t *bitsp) |
type_bits_valid(int type, const char *name, u_int32_t *bitsp) |
{ |
{ |
#ifdef WITH_OPENSSL |
|
u_int maxbits, nid; |
|
#endif |
|
|
|
if (type == KEY_UNSPEC) |
if (type == KEY_UNSPEC) |
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 |
if (type == KEY_DSA) |
u_int nid; |
|
|
|
switch(type) { |
|
case KEY_DSA: |
*bitsp = DEFAULT_BITS_DSA; |
*bitsp = DEFAULT_BITS_DSA; |
else if (type == KEY_ECDSA) { |
break; |
|
case KEY_ECDSA: |
if (name != NULL && |
if (name != NULL && |
(nid = sshkey_ecdsa_nid_from_name(name)) > 0) |
(nid = sshkey_ecdsa_nid_from_name(name)) > 0) |
*bitsp = sshkey_curve_nid_to_bits(nid); |
*bitsp = sshkey_curve_nid_to_bits(nid); |
if (*bitsp == 0) |
if (*bitsp == 0) |
*bitsp = DEFAULT_BITS_ECDSA; |
*bitsp = DEFAULT_BITS_ECDSA; |
|
break; |
|
case KEY_RSA: |
|
*bitsp = DEFAULT_BITS; |
|
break; |
} |
} |
else |
|
#endif |
#endif |
*bitsp = DEFAULT_BITS; |
|
} |
} |
#ifdef WITH_OPENSSL |
#ifdef WITH_OPENSSL |
maxbits = (type == KEY_DSA) ? |
switch (type) { |
OPENSSL_DSA_MAX_MODULUS_BITS : OPENSSL_RSA_MAX_MODULUS_BITS; |
case KEY_DSA: |
if (*bitsp > maxbits) |
if (*bitsp != 1024) |
fatal("key bits exceeds maximum %d", maxbits); |
fatal("Invalid DSA key length: must be 1024 bits"); |
if (type == KEY_DSA && *bitsp != 1024) |
break; |
fatal("DSA keys must be 1024 bits"); |
case KEY_RSA: |
else if (type != KEY_ECDSA && type != KEY_ED25519 && *bitsp < 1024) |
if (*bitsp < SSH_RSA_MINIMUM_MODULUS_SIZE) |
fatal("Key must at least be 1024 bits"); |
fatal("Invalid RSA key length: minimum is %d bits", |
else if (type == KEY_ECDSA && sshkey_ecdsa_bits_to_nid(*bitsp) == -1) |
SSH_RSA_MINIMUM_MODULUS_SIZE); |
fatal("Invalid ECDSA key length - valid lengths are " |
else if (*bitsp > OPENSSL_RSA_MAX_MODULUS_BITS) |
"256, 384 or 521 bits"); |
fatal("Invalid RSA key length: maximum is %d bits", |
|
OPENSSL_RSA_MAX_MODULUS_BITS); |
|
break; |
|
case KEY_ECDSA: |
|
if (sshkey_ecdsa_bits_to_nid(*bitsp) == -1) |
|
fatal("Invalid ECDSA key length: valid lengths are " |
|
"256, 384 or 521 bits"); |
|
} |
#endif |
#endif |
} |
} |
|
|
|
/* |
|
* Checks whether a file exists and, if so, asks the user whether they wish |
|
* to overwrite it. |
|
* Returns nonzero if the file does not already exist or if the user agrees to |
|
* overwrite, or zero otherwise. |
|
*/ |
|
static int |
|
confirm_overwrite(const char *filename) |
|
{ |
|
char yesno[3]; |
|
struct stat st; |
|
|
|
if (stat(filename, &st) != 0) |
|
return 1; |
|
printf("%s already exists.\n", filename); |
|
printf("Overwrite (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 |
static void |
ask_filename(struct passwd *pw, const char *prompt) |
ask_filename(struct passwd *pw, const char *prompt) |
{ |
{ |
|
|
name = _PATH_SSH_CLIENT_ID_RSA; |
name = _PATH_SSH_CLIENT_ID_RSA; |
else { |
else { |
switch (sshkey_type_from_name(key_type_name)) { |
switch (sshkey_type_from_name(key_type_name)) { |
case KEY_RSA1: |
|
name = _PATH_SSH_CLIENT_IDENTITY; |
|
break; |
|
case KEY_DSA_CERT: |
case KEY_DSA_CERT: |
case KEY_DSA: |
case KEY_DSA: |
name = _PATH_SSH_CLIENT_ID_DSA; |
name = _PATH_SSH_CLIENT_ID_DSA; |
|
|
case KEY_ED25519_CERT: |
case KEY_ED25519_CERT: |
name = _PATH_SSH_CLIENT_ID_ED25519; |
name = _PATH_SSH_CLIENT_ID_ED25519; |
break; |
break; |
|
case KEY_XMSS: |
|
case KEY_XMSS_CERT: |
|
name = _PATH_SSH_CLIENT_ID_XMSS; |
|
break; |
default: |
default: |
fatal("bad key type"); |
fatal("bad key type"); |
} |
} |
|
|
} |
} |
|
|
static struct sshkey * |
static struct sshkey * |
load_identity(char *filename) |
load_identity(const char *filename, char **commentp) |
{ |
{ |
char *pass; |
char *pass; |
struct sshkey *prv; |
struct sshkey *prv; |
int r; |
int r; |
|
|
if ((r = sshkey_load_private(filename, "", &prv, NULL)) == 0) |
if (commentp != NULL) |
|
*commentp = NULL; |
|
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("Load key \"%s\": %s", filename, ssh_err(r)); |
|
|
pass = xstrdup(identity_passphrase); |
pass = xstrdup(identity_passphrase); |
else |
else |
pass = read_passphrase("Enter passphrase: ", RP_ALLOW_STDIN); |
pass = read_passphrase("Enter passphrase: ", RP_ALLOW_STDIN); |
r = sshkey_load_private(filename, pass, &prv, NULL); |
r = sshkey_load_private(filename, pass, &prv, commentp); |
explicit_bzero(pass, strlen(pass)); |
explicit_bzero(pass, strlen(pass)); |
free(pass); |
free(pass); |
if (r != 0) |
if (r != 0) |
|
|
static void |
static void |
do_convert_to_ssh2(struct passwd *pw, struct sshkey *k) |
do_convert_to_ssh2(struct passwd *pw, struct sshkey *k) |
{ |
{ |
size_t len; |
struct sshbuf *b; |
u_char *blob; |
char comment[61], *b64; |
char comment[61]; |
|
int r; |
int r; |
|
|
if (k->type == KEY_RSA1) |
if ((b = sshbuf_new()) == NULL) |
fatal("version 1 keys are not supported"); |
fatal("%s: sshbuf_new failed", __func__); |
if ((r = sshkey_to_blob(k, &blob, &len)) != 0) |
if ((r = sshkey_putb(k, b)) != 0) |
fatal("key_to_blob failed: %s", ssh_err(r)); |
fatal("key_to_blob failed: %s", ssh_err(r)); |
|
if ((b64 = sshbuf_dtob64_string(b, 1)) == NULL) |
|
fatal("%s: sshbuf_dtob64_string failed", __func__); |
|
|
/* 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), |
"%u-bit %s, converted by %s@%s from OpenSSH", |
"%u-bit %s, converted by %s@%s from OpenSSH", |
sshkey_size(k), sshkey_type(k), |
sshkey_size(k), sshkey_type(k), |
pw->pw_name, hostname); |
pw->pw_name, hostname); |
|
|
|
sshkey_free(k); |
|
sshbuf_free(b); |
|
|
fprintf(stdout, "%s\n", SSH_COM_PUBLIC_BEGIN); |
fprintf(stdout, "%s\n", SSH_COM_PUBLIC_BEGIN); |
fprintf(stdout, "Comment: \"%s\"\n", comment); |
fprintf(stdout, "Comment: \"%s\"\n%s", comment, b64); |
dump_base64(stdout, blob, len); |
|
fprintf(stdout, "%s\n", SSH_COM_PUBLIC_END); |
fprintf(stdout, "%s\n", SSH_COM_PUBLIC_END); |
sshkey_free(k); |
free(b64); |
free(blob); |
|
exit(0); |
exit(0); |
} |
} |
|
|
|
|
do_convert_to_pkcs8(struct sshkey *k) |
do_convert_to_pkcs8(struct sshkey *k) |
{ |
{ |
switch (sshkey_type_plain(k->type)) { |
switch (sshkey_type_plain(k->type)) { |
case KEY_RSA1: |
|
case KEY_RSA: |
case KEY_RSA: |
if (!PEM_write_RSA_PUBKEY(stdout, k->rsa)) |
if (!PEM_write_RSA_PUBKEY(stdout, k->rsa)) |
fatal("PEM_write_RSA_PUBKEY failed"); |
fatal("PEM_write_RSA_PUBKEY failed"); |
|
|
do_convert_to_pem(struct sshkey *k) |
do_convert_to_pem(struct sshkey *k) |
{ |
{ |
switch (sshkey_type_plain(k->type)) { |
switch (sshkey_type_plain(k->type)) { |
case KEY_RSA1: |
|
case KEY_RSA: |
case KEY_RSA: |
if (!PEM_write_RSAPublicKey(stdout, k->rsa)) |
if (!PEM_write_RSAPublicKey(stdout, k->rsa)) |
fatal("PEM_write_RSAPublicKey failed"); |
fatal("PEM_write_RSAPublicKey failed"); |
break; |
break; |
#if notyet /* OpenSSH 0.9.8 lacks this function */ |
|
case KEY_DSA: |
|
if (!PEM_write_DSAPublicKey(stdout, k->dsa)) |
|
fatal("PEM_write_DSAPublicKey failed"); |
|
break; |
|
#endif |
|
/* XXX ECDSA? */ |
|
default: |
default: |
fatal("%s: unsupported key type %s", __func__, sshkey_type(k)); |
fatal("%s: unsupported key type %s", __func__, sshkey_type(k)); |
} |
} |
|
|
|
|
if (!have_identity) |
if (!have_identity) |
ask_filename(pw, "Enter file in which the key is"); |
ask_filename(pw, "Enter file in which the key is"); |
if (stat(identity_file, &st) < 0) |
if (stat(identity_file, &st) == -1) |
fatal("%s: %s: %s", __progname, identity_file, strerror(errno)); |
fatal("%s: %s: %s", __progname, identity_file, strerror(errno)); |
if ((r = sshkey_load_public(identity_file, &k, NULL)) != 0) |
if ((r = sshkey_load_public(identity_file, &k, NULL)) != 0) |
k = load_identity(identity_file); |
k = load_identity(identity_file, NULL); |
switch (convert_format) { |
switch (convert_format) { |
case FMT_RFC4716: |
case FMT_RFC4716: |
do_convert_to_ssh2(pw, k); |
do_convert_to_ssh2(pw, k); |
|
|
} |
} |
|
|
static struct sshkey * |
static struct sshkey * |
do_convert_private_ssh2_from_blob(u_char *blob, u_int blen) |
do_convert_private_ssh2(struct sshbuf *b) |
{ |
{ |
struct sshbuf *b; |
|
struct sshkey *key = NULL; |
struct sshkey *key = NULL; |
char *type, *cipher; |
char *type, *cipher; |
u_char e1, e2, e3, *sig = NULL, data[] = "abcde12345"; |
u_char e1, e2, e3, *sig = NULL, data[] = "abcde12345"; |
|
|
u_int magic, i1, i2, i3, i4; |
u_int magic, i1, i2, i3, i4; |
size_t slen; |
size_t slen; |
u_long e; |
u_long e; |
|
BIGNUM *dsa_p = NULL, *dsa_q = NULL, *dsa_g = NULL; |
|
BIGNUM *dsa_pub_key = NULL, *dsa_priv_key = NULL; |
|
BIGNUM *rsa_n = NULL, *rsa_e = NULL, *rsa_d = NULL; |
|
BIGNUM *rsa_p = NULL, *rsa_q = NULL, *rsa_iqmp = NULL; |
|
|
if ((b = sshbuf_from(blob, blen)) == NULL) |
|
fatal("%s: sshbuf_from failed", __func__); |
|
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("%s: buffer error: %s", __func__, ssh_err(r)); |
|
|
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, |
SSH_COM_PRIVATE_KEY_MAGIC); |
SSH_COM_PRIVATE_KEY_MAGIC); |
sshbuf_free(b); |
|
return NULL; |
return NULL; |
} |
} |
if ((r = sshbuf_get_u32(b, &i1)) != 0 || |
if ((r = sshbuf_get_u32(b, &i1)) != 0 || |
|
|
if (strcmp(cipher, "none") != 0) { |
if (strcmp(cipher, "none") != 0) { |
error("unsupported cipher %s", cipher); |
error("unsupported cipher %s", cipher); |
free(cipher); |
free(cipher); |
sshbuf_free(b); |
|
free(type); |
free(type); |
return NULL; |
return NULL; |
} |
} |
|
|
} else if (strstr(type, "rsa")) { |
} else if (strstr(type, "rsa")) { |
ktype = KEY_RSA; |
ktype = KEY_RSA; |
} else { |
} else { |
sshbuf_free(b); |
|
free(type); |
free(type); |
return NULL; |
return NULL; |
} |
} |
if ((key = sshkey_new_private(ktype)) == NULL) |
if ((key = sshkey_new(ktype)) == NULL) |
fatal("key_new_private failed"); |
fatal("sshkey_new failed"); |
free(type); |
free(type); |
|
|
switch (key->type) { |
switch (key->type) { |
case KEY_DSA: |
case KEY_DSA: |
buffer_get_bignum_bits(b, key->dsa->p); |
if ((dsa_p = BN_new()) == NULL || |
buffer_get_bignum_bits(b, key->dsa->g); |
(dsa_q = BN_new()) == NULL || |
buffer_get_bignum_bits(b, key->dsa->q); |
(dsa_g = BN_new()) == NULL || |
buffer_get_bignum_bits(b, key->dsa->pub_key); |
(dsa_pub_key = BN_new()) == NULL || |
buffer_get_bignum_bits(b, key->dsa->priv_key); |
(dsa_priv_key = BN_new()) == NULL) |
|
fatal("%s: BN_new", __func__); |
|
buffer_get_bignum_bits(b, dsa_p); |
|
buffer_get_bignum_bits(b, dsa_g); |
|
buffer_get_bignum_bits(b, dsa_q); |
|
buffer_get_bignum_bits(b, dsa_pub_key); |
|
buffer_get_bignum_bits(b, dsa_priv_key); |
|
if (!DSA_set0_pqg(key->dsa, dsa_p, dsa_q, dsa_g)) |
|
fatal("%s: DSA_set0_pqg failed", __func__); |
|
dsa_p = dsa_q = dsa_g = NULL; /* transferred */ |
|
if (!DSA_set0_key(key->dsa, dsa_pub_key, dsa_priv_key)) |
|
fatal("%s: DSA_set0_key failed", __func__); |
|
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 || |
|
|
e += e3; |
e += e3; |
debug("e %lx", e); |
debug("e %lx", e); |
} |
} |
if (!BN_set_word(key->rsa->e, e)) { |
if ((rsa_e = BN_new()) == NULL) |
sshbuf_free(b); |
fatal("%s: BN_new", __func__); |
|
if (!BN_set_word(rsa_e, e)) { |
|
BN_clear_free(rsa_e); |
sshkey_free(key); |
sshkey_free(key); |
return NULL; |
return NULL; |
} |
} |
buffer_get_bignum_bits(b, key->rsa->d); |
if ((rsa_n = BN_new()) == NULL || |
buffer_get_bignum_bits(b, key->rsa->n); |
(rsa_d = BN_new()) == NULL || |
buffer_get_bignum_bits(b, key->rsa->iqmp); |
(rsa_p = BN_new()) == NULL || |
buffer_get_bignum_bits(b, key->rsa->q); |
(rsa_q = BN_new()) == NULL || |
buffer_get_bignum_bits(b, key->rsa->p); |
(rsa_iqmp = BN_new()) == NULL) |
if ((r = rsa_generate_additional_parameters(key->rsa)) != 0) |
fatal("%s: BN_new", __func__); |
|
buffer_get_bignum_bits(b, rsa_d); |
|
buffer_get_bignum_bits(b, rsa_n); |
|
buffer_get_bignum_bits(b, rsa_iqmp); |
|
buffer_get_bignum_bits(b, rsa_q); |
|
buffer_get_bignum_bits(b, rsa_p); |
|
if (!RSA_set0_key(key->rsa, rsa_n, rsa_e, rsa_d)) |
|
fatal("%s: RSA_set0_key failed", __func__); |
|
rsa_n = rsa_e = rsa_d = NULL; /* transferred */ |
|
if (!RSA_set0_factors(key->rsa, rsa_p, rsa_q)) |
|
fatal("%s: RSA_set0_factors failed", __func__); |
|
rsa_p = rsa_q = NULL; /* transferred */ |
|
if ((r = ssh_rsa_complete_crt_parameters(key, rsa_iqmp)) != 0) |
fatal("generate RSA parameters failed: %s", ssh_err(r)); |
fatal("generate RSA parameters failed: %s", ssh_err(r)); |
|
BN_clear_free(rsa_iqmp); |
break; |
break; |
} |
} |
rlen = sshbuf_len(b); |
rlen = sshbuf_len(b); |
if (rlen != 0) |
if (rlen != 0) |
error("do_convert_private_ssh2_from_blob: " |
error("%s: remaining bytes in key blob %d", __func__, rlen); |
"remaining bytes in key blob %d", rlen); |
|
sshbuf_free(b); |
|
|
|
/* try the key */ |
/* try the key */ |
if (sshkey_sign(key, &sig, &slen, data, sizeof(data), 0) != 0 || |
if (sshkey_sign(key, &sig, &slen, data, sizeof(data), NULL, 0) != 0 || |
sshkey_verify(key, sig, slen, data, sizeof(data), 0) != 0) { |
sshkey_verify(key, sig, slen, data, sizeof(data), NULL, 0) != 0) { |
sshkey_free(key); |
sshkey_free(key); |
free(sig); |
free(sig); |
return NULL; |
return NULL; |
|
|
int r, blen, escaped = 0; |
int r, blen, escaped = 0; |
u_int len; |
u_int len; |
char line[1024]; |
char line[1024]; |
u_char blob[8096]; |
struct sshbuf *buf; |
char encoded[8096]; |
char encoded[8096]; |
FILE *fp; |
FILE *fp; |
|
|
|
if ((buf = sshbuf_new()) == NULL) |
|
fatal("sshbuf_new failed"); |
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)); |
encoded[0] = '\0'; |
encoded[0] = '\0'; |
|
|
(encoded[len-2] == '=') && |
(encoded[len-2] == '=') && |
(encoded[len-3] == '=')) |
(encoded[len-3] == '=')) |
encoded[len-3] = '\0'; |
encoded[len-3] = '\0'; |
blen = uudecode(encoded, blob, sizeof(blob)); |
if ((r = sshbuf_b64tod(buf, encoded)) != 0) |
if (blen < 0) |
fatal("%s: base64 decoding failed: %s", __func__, ssh_err(r)); |
fatal("uudecode failed."); |
|
if (*private) |
if (*private) |
*k = do_convert_private_ssh2_from_blob(blob, blen); |
*k = do_convert_private_ssh2(buf); |
else if ((r = sshkey_from_blob(blob, blen, k)) != 0) |
else if ((r = sshkey_fromb(buf, k)) != 0) |
fatal("decode blob failed: %s", ssh_err(r)); |
fatal("decode blob failed: %s", ssh_err(r)); |
fclose(fp); |
fclose(fp); |
} |
} |
|
|
identity_file); |
identity_file); |
} |
} |
fclose(fp); |
fclose(fp); |
switch (EVP_PKEY_type(pubkey->type)) { |
switch (EVP_PKEY_base_id(pubkey)) { |
case EVP_PKEY_RSA: |
case EVP_PKEY_RSA: |
if ((*k = sshkey_new(KEY_UNSPEC)) == NULL) |
if ((*k = sshkey_new(KEY_UNSPEC)) == NULL) |
fatal("sshkey_new failed"); |
fatal("sshkey_new failed"); |
|
|
break; |
break; |
default: |
default: |
fatal("%s: unsupported pubkey type %d", __func__, |
fatal("%s: unsupported pubkey type %d", __func__, |
EVP_PKEY_type(pubkey->type)); |
EVP_PKEY_base_id(pubkey)); |
} |
} |
EVP_PKEY_free(pubkey); |
EVP_PKEY_free(pubkey); |
return; |
return; |
|
|
{ |
{ |
FILE *fp; |
FILE *fp; |
RSA *rsa; |
RSA *rsa; |
#ifdef notyet |
|
DSA *dsa; |
|
#endif |
|
|
|
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)); |
|
|
fclose(fp); |
fclose(fp); |
return; |
return; |
} |
} |
#if notyet /* OpenSSH 0.9.8 lacks this function */ |
|
rewind(fp); |
|
if ((dsa = PEM_read_DSAPublicKey(fp, NULL, NULL, NULL)) != NULL) { |
|
if ((*k = sshkey_new(KEY_UNSPEC)) == NULL) |
|
fatal("sshkey_new failed"); |
|
(*k)->type = KEY_DSA; |
|
(*k)->dsa = dsa; |
|
fclose(fp); |
|
return; |
|
} |
|
/* XXX ECDSA */ |
|
#endif |
|
fatal("%s: unrecognised raw private key format", __func__); |
fatal("%s: unrecognised raw private key format", __func__); |
} |
} |
|
|
|
|
|
|
if (!have_identity) |
if (!have_identity) |
ask_filename(pw, "Enter file in which the key is"); |
ask_filename(pw, "Enter file in which the key is"); |
if (stat(identity_file, &st) < 0) |
if (stat(identity_file, &st) == -1) |
fatal("%s: %s: %s", __progname, identity_file, strerror(errno)); |
fatal("%s: %s: %s", __progname, identity_file, strerror(errno)); |
|
|
switch (convert_format) { |
switch (convert_format) { |
|
|
struct sshkey *prv; |
struct sshkey *prv; |
struct stat st; |
struct stat st; |
int r; |
int r; |
|
char *comment = NULL; |
|
|
if (!have_identity) |
if (!have_identity) |
ask_filename(pw, "Enter file in which the key is"); |
ask_filename(pw, "Enter file in which the key is"); |
if (stat(identity_file, &st) < 0) |
if (stat(identity_file, &st) == -1) |
fatal("%s: %s", identity_file, strerror(errno)); |
fatal("%s: %s", identity_file, strerror(errno)); |
prv = load_identity(identity_file); |
prv = load_identity(identity_file, &comment); |
if ((r = sshkey_write(prv, stdout)) != 0) |
if ((r = sshkey_write(prv, stdout)) != 0) |
error("key_write failed: %s", ssh_err(r)); |
error("sshkey_write failed: %s", ssh_err(r)); |
sshkey_free(prv); |
sshkey_free(prv); |
|
if (comment != NULL && *comment != '\0') |
|
fprintf(stdout, " %s", comment); |
fprintf(stdout, "\n"); |
fprintf(stdout, "\n"); |
|
free(comment); |
exit(0); |
exit(0); |
} |
} |
|
|
|
|
fptype = print_bubblebabble ? SSH_DIGEST_SHA1 : fingerprint_hash; |
fptype = print_bubblebabble ? SSH_DIGEST_SHA1 : fingerprint_hash; |
rep = print_bubblebabble ? SSH_FP_BUBBLEBABBLE : SSH_FP_DEFAULT; |
rep = print_bubblebabble ? SSH_FP_BUBBLEBABBLE : SSH_FP_DEFAULT; |
|
|
pkcs11_init(0); |
pkcs11_init(1); |
nkeys = pkcs11_add_provider(pkcs11provider, NULL, &keys); |
nkeys = pkcs11_add_provider(pkcs11provider, NULL, &keys); |
if (nkeys <= 0) |
if (nkeys <= 0) |
fatal("cannot read public key from pkcs11"); |
fatal("cannot read public key from pkcs11"); |
|
|
fatal("%s: sshkey_fingerprint fail", __func__); |
fatal("%s: sshkey_fingerprint fail", __func__); |
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 >= SYSLOG_LEVEL_VERBOSE) |
if (log_level_get() >= SYSLOG_LEVEL_VERBOSE) |
printf("%s\n", ra); |
printf("%s\n", ra); |
free(ra); |
free(ra); |
free(fp); |
free(fp); |
|
|
struct sshkey *ret; |
struct sshkey *ret; |
int r; |
int r; |
|
|
if ((ret = sshkey_new(KEY_RSA1)) == NULL) |
|
fatal("sshkey_new failed"); |
|
/* Try RSA1 */ |
|
if ((r = sshkey_read(ret, cpp)) == 0) |
|
return ret; |
|
/* Try modern */ |
|
sshkey_free(ret); |
|
if ((ret = sshkey_new(KEY_UNSPEC)) == NULL) |
if ((ret = sshkey_new(KEY_UNSPEC)) == NULL) |
fatal("sshkey_new failed"); |
fatal("sshkey_new failed"); |
if ((r = sshkey_read(ret, cpp)) == 0) |
if ((r = sshkey_read(ret, cpp)) == 0) |
|
|
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("%s: sshkey_fingerprint failed", __func__); |
printf("%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 >= SYSLOG_LEVEL_VERBOSE) |
if (log_level_get() >= SYSLOG_LEVEL_VERBOSE) |
printf("%s\n", ra); |
printf("%s\n", ra); |
free(ra); |
free(ra); |
free(fp); |
free(fp); |
|
|
struct sshkey *public = NULL; |
struct sshkey *public = NULL; |
int r; |
int r; |
|
|
if (stat(identity_file, &st) < 0) |
if (stat(identity_file, &st) == -1) |
fatal("%s: %s", path, strerror(errno)); |
fatal("%s: %s", path, strerror(errno)); |
if ((r = sshkey_load_public(path, &public, &comment)) != 0) { |
if ((r = sshkey_load_public(path, &public, &comment)) != 0) { |
debug("load public \"%s\": %s", path, ssh_err(r)); |
debug("load public \"%s\": %s", path, ssh_err(r)); |
|
|
{ |
{ |
FILE *f; |
FILE *f; |
struct sshkey *public = NULL; |
struct sshkey *public = NULL; |
char *comment = NULL, *cp, *ep, line[16*1024]; |
char *comment = NULL, *cp, *ep, *line = NULL; |
|
size_t linesize = 0; |
int i, invalid = 1; |
int i, invalid = 1; |
const char *path; |
const char *path; |
long int lnum = 0; |
u_long lnum = 0; |
|
|
if (!have_identity) |
if (!have_identity) |
ask_filename(pw, "Enter file in which the key is"); |
ask_filename(pw, "Enter file in which the key is"); |
|
|
} else if ((f = fopen(path, "r")) == NULL) |
} else if ((f = fopen(path, "r")) == NULL) |
fatal("%s: %s: %s", __progname, path, strerror(errno)); |
fatal("%s: %s: %s", __progname, path, strerror(errno)); |
|
|
while (read_keyfile_line(f, path, line, sizeof(line), &lnum) == 0) { |
while (getline(&line, &linesize, f) != -1) { |
|
lnum++; |
cp = line; |
cp = line; |
cp[strcspn(cp, "\n")] = '\0'; |
cp[strcspn(cp, "\n")] = '\0'; |
/* Trim leading space and comments */ |
/* Trim leading space and comments */ |
|
|
*/ |
*/ |
if (lnum == 1 && strcmp(identity_file, "-") != 0 && |
if (lnum == 1 && strcmp(identity_file, "-") != 0 && |
strstr(cp, "PRIVATE KEY") != NULL) { |
strstr(cp, "PRIVATE KEY") != NULL) { |
|
free(line); |
fclose(f); |
fclose(f); |
fingerprint_private(path); |
fingerprint_private(path); |
exit(0); |
exit(0); |
|
|
} |
} |
/* Retry after parsing leading hostname/key options */ |
/* Retry after parsing leading hostname/key options */ |
if (public == NULL && (public = try_read_key(&cp)) == NULL) { |
if (public == NULL && (public = try_read_key(&cp)) == NULL) { |
debug("%s:%ld: not a public key", path, lnum); |
debug("%s:%lu: not a public key", path, lnum); |
continue; |
continue; |
} |
} |
|
|
|
|
invalid = 0; /* One good key in the file is sufficient */ |
invalid = 0; /* One good key in the file is sufficient */ |
} |
} |
fclose(f); |
fclose(f); |
|
free(line); |
|
|
if (invalid) |
if (invalid) |
fatal("%s is not a public key file.", path); |
fatal("%s is not a public key file.", path); |
|
|
char *path; |
char *path; |
} key_types[] = { |
} key_types[] = { |
#ifdef WITH_OPENSSL |
#ifdef WITH_OPENSSL |
#ifdef WITH_SSH1 |
|
{ "rsa1", "RSA1", _PATH_HOST_KEY_FILE }, |
|
#endif /* WITH_SSH1 */ |
|
{ "rsa", "RSA" ,_PATH_HOST_RSA_KEY_FILE }, |
{ "rsa", "RSA" ,_PATH_HOST_RSA_KEY_FILE }, |
{ "dsa", "DSA", _PATH_HOST_DSA_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 }, |
|
#ifdef WITH_XMSS |
|
{ "xmss", "XMSS",_PATH_HOST_XMSS_KEY_FILE }, |
|
#endif /* WITH_XMSS */ |
{ NULL, NULL, NULL } |
{ NULL, NULL, NULL } |
}; |
}; |
|
|
|
u_int32_t bits = 0; |
int first = 0; |
int first = 0; |
struct stat st; |
struct stat st; |
struct sshkey *private, *public; |
struct sshkey *private, *public; |
char comment[1024]; |
char comment[1024], *prv_tmp, *pub_tmp, *prv_file, *pub_file; |
int i, type, fd, r; |
int i, type, fd, r; |
FILE *f; |
FILE *f; |
|
|
for (i = 0; key_types[i].key_type; i++) { |
for (i = 0; key_types[i].key_type; i++) { |
if (stat(key_types[i].path, &st) == 0) |
public = private = NULL; |
continue; |
prv_tmp = pub_tmp = prv_file = pub_file = NULL; |
if (errno != ENOENT) { |
|
|
xasprintf(&prv_file, "%s%s", |
|
identity_file, key_types[i].path); |
|
|
|
/* Check whether private key exists and is not zero-length */ |
|
if (stat(prv_file, &st) == 0) { |
|
if (st.st_size != 0) |
|
goto next; |
|
} else if (errno != ENOENT) { |
error("Could not stat %s: %s", key_types[i].path, |
error("Could not stat %s: %s", key_types[i].path, |
strerror(errno)); |
strerror(errno)); |
first = 0; |
goto failnext; |
continue; |
|
} |
} |
|
|
|
/* |
|
* Private key doesn't exist or is invalid; proceed with |
|
* key generation. |
|
*/ |
|
xasprintf(&prv_tmp, "%s%s.XXXXXXXXXX", |
|
identity_file, key_types[i].path); |
|
xasprintf(&pub_tmp, "%s%s.pub.XXXXXXXXXX", |
|
identity_file, key_types[i].path); |
|
xasprintf(&pub_file, "%s%s.pub", |
|
identity_file, key_types[i].path); |
|
|
if (first == 0) { |
if (first == 0) { |
first = 1; |
first = 1; |
printf("%s: generating new host keys: ", __progname); |
printf("%s: generating new host keys: ", __progname); |
|
|
printf("%s ", key_types[i].key_type_display); |
printf("%s ", key_types[i].key_type_display); |
fflush(stdout); |
fflush(stdout); |
type = sshkey_type_from_name(key_types[i].key_type); |
type = sshkey_type_from_name(key_types[i].key_type); |
strlcpy(identity_file, key_types[i].path, sizeof(identity_file)); |
if ((fd = mkstemp(prv_tmp)) == -1) { |
|
error("Could not save your public key in %s: %s", |
|
prv_tmp, strerror(errno)); |
|
goto failnext; |
|
} |
|
close(fd); /* just using mkstemp() to generate/reserve a name */ |
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("key_generate failed: %s", ssh_err(r)); |
error("sshkey_generate failed: %s", ssh_err(r)); |
first = 0; |
goto failnext; |
continue; |
|
} |
} |
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("sshkey_from_private failed: %s", ssh_err(r)); |
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, identity_file, "", |
if ((r = sshkey_save_private(private, prv_tmp, "", |
comment, use_new_format, new_format_cipher, rounds)) != 0) { |
comment, private_key_format, openssh_format_cipher, |
|
rounds)) != 0) { |
error("Saving key \"%s\" failed: %s", |
error("Saving key \"%s\" failed: %s", |
identity_file, ssh_err(r)); |
prv_tmp, ssh_err(r)); |
sshkey_free(private); |
goto failnext; |
sshkey_free(public); |
|
first = 0; |
|
continue; |
|
} |
} |
sshkey_free(private); |
if ((fd = mkstemp(pub_tmp)) == -1) { |
strlcat(identity_file, ".pub", sizeof(identity_file)); |
error("Could not save your public key in %s: %s", |
fd = open(identity_file, O_WRONLY | O_CREAT | O_TRUNC, 0644); |
pub_tmp, strerror(errno)); |
if (fd == -1) { |
goto failnext; |
error("Could not save your public key in %s", |
|
identity_file); |
|
sshkey_free(public); |
|
first = 0; |
|
continue; |
|
} |
} |
|
(void)fchmod(fd, 0644); |
f = fdopen(fd, "w"); |
f = fdopen(fd, "w"); |
if (f == NULL) { |
if (f == NULL) { |
error("fdopen %s failed", identity_file); |
error("fdopen %s failed: %s", pub_tmp, strerror(errno)); |
close(fd); |
close(fd); |
sshkey_free(public); |
goto failnext; |
first = 0; |
|
continue; |
|
} |
} |
if ((r = sshkey_write(public, f)) != 0) { |
if ((r = sshkey_write(public, f)) != 0) { |
error("write key failed: %s", ssh_err(r)); |
error("write key failed: %s", ssh_err(r)); |
fclose(f); |
fclose(f); |
sshkey_free(public); |
goto failnext; |
first = 0; |
|
continue; |
|
} |
} |
fprintf(f, " %s\n", comment); |
fprintf(f, " %s\n", comment); |
fclose(f); |
if (ferror(f) != 0) { |
sshkey_free(public); |
error("write key failed: %s", strerror(errno)); |
|
fclose(f); |
|
goto failnext; |
|
} |
|
if (fclose(f) != 0) { |
|
error("key close failed: %s", strerror(errno)); |
|
goto failnext; |
|
} |
|
|
|
/* Rename temporary files to their permanent locations. */ |
|
if (rename(pub_tmp, pub_file) != 0) { |
|
error("Unable to move %s into position: %s", |
|
pub_file, strerror(errno)); |
|
goto failnext; |
|
} |
|
if (rename(prv_tmp, prv_file) != 0) { |
|
error("Unable to move %s into position: %s", |
|
key_types[i].path, strerror(errno)); |
|
failnext: |
|
first = 0; |
|
goto next; |
|
} |
|
next: |
|
sshkey_free(private); |
|
sshkey_free(public); |
|
free(prv_tmp); |
|
free(pub_tmp); |
|
free(prv_file); |
|
free(pub_file); |
} |
} |
if (first != 0) |
if (first != 0) |
printf("\n"); |
printf("\n"); |
|
|
int has_unhashed; /* When hashing, original had unhashed hosts */ |
int has_unhashed; /* When hashing, original had unhashed hosts */ |
int found_key; /* For find/delete, host was found */ |
int found_key; /* For find/delete, host was found */ |
int invalid; /* File contained invalid items; don't delete */ |
int invalid; /* File contained invalid items; don't delete */ |
|
int hash_hosts; /* Hash hostnames as we go */ |
|
int find_host; /* Search for specific hostname */ |
|
int delete_host; /* Delete host from known_hosts */ |
}; |
}; |
|
|
static int |
static int |
|
|
struct known_hosts_ctx *ctx = (struct known_hosts_ctx *)_ctx; |
struct known_hosts_ctx *ctx = (struct known_hosts_ctx *)_ctx; |
char *hashed, *cp, *hosts, *ohosts; |
char *hashed, *cp, *hosts, *ohosts; |
int has_wild = l->hosts && strcspn(l->hosts, "*?!") != strlen(l->hosts); |
int has_wild = l->hosts && strcspn(l->hosts, "*?!") != strlen(l->hosts); |
|
int was_hashed = l->hosts && l->hosts[0] == HASH_DELIM; |
|
|
switch (l->status) { |
switch (l->status) { |
case HKF_STATUS_OK: |
case HKF_STATUS_OK: |
|
|
* Don't hash hosts already already hashed, with wildcard |
* Don't hash hosts already already hashed, with wildcard |
* characters or a CA/revocation marker. |
* characters or a CA/revocation marker. |
*/ |
*/ |
if ((l->match & HKF_MATCH_HOST_HASHED) != 0 || |
if (was_hashed || has_wild || l->marker != MRK_NONE) { |
has_wild || l->marker != MRK_NONE) { |
|
fprintf(ctx->out, "%s\n", l->line); |
fprintf(ctx->out, "%s\n", l->line); |
if (has_wild && !find_host) { |
if (has_wild && !ctx->find_host) { |
logit("%s:%ld: ignoring host name " |
logit("%s:%lu: ignoring host name " |
"with wildcard: %.64s", l->path, |
"with wildcard: %.64s", l->path, |
l->linenum, l->hosts); |
l->linenum, l->hosts); |
} |
} |
|
|
*/ |
*/ |
ohosts = hosts = xstrdup(l->hosts); |
ohosts = hosts = xstrdup(l->hosts); |
while ((cp = strsep(&hosts, ",")) != NULL && *cp != '\0') { |
while ((cp = strsep(&hosts, ",")) != NULL && *cp != '\0') { |
|
lowercase(cp); |
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); |
|
|
case HKF_STATUS_INVALID: |
case HKF_STATUS_INVALID: |
/* Retain invalid lines, but mark file as invalid. */ |
/* Retain invalid lines, but mark file as invalid. */ |
ctx->invalid = 1; |
ctx->invalid = 1; |
logit("%s:%ld: invalid line", l->path, l->linenum); |
logit("%s:%lu: invalid line", l->path, l->linenum); |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
default: |
default: |
fprintf(ctx->out, "%s\n", l->line); |
fprintf(ctx->out, "%s\n", l->line); |
|
|
struct known_hosts_ctx *ctx = (struct known_hosts_ctx *)_ctx; |
struct known_hosts_ctx *ctx = (struct known_hosts_ctx *)_ctx; |
enum sshkey_fp_rep rep; |
enum sshkey_fp_rep rep; |
int fptype; |
int fptype; |
char *fp; |
char *fp = NULL, *ra = NULL; |
|
|
fptype = print_bubblebabble ? SSH_DIGEST_SHA1 : fingerprint_hash; |
fptype = print_bubblebabble ? SSH_DIGEST_SHA1 : fingerprint_hash; |
rep = print_bubblebabble ? SSH_FP_BUBBLEBABBLE : SSH_FP_DEFAULT; |
rep = print_bubblebabble ? SSH_FP_BUBBLEBABBLE : SSH_FP_DEFAULT; |
|
|
if (l->status == HKF_STATUS_MATCHED) { |
if (l->status == HKF_STATUS_MATCHED) { |
if (delete_host) { |
if (ctx->delete_host) { |
if (l->marker != MRK_NONE) { |
if (l->marker != MRK_NONE) { |
/* Don't remove CA and revocation lines */ |
/* Don't remove CA and revocation lines */ |
fprintf(ctx->out, "%s\n", l->line); |
fprintf(ctx->out, "%s\n", l->line); |
|
|
*/ |
*/ |
ctx->found_key = 1; |
ctx->found_key = 1; |
if (!quiet) |
if (!quiet) |
printf("# Host %s found: line %ld\n", |
printf("# Host %s found: line %lu\n", |
ctx->host, l->linenum); |
ctx->host, l->linenum); |
} |
} |
return 0; |
return 0; |
} else if (find_host) { |
} else if (ctx->find_host) { |
ctx->found_key = 1; |
ctx->found_key = 1; |
if (!quiet) { |
if (!quiet) { |
printf("# Host %s found: line %ld %s\n", |
printf("# Host %s found: line %lu %s\n", |
ctx->host, |
ctx->host, |
l->linenum, l->marker == MRK_CA ? "CA" : |
l->linenum, l->marker == MRK_CA ? "CA" : |
(l->marker == MRK_REVOKE ? "REVOKED" : "")); |
(l->marker == MRK_REVOKE ? "REVOKED" : "")); |
} |
} |
if (hash_hosts) |
if (ctx->hash_hosts) |
known_hosts_hash(l, ctx); |
known_hosts_hash(l, ctx); |
else if (print_fingerprint) { |
else if (print_fingerprint) { |
fp = sshkey_fingerprint(l->key, fptype, rep); |
fp = sshkey_fingerprint(l->key, fptype, rep); |
printf("%s %s %s %s\n", ctx->host, |
ra = sshkey_fingerprint(l->key, |
|
fingerprint_hash, SSH_FP_RANDOMART); |
|
if (fp == NULL || ra == NULL) |
|
fatal("%s: sshkey_fingerprint failed", |
|
__func__); |
|
mprintf("%s %s %s %s\n", ctx->host, |
sshkey_type(l->key), fp, l->comment); |
sshkey_type(l->key), fp, l->comment); |
|
if (log_level_get() >= SYSLOG_LEVEL_VERBOSE) |
|
printf("%s\n", ra); |
|
free(ra); |
free(fp); |
free(fp); |
} else |
} else |
fprintf(ctx->out, "%s\n", l->line); |
fprintf(ctx->out, "%s\n", l->line); |
return 0; |
return 0; |
} |
} |
} else if (delete_host) { |
} else if (ctx->delete_host) { |
/* Retain non-matching hosts when deleting */ |
/* Retain non-matching hosts when deleting */ |
if (l->status == HKF_STATUS_INVALID) { |
if (l->status == HKF_STATUS_INVALID) { |
ctx->invalid = 1; |
ctx->invalid = 1; |
logit("%s:%ld: invalid line", l->path, l->linenum); |
logit("%s:%lu: invalid line", l->path, l->linenum); |
} |
} |
fprintf(ctx->out, "%s\n", l->line); |
fprintf(ctx->out, "%s\n", l->line); |
} |
} |
|
|
} |
} |
|
|
static void |
static void |
do_known_hosts(struct passwd *pw, const char *name) |
do_known_hosts(struct passwd *pw, const char *name, int find_host, |
|
int delete_host, int hash_hosts) |
{ |
{ |
char *cp, tmp[PATH_MAX], old[PATH_MAX]; |
char *cp, tmp[PATH_MAX], old[PATH_MAX]; |
int r, fd, oerrno, inplace = 0; |
int r, fd, oerrno, inplace = 0; |
|
|
memset(&ctx, 0, sizeof(ctx)); |
memset(&ctx, 0, sizeof(ctx)); |
ctx.out = stdout; |
ctx.out = stdout; |
ctx.host = name; |
ctx.host = name; |
|
ctx.hash_hosts = hash_hosts; |
|
ctx.find_host = find_host; |
|
ctx.delete_host = delete_host; |
|
|
/* |
/* |
* Find hosts goes to stdout, hash and deletions happen in-place |
* Find hosts goes to stdout, hash and deletions happen in-place |
|
|
} |
} |
inplace = 1; |
inplace = 1; |
} |
} |
|
|
/* XXX support identity_file == "-" for stdin */ |
/* XXX support identity_file == "-" for stdin */ |
foreach_options = find_host ? HKF_WANT_MATCH : 0; |
foreach_options = find_host ? HKF_WANT_MATCH : 0; |
foreach_options |= print_fingerprint ? HKF_WANT_PARSE_KEY : 0; |
foreach_options |= print_fingerprint ? HKF_WANT_PARSE_KEY : 0; |
if ((r = hostkeys_foreach(identity_file, |
if ((r = hostkeys_foreach(identity_file, (find_host || !hash_hosts) ? |
hash_hosts ? known_hosts_hash : known_hosts_find_delete, &ctx, |
known_hosts_find_delete : known_hosts_hash, &ctx, name, NULL, |
name, NULL, foreach_options)) != 0) |
foreach_options)) != 0) { |
|
if (inplace) |
|
unlink(tmp); |
fatal("%s: hostkeys_foreach failed: %s", __func__, ssh_err(r)); |
fatal("%s: hostkeys_foreach failed: %s", __func__, ssh_err(r)); |
|
} |
|
|
if (inplace) |
if (inplace) |
fclose(ctx.out); |
fclose(ctx.out); |
|
|
|
|
if (!have_identity) |
if (!have_identity) |
ask_filename(pw, "Enter file in which the key is"); |
ask_filename(pw, "Enter file in which the key is"); |
if (stat(identity_file, &st) < 0) |
if (stat(identity_file, &st) == -1) |
fatal("%s: %s", identity_file, strerror(errno)); |
fatal("%s: %s", identity_file, strerror(errno)); |
/* Try to load the file with empty passphrase. */ |
/* Try to load the file with empty passphrase. */ |
r = sshkey_load_private(identity_file, "", &private, &comment); |
r = sshkey_load_private(identity_file, "", &private, &comment); |
|
|
fatal("Failed to load key %s: %s", identity_file, ssh_err(r)); |
fatal("Failed to load key %s: %s", identity_file, ssh_err(r)); |
} |
} |
if (comment) |
if (comment) |
printf("Key has comment '%s'\n", comment); |
mprintf("Key has comment '%s'\n", comment); |
|
|
/* Ask the new passphrase (twice). */ |
/* Ask the new passphrase (twice). */ |
if (identity_new_passphrase) { |
if (identity_new_passphrase) { |
|
|
|
|
/* 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, use_new_format, new_format_cipher, rounds)) != 0) { |
comment, private_key_format, openssh_format_cipher, rounds)) != 0) { |
error("Saving key \"%s\" failed: %s.", |
error("Saving key \"%s\" failed: %s.", |
identity_file, ssh_err(r)); |
identity_file, ssh_err(r)); |
explicit_bzero(passphrase1, strlen(passphrase1)); |
explicit_bzero(passphrase1, strlen(passphrase1)); |
|
|
* Print the SSHFP RR. |
* Print the SSHFP RR. |
*/ |
*/ |
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) |
{ |
{ |
struct sshkey *public; |
struct sshkey *public; |
char *comment = NULL; |
char *comment = NULL; |
|
|
|
|
if (fname == NULL) |
if (fname == NULL) |
fatal("%s: no filename", __func__); |
fatal("%s: no filename", __func__); |
if (stat(fname, &st) < 0) { |
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)); |
|
|
* Change the comment of a private key file. |
* Change the comment of a private key file. |
*/ |
*/ |
static void |
static void |
do_change_comment(struct passwd *pw) |
do_change_comment(struct passwd *pw, const char *identity_comment) |
{ |
{ |
char new_comment[1024], *comment, *passphrase; |
char new_comment[1024], *comment, *passphrase; |
struct sshkey *private; |
struct sshkey *private; |
|
|
|
|
if (!have_identity) |
if (!have_identity) |
ask_filename(pw, "Enter file in which the key is"); |
ask_filename(pw, "Enter file in which the key is"); |
if (stat(identity_file, &st) < 0) |
if (stat(identity_file, &st) == -1) |
fatal("%s: %s", identity_file, strerror(errno)); |
fatal("%s: %s", identity_file, strerror(errno)); |
if ((r = sshkey_load_private(identity_file, "", |
if ((r = sshkey_load_private(identity_file, "", |
&private, &comment)) == 0) |
&private, &comment)) == 0) |
|
|
identity_file, ssh_err(r)); |
identity_file, ssh_err(r)); |
} |
} |
} |
} |
/* XXX what about new-format keys? */ |
|
if (private->type != KEY_RSA1) { |
if (private->type != KEY_ED25519 && private->type != KEY_XMSS && |
error("Comments are only supported for RSA1 keys."); |
private_key_format != SSHKEY_PRIVATE_OPENSSH) { |
|
error("Comments are only supported for keys stored in " |
|
"the new format (-o)."); |
explicit_bzero(passphrase, strlen(passphrase)); |
explicit_bzero(passphrase, strlen(passphrase)); |
sshkey_free(private); |
sshkey_free(private); |
exit(1); |
exit(1); |
} |
} |
printf("Key now has comment '%s'\n", comment); |
if (comment) |
|
printf("Old comment: %s\n", comment); |
|
else |
|
printf("No existing comment\n"); |
|
|
if (identity_comment) { |
if (identity_comment) { |
strlcpy(new_comment, identity_comment, sizeof(new_comment)); |
strlcpy(new_comment, identity_comment, sizeof(new_comment)); |
} else { |
} else { |
printf("Enter new comment: "); |
printf("New comment: "); |
fflush(stdout); |
fflush(stdout); |
if (!fgets(new_comment, sizeof(new_comment), stdin)) { |
if (!fgets(new_comment, sizeof(new_comment), stdin)) { |
explicit_bzero(passphrase, strlen(passphrase)); |
explicit_bzero(passphrase, strlen(passphrase)); |
|
|
} |
} |
new_comment[strcspn(new_comment, "\n")] = '\0'; |
new_comment[strcspn(new_comment, "\n")] = '\0'; |
} |
} |
|
if (comment != NULL && strcmp(comment, new_comment) == 0) { |
|
printf("No change to comment\n"); |
|
free(passphrase); |
|
sshkey_free(private); |
|
free(comment); |
|
exit(0); |
|
} |
|
|
/* Save the file using the new passphrase. */ |
/* Save the file using the new passphrase. */ |
if ((r = sshkey_save_private(private, identity_file, passphrase, |
if ((r = sshkey_save_private(private, identity_file, passphrase, |
new_comment, use_new_format, new_format_cipher, rounds)) != 0) { |
new_comment, private_key_format, openssh_format_cipher, |
|
rounds)) != 0) { |
error("Saving key \"%s\" failed: %s", |
error("Saving key \"%s\" failed: %s", |
identity_file, ssh_err(r)); |
identity_file, ssh_err(r)); |
explicit_bzero(passphrase, strlen(passphrase)); |
explicit_bzero(passphrase, strlen(passphrase)); |
|
|
explicit_bzero(passphrase, strlen(passphrase)); |
explicit_bzero(passphrase, strlen(passphrase)); |
free(passphrase); |
free(passphrase); |
if ((r = sshkey_from_private(private, &public)) != 0) |
if ((r = sshkey_from_private(private, &public)) != 0) |
fatal("key_from_private failed: %s", ssh_err(r)); |
fatal("sshkey_from_private failed: %s", ssh_err(r)); |
sshkey_free(private); |
sshkey_free(private); |
|
|
strlcat(identity_file, ".pub", sizeof(identity_file)); |
strlcat(identity_file, ".pub", sizeof(identity_file)); |
|
|
|
|
free(comment); |
free(comment); |
|
|
printf("The comment in your key file has been changed.\n"); |
if (strlen(new_comment) > 0) |
|
printf("Comment '%s' applied\n", new_comment); |
|
else |
|
printf("Comment removed\n"); |
|
|
exit(0); |
exit(0); |
} |
} |
|
|
static const char * |
|
fmt_validity(u_int64_t valid_from, u_int64_t valid_to) |
|
{ |
|
char from[32], to[32]; |
|
static char ret[64]; |
|
time_t tt; |
|
struct tm *tm; |
|
|
|
*from = *to = '\0'; |
|
if (valid_from == 0 && valid_to == 0xffffffffffffffffULL) |
|
return "forever"; |
|
|
|
if (valid_from != 0) { |
|
/* XXX revisit INT_MAX in 2038 :) */ |
|
tt = valid_from > INT_MAX ? INT_MAX : valid_from; |
|
tm = localtime(&tt); |
|
strftime(from, sizeof(from), "%Y-%m-%dT%H:%M:%S", tm); |
|
} |
|
if (valid_to != 0xffffffffffffffffULL) { |
|
/* XXX revisit INT_MAX in 2038 :) */ |
|
tt = valid_to > INT_MAX ? INT_MAX : valid_to; |
|
tm = localtime(&tt); |
|
strftime(to, sizeof(to), "%Y-%m-%dT%H:%M:%S", tm); |
|
} |
|
|
|
if (valid_from == 0) { |
|
snprintf(ret, sizeof(ret), "before %s", to); |
|
return ret; |
|
} |
|
if (valid_to == 0xffffffffffffffffULL) { |
|
snprintf(ret, sizeof(ret), "after %s", from); |
|
return ret; |
|
} |
|
|
|
snprintf(ret, sizeof(ret), "from %s to %s", from, to); |
|
return ret; |
|
} |
|
|
|
static void |
static void |
add_flag_option(struct sshbuf *c, const char *name) |
add_flag_option(struct sshbuf *c, const char *name) |
{ |
{ |
|
|
static void |
static void |
prepare_options_buf(struct sshbuf *c, int which) |
prepare_options_buf(struct sshbuf *c, int which) |
{ |
{ |
|
size_t i; |
|
|
sshbuf_reset(c); |
sshbuf_reset(c); |
if ((which & OPTIONS_CRITICAL) != 0 && |
if ((which & OPTIONS_CRITICAL) != 0 && |
certflags_command != NULL) |
certflags_command != NULL) |
|
|
if ((which & OPTIONS_CRITICAL) != 0 && |
if ((which & OPTIONS_CRITICAL) != 0 && |
certflags_src_addr != NULL) |
certflags_src_addr != NULL) |
add_string_option(c, "source-address", certflags_src_addr); |
add_string_option(c, "source-address", certflags_src_addr); |
|
for (i = 0; i < ncert_userext; i++) { |
|
if ((cert_userext[i].crit && (which & OPTIONS_EXTENSIONS)) || |
|
(!cert_userext[i].crit && (which & OPTIONS_CRITICAL))) |
|
continue; |
|
if (cert_userext[i].val == NULL) |
|
add_flag_option(c, cert_userext[i].key); |
|
else { |
|
add_string_option(c, cert_userext[i].key, |
|
cert_userext[i].val); |
|
} |
|
} |
} |
} |
|
|
static struct sshkey * |
static struct sshkey * |
|
|
#endif /* ENABLE_PKCS11 */ |
#endif /* ENABLE_PKCS11 */ |
} |
} |
|
|
|
/* Signer for sshkey_certify_custom that uses the agent */ |
|
static int |
|
agent_signer(struct sshkey *key, u_char **sigp, size_t *lenp, |
|
const u_char *data, size_t datalen, |
|
const char *alg, u_int compat, void *ctx) |
|
{ |
|
int *agent_fdp = (int *)ctx; |
|
|
|
return ssh_agent_sign(*agent_fdp, key, sigp, lenp, |
|
data, datalen, alg, compat); |
|
} |
|
|
static void |
static void |
do_ca_sign(struct passwd *pw, int argc, char **argv) |
do_ca_sign(struct passwd *pw, const char *ca_key_path, int prefer_agent, |
|
unsigned long long cert_serial, int cert_serial_autoinc, |
|
int argc, char **argv) |
{ |
{ |
int r, i, fd; |
int r, i, fd, found, agent_fd = -1; |
u_int n; |
u_int n; |
struct sshkey *ca, *public; |
struct sshkey *ca, *public; |
char *otmp, *tmp, *cp, *out, *comment, **plist = NULL; |
char valid[64], *otmp, *tmp, *cp, *out, *comment, **plist = NULL; |
FILE *f; |
FILE *f; |
|
struct ssh_identitylist *agent_ids; |
|
size_t j; |
|
|
#ifdef ENABLE_PKCS11 |
#ifdef ENABLE_PKCS11 |
pkcs11_init(1); |
pkcs11_init(1); |
#endif |
#endif |
tmp = tilde_expand_filename(ca_key_path, pw->pw_uid); |
tmp = tilde_expand_filename(ca_key_path, pw->pw_uid); |
if (pkcs11provider != NULL) { |
if (pkcs11provider != NULL) { |
|
/* If a PKCS#11 token was specified then try to use it */ |
if ((ca = load_pkcs11_key(tmp)) == NULL) |
if ((ca = load_pkcs11_key(tmp)) == NULL) |
fatal("No PKCS#11 key matching %s found", ca_key_path); |
fatal("No PKCS#11 key matching %s found", ca_key_path); |
} else |
} else if (prefer_agent) { |
ca = load_identity(tmp); |
/* |
|
* Agent signature requested. Try to use agent after making |
|
* sure the public key specified is actually present in the |
|
* agent. |
|
*/ |
|
if ((r = sshkey_load_public(tmp, &ca, NULL)) != 0) |
|
fatal("Cannot load CA public key %s: %s", |
|
tmp, ssh_err(r)); |
|
if ((r = ssh_get_authentication_socket(&agent_fd)) != 0) |
|
fatal("Cannot use public key for CA signature: %s", |
|
ssh_err(r)); |
|
if ((r = ssh_fetch_identitylist(agent_fd, &agent_ids)) != 0) |
|
fatal("Retrieve agent key list: %s", ssh_err(r)); |
|
found = 0; |
|
for (j = 0; j < agent_ids->nkeys; j++) { |
|
if (sshkey_equal(ca, agent_ids->keys[j])) { |
|
found = 1; |
|
break; |
|
} |
|
} |
|
if (!found) |
|
fatal("CA key %s not found in agent", tmp); |
|
ssh_free_identitylist(agent_ids); |
|
ca->flags |= SSHKEY_FLAG_EXT; |
|
} else { |
|
/* CA key is assumed to be a private key on the filesystem */ |
|
ca = load_identity(tmp, NULL); |
|
} |
free(tmp); |
free(tmp); |
|
|
|
if (key_type_name != NULL && |
|
sshkey_type_from_name(key_type_name) != ca->type) { |
|
fatal("CA key type %s doesn't match specified %s", |
|
sshkey_ssh_name(ca), key_type_name); |
|
} |
|
|
for (i = 0; i < argc; i++) { |
for (i = 0; i < argc; i++) { |
/* Split list of principals */ |
/* Split list of principals */ |
n = 0; |
n = 0; |
|
|
} |
} |
free(otmp); |
free(otmp); |
} |
} |
|
if (n > SSHKEY_CERT_MAX_PRINCIPALS) |
|
fatal("Too many certificate principals specified"); |
|
|
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("%s: unable to open \"%s\": %s", |
__func__, tmp, ssh_err(r)); |
__func__, tmp, ssh_err(r)); |
if (public->type != KEY_RSA && public->type != KEY_DSA && |
if (public->type != KEY_RSA && public->type != KEY_DSA && |
public->type != KEY_ECDSA && public->type != KEY_ED25519) |
public->type != KEY_ECDSA && public->type != KEY_ED25519 && |
|
public->type != KEY_XMSS) |
fatal("%s: key \"%s\" type %s cannot be certified", |
fatal("%s: key \"%s\" type %s cannot be certified", |
__func__, tmp, sshkey_type(public)); |
__func__, tmp, sshkey_type(public)); |
|
|
|
|
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("key_from_private (ca key): %s", ssh_err(r)); |
fatal("sshkey_from_private (ca key): %s", ssh_err(r)); |
|
|
if (sshkey_certify(public, ca) != 0) |
if (agent_fd != -1 && (ca->flags & SSHKEY_FLAG_EXT) != 0) { |
fatal("Couldn't not certify key %s", tmp); |
if ((r = sshkey_certify_custom(public, ca, |
|
key_type_name, agent_signer, &agent_fd)) != 0) |
|
fatal("Couldn't certify key %s via agent: %s", |
|
tmp, ssh_err(r)); |
|
} else { |
|
if ((sshkey_certify(public, ca, key_type_name)) != 0) |
|
fatal("Couldn't certify key %s: %s", |
|
tmp, ssh_err(r)); |
|
} |
|
|
if ((cp = strrchr(tmp, '.')) != NULL && strcmp(cp, ".pub") == 0) |
if ((cp = strrchr(tmp, '.')) != NULL && strcmp(cp, ".pub") == 0) |
*cp = '\0'; |
*cp = '\0'; |
|
|
fclose(f); |
fclose(f); |
|
|
if (!quiet) { |
if (!quiet) { |
|
sshkey_format_cert_validity(public->cert, |
|
valid, sizeof(valid)); |
logit("Signed %s key %s: id \"%s\" serial %llu%s%s " |
logit("Signed %s key %s: id \"%s\" serial %llu%s%s " |
"valid %s", sshkey_cert_type(public), |
"valid %s", sshkey_cert_type(public), |
out, public->cert->key_id, |
out, public->cert->key_id, |
(unsigned long long)public->cert->serial, |
(unsigned long long)public->cert->serial, |
cert_principals != NULL ? " for " : "", |
cert_principals != NULL ? " for " : "", |
cert_principals != NULL ? cert_principals : "", |
cert_principals != NULL ? cert_principals : "", |
fmt_validity(cert_valid_from, cert_valid_to)); |
valid); |
} |
} |
|
|
sshkey_free(public); |
sshkey_free(public); |
free(out); |
free(out); |
|
if (cert_serial_autoinc) |
|
cert_serial++; |
} |
} |
#ifdef ENABLE_PKCS11 |
#ifdef ENABLE_PKCS11 |
pkcs11_terminate(); |
pkcs11_terminate(); |
|
|
return now + (u_int64_t)(secs * mul); |
return now + (u_int64_t)(secs * mul); |
} |
} |
|
|
static u_int64_t |
|
parse_absolute_time(const char *s) |
|
{ |
|
struct tm tm; |
|
time_t tt; |
|
char buf[32], *fmt; |
|
|
|
/* |
|
* POSIX strptime says "The application shall ensure that there |
|
* is white-space or other non-alphanumeric characters between |
|
* any two conversion specifications" so arrange things this way. |
|
*/ |
|
switch (strlen(s)) { |
|
case 8: |
|
fmt = "%Y-%m-%d"; |
|
snprintf(buf, sizeof(buf), "%.4s-%.2s-%.2s", s, s + 4, s + 6); |
|
break; |
|
case 14: |
|
fmt = "%Y-%m-%dT%H:%M:%S"; |
|
snprintf(buf, sizeof(buf), "%.4s-%.2s-%.2sT%.2s:%.2s:%.2s", |
|
s, s + 4, s + 6, s + 8, s + 10, s + 12); |
|
break; |
|
default: |
|
fatal("Invalid certificate time format %s", s); |
|
} |
|
|
|
memset(&tm, 0, sizeof(tm)); |
|
if (strptime(buf, fmt, &tm) == NULL) |
|
fatal("Invalid certificate time %s", s); |
|
if ((tt = mktime(&tm)) < 0) |
|
fatal("Certificate time %s cannot be represented", s); |
|
return (u_int64_t)tt; |
|
} |
|
|
|
static void |
static void |
parse_cert_times(char *timespec) |
parse_cert_times(char *timespec) |
{ |
{ |
|
|
|
|
/* |
/* |
* from:to, where |
* from:to, where |
* from := [+-]timespec | YYYYMMDD | YYYYMMDDHHMMSS |
* from := [+-]timespec | YYYYMMDD | YYYYMMDDHHMMSS | "always" |
* to := [+-]timespec | YYYYMMDD | YYYYMMDDHHMMSS |
* to := [+-]timespec | YYYYMMDD | YYYYMMDDHHMMSS | "forever" |
*/ |
*/ |
from = xstrdup(timespec); |
from = xstrdup(timespec); |
to = strchr(from, ':'); |
to = strchr(from, ':'); |
|
|
|
|
if (*from == '-' || *from == '+') |
if (*from == '-' || *from == '+') |
cert_valid_from = parse_relative_time(from, now); |
cert_valid_from = parse_relative_time(from, now); |
else |
else if (strcmp(from, "always") == 0) |
cert_valid_from = parse_absolute_time(from); |
cert_valid_from = 0; |
|
else if (parse_absolute_time(from, &cert_valid_from) != 0) |
|
fatal("Invalid from time \"%s\"", from); |
|
|
if (*to == '-' || *to == '+') |
if (*to == '-' || *to == '+') |
cert_valid_to = parse_relative_time(to, now); |
cert_valid_to = parse_relative_time(to, now); |
else |
else if (strcmp(to, "forever") == 0) |
cert_valid_to = parse_absolute_time(to); |
cert_valid_to = ~(u_int64_t)0; |
|
else if (parse_absolute_time(to, &cert_valid_to) != 0) |
|
fatal("Invalid to time \"%s\"", to); |
|
|
if (cert_valid_to <= cert_valid_from) |
if (cert_valid_to <= cert_valid_from) |
fatal("Empty certificate validity interval"); |
fatal("Empty certificate validity interval"); |
|
|
static void |
static void |
add_cert_option(char *opt) |
add_cert_option(char *opt) |
{ |
{ |
char *val; |
char *val, *cp; |
|
int iscrit = 0; |
|
|
if (strcasecmp(opt, "clear") == 0) |
if (strcasecmp(opt, "clear") == 0) |
certflags_flags = 0; |
certflags_flags = 0; |
|
|
if (addr_match_cidr_list(NULL, val) != 0) |
if (addr_match_cidr_list(NULL, 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 || |
|
(iscrit = (strncasecmp(opt, "critical:", 9) == 0))) { |
|
val = xstrdup(strchr(opt, ':') + 1); |
|
if ((cp = strchr(val, '=')) != NULL) |
|
*cp++ = '\0'; |
|
cert_userext = xreallocarray(cert_userext, ncert_userext + 1, |
|
sizeof(*cert_userext)); |
|
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 |
print_cert(struct sshkey *key) |
print_cert(struct sshkey *key) |
{ |
{ |
char *key_fp, *ca_fp; |
char valid[64], *key_fp, *ca_fp; |
u_int i; |
u_int i; |
|
|
key_fp = sshkey_fingerprint(key, fingerprint_hash, SSH_FP_DEFAULT); |
key_fp = sshkey_fingerprint(key, fingerprint_hash, SSH_FP_DEFAULT); |
|
|
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("%s: sshkey_fingerprint fail", __func__); |
|
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), |
sshkey_cert_type(key)); |
sshkey_cert_type(key)); |
printf(" Public key: %s %s\n", sshkey_type(key), key_fp); |
printf(" Public key: %s %s\n", sshkey_type(key), key_fp); |
printf(" Signing CA: %s %s\n", |
printf(" Signing CA: %s %s (using %s)\n", |
sshkey_type(key->cert->signature_key), ca_fp); |
sshkey_type(key->cert->signature_key), ca_fp, |
|
key->cert->signature_type); |
printf(" Key ID: \"%s\"\n", key->cert->key_id); |
printf(" Key ID: \"%s\"\n", key->cert->key_id); |
printf(" Serial: %llu\n", (unsigned long long)key->cert->serial); |
printf(" Serial: %llu\n", (unsigned long long)key->cert->serial); |
printf(" Valid: %s\n", |
printf(" Valid: %s\n", valid); |
fmt_validity(key->cert->valid_after, key->cert->valid_before)); |
|
printf(" Principals: "); |
printf(" Principals: "); |
if (key->cert->nprincipals == 0) |
if (key->cert->nprincipals == 0) |
printf("(none)\n"); |
printf("(none)\n"); |
|
|
struct stat st; |
struct stat st; |
int r, is_stdin = 0, ok = 0; |
int r, is_stdin = 0, ok = 0; |
FILE *f; |
FILE *f; |
char *cp, line[2048]; |
char *cp, *line = NULL; |
const char *path; |
const char *path; |
long int lnum = 0; |
size_t linesize = 0; |
|
u_long lnum = 0; |
|
|
if (!have_identity) |
if (!have_identity) |
ask_filename(pw, "Enter file in which the key is"); |
ask_filename(pw, "Enter file in which the key is"); |
if (strcmp(identity_file, "-") != 0 && stat(identity_file, &st) < 0) |
if (strcmp(identity_file, "-") != 0 && stat(identity_file, &st) == -1) |
fatal("%s: %s: %s", __progname, identity_file, strerror(errno)); |
fatal("%s: %s: %s", __progname, identity_file, strerror(errno)); |
|
|
path = identity_file; |
path = identity_file; |
|
|
} else if ((f = fopen(identity_file, "r")) == NULL) |
} else if ((f = fopen(identity_file, "r")) == NULL) |
fatal("fopen %s: %s", identity_file, strerror(errno)); |
fatal("fopen %s: %s", identity_file, strerror(errno)); |
|
|
while (read_keyfile_line(f, path, line, sizeof(line), &lnum) == 0) { |
while (getline(&line, &linesize, f) != -1) { |
|
lnum++; |
sshkey_free(key); |
sshkey_free(key); |
key = NULL; |
key = NULL; |
/* Trim leading space and comments */ |
/* Trim leading space and comments */ |
|
|
if (*cp == '#' || *cp == '\0') |
if (*cp == '#' || *cp == '\0') |
continue; |
continue; |
if ((key = sshkey_new(KEY_UNSPEC)) == NULL) |
if ((key = sshkey_new(KEY_UNSPEC)) == NULL) |
fatal("key_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("%s:%lu: invalid key: %s", path, |
lnum, ssh_err(r)); |
lnum, ssh_err(r)); |
|
|
printf("%s:%lu:\n", path, lnum); |
printf("%s:%lu:\n", path, lnum); |
print_cert(key); |
print_cert(key); |
} |
} |
|
free(line); |
sshkey_free(key); |
sshkey_free(key); |
fclose(f); |
fclose(f); |
exit(ok ? 0 : 1); |
exit(ok ? 0 : 1); |
|
|
} |
} |
|
|
static void |
static void |
|
hash_to_blob(const char *cp, u_char **blobp, size_t *lenp, |
|
const char *file, u_long lnum) |
|
{ |
|
char *tmp; |
|
size_t tlen; |
|
struct sshbuf *b; |
|
int r; |
|
|
|
if (strncmp(cp, "SHA256:", 7) != 0) |
|
fatal("%s:%lu: unsupported hash algorithm", file, lnum); |
|
cp += 7; |
|
|
|
/* |
|
* OpenSSH base64 hashes omit trailing '=' |
|
* characters; put them back for decode. |
|
*/ |
|
tlen = strlen(cp); |
|
tmp = xmalloc(tlen + 4 + 1); |
|
strlcpy(tmp, cp, tlen + 1); |
|
while ((tlen % 4) != 0) { |
|
tmp[tlen++] = '='; |
|
tmp[tlen] = '\0'; |
|
} |
|
if ((b = sshbuf_new()) == NULL) |
|
fatal("%s: sshbuf_new failed", __func__); |
|
if ((r = sshbuf_b64tod(b, tmp)) != 0) |
|
fatal("%s:%lu: decode hash failed: %s", file, lnum, ssh_err(r)); |
|
free(tmp); |
|
*lenp = sshbuf_len(b); |
|
*blobp = xmalloc(*lenp); |
|
memcpy(*blobp, sshbuf_ptr(b), *lenp); |
|
sshbuf_free(b); |
|
} |
|
|
|
static void |
update_krl_from_file(struct passwd *pw, const char *file, int wild_ca, |
update_krl_from_file(struct passwd *pw, const char *file, int wild_ca, |
const struct sshkey *ca, struct ssh_krl *krl) |
const struct sshkey *ca, struct ssh_krl *krl) |
{ |
{ |
struct sshkey *key = NULL; |
struct sshkey *key = NULL; |
u_long lnum = 0; |
u_long lnum = 0; |
char *path, *cp, *ep, line[SSH_MAX_PUBKEY_BYTES]; |
char *path, *cp, *ep, *line = NULL; |
|
u_char *blob = NULL; |
|
size_t blen = 0, linesize = 0; |
unsigned long long serial, serial2; |
unsigned long long serial, serial2; |
int i, was_explicit_key, was_sha1, r; |
int i, was_explicit_key, was_sha1, was_sha256, was_hash, r; |
FILE *krl_spec; |
FILE *krl_spec; |
|
|
path = tilde_expand_filename(file, pw->pw_uid); |
path = tilde_expand_filename(file, pw->pw_uid); |
|
|
|
|
if (!quiet) |
if (!quiet) |
printf("Revoking from %s\n", path); |
printf("Revoking from %s\n", path); |
while (read_keyfile_line(krl_spec, path, line, sizeof(line), |
while (getline(&line, &linesize, krl_spec) != -1) { |
&lnum) == 0) { |
lnum++; |
was_explicit_key = was_sha1 = 0; |
was_explicit_key = was_sha1 = was_sha256 = was_hash = 0; |
cp = line + strspn(line, " \t"); |
cp = line + strspn(line, " \t"); |
/* Trim trailing space, comments and strip \n */ |
/* Trim trailing space, comments and strip \n */ |
for (i = 0, r = -1; cp[i] != '\0'; i++) { |
for (i = 0, r = -1; cp[i] != '\0'; i++) { |
|
|
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("%s: revoke key ID failed", __func__); |
|
} else if (strncasecmp(cp, "hash:", 5) == 0) { |
|
cp += 5; |
|
cp = cp + strspn(cp, " \t"); |
|
hash_to_blob(cp, &blob, &blen, file, lnum); |
|
r = ssh_krl_revoke_key_sha256(krl, blob, blen); |
} else { |
} else { |
if (strncasecmp(cp, "key:", 4) == 0) { |
if (strncasecmp(cp, "key:", 4) == 0) { |
cp += 4; |
cp += 4; |
|
|
cp += 5; |
cp += 5; |
cp = cp + strspn(cp, " \t"); |
cp = cp + strspn(cp, " \t"); |
was_sha1 = 1; |
was_sha1 = 1; |
} else { |
} else if (strncasecmp(cp, "sha256:", 7) == 0) { |
|
cp += 7; |
|
cp = cp + strspn(cp, " \t"); |
|
was_sha256 = 1; |
/* |
/* |
* Just try to process the line as a key. |
* Just try to process the line as a key. |
* Parsing will fail if it isn't. |
* Parsing will fail if it isn't. |
*/ |
*/ |
} |
} |
if ((key = sshkey_new(KEY_UNSPEC)) == NULL) |
if ((key = sshkey_new(KEY_UNSPEC)) == NULL) |
fatal("key_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("%s:%lu: invalid key: %s", |
path, lnum, ssh_err(r)); |
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) { |
r = ssh_krl_revoke_key_sha1(krl, key); |
if (sshkey_fingerprint_raw(key, |
else |
SSH_DIGEST_SHA1, &blob, &blen) != 0) { |
|
fatal("%s:%lu: fingerprint failed", |
|
file, lnum); |
|
} |
|
r = ssh_krl_revoke_key_sha1(krl, blob, blen); |
|
} else if (was_sha256) { |
|
if (sshkey_fingerprint_raw(key, |
|
SSH_DIGEST_SHA256, &blob, &blen) != 0) { |
|
fatal("%s:%lu: fingerprint failed", |
|
file, lnum); |
|
} |
|
r = ssh_krl_revoke_key_sha256(krl, blob, blen); |
|
} 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("%s: revoke key failed: %s", |
__func__, ssh_err(r)); |
__func__, ssh_err(r)); |
|
freezero(blob, blen); |
|
blob = NULL; |
|
blen = 0; |
sshkey_free(key); |
sshkey_free(key); |
} |
} |
} |
} |
if (strcmp(path, "-") != 0) |
if (strcmp(path, "-") != 0) |
fclose(krl_spec); |
fclose(krl_spec); |
|
free(line); |
free(path); |
free(path); |
} |
} |
|
|
static void |
static void |
do_gen_krl(struct passwd *pw, int updating, int argc, char **argv) |
do_gen_krl(struct passwd *pw, int updating, const char *ca_key_path, |
|
unsigned long long krl_version, const char *krl_comment, |
|
int argc, char **argv) |
{ |
{ |
struct ssh_krl *krl; |
struct ssh_krl *krl; |
struct stat sb; |
struct stat sb; |
|
|
else if ((krl = ssh_krl_init()) == NULL) |
else if ((krl = ssh_krl_init()) == NULL) |
fatal("couldn't create KRL"); |
fatal("couldn't create KRL"); |
|
|
if (cert_serial != 0) |
if (krl_version != 0) |
ssh_krl_set_version(krl, cert_serial); |
ssh_krl_set_version(krl, krl_version); |
if (identity_comment != NULL) |
if (krl_comment != NULL) |
ssh_krl_set_comment(krl, identity_comment); |
ssh_krl_set_comment(krl, krl_comment); |
|
|
for (i = 0; i < argc; i++) |
for (i = 0; i < argc; i++) |
update_krl_from_file(pw, argv[i], wild_ca, ca, krl); |
update_krl_from_file(pw, argv[i], wild_ca, ca, krl); |
|
|
fatal("Couldn't generate KRL"); |
fatal("Couldn't generate KRL"); |
if ((fd = open(identity_file, O_WRONLY|O_CREAT|O_TRUNC, 0644)) == -1) |
if ((fd = open(identity_file, O_WRONLY|O_CREAT|O_TRUNC, 0644)) == -1) |
fatal("open %s: %s", identity_file, strerror(errno)); |
fatal("open %s: %s", identity_file, strerror(errno)); |
if (atomicio(vwrite, fd, (void *)sshbuf_ptr(kbuf), sshbuf_len(kbuf)) != |
if (atomicio(vwrite, fd, sshbuf_mutable_ptr(kbuf), sshbuf_len(kbuf)) != |
sshbuf_len(kbuf)) |
sshbuf_len(kbuf)) |
fatal("write %s: %s", identity_file, strerror(errno)); |
fatal("write %s: %s", identity_file, strerror(errno)); |
close(fd); |
close(fd); |
sshbuf_free(kbuf); |
sshbuf_free(kbuf); |
ssh_krl_free(krl); |
ssh_krl_free(krl); |
if (ca != NULL) |
sshkey_free(ca); |
sshkey_free(ca); |
|
} |
} |
|
|
static void |
static void |
|
|
} |
} |
#endif |
#endif |
|
|
|
static struct sshkey * |
|
load_sign_key(const char *keypath, const struct sshkey *pubkey) |
|
{ |
|
size_t i, slen, plen = strlen(keypath); |
|
char *privpath = xstrdup(keypath); |
|
const char *suffixes[] = { "-cert.pub", ".pub", NULL }; |
|
struct sshkey *ret = NULL, *privkey = NULL; |
|
int r; |
|
|
|
/* |
|
* If passed a public key filename, then try to locate the correponding |
|
* private key. This lets us specify certificates on the command-line |
|
* and have ssh-keygen find the appropriate private key. |
|
*/ |
|
for (i = 0; suffixes[i]; i++) { |
|
slen = strlen(suffixes[i]); |
|
if (plen <= slen || |
|
strcmp(privpath + plen - slen, suffixes[i]) != 0) |
|
continue; |
|
privpath[plen - slen] = '\0'; |
|
debug("%s: %s looks like a public key, using private key " |
|
"path %s instead", __func__, keypath, privpath); |
|
} |
|
if ((privkey = load_identity(privpath, NULL)) == NULL) { |
|
error("Couldn't load identity %s", keypath); |
|
goto done; |
|
} |
|
if (!sshkey_equal_public(pubkey, privkey)) { |
|
error("Public key %s doesn't match private %s", |
|
keypath, privpath); |
|
goto done; |
|
} |
|
if (sshkey_is_cert(pubkey) && !sshkey_is_cert(privkey)) { |
|
/* |
|
* Graft the certificate onto the private key to make |
|
* it capable of signing. |
|
*/ |
|
if ((r = sshkey_to_certified(privkey)) != 0) { |
|
error("%s: sshkey_to_certified: %s", __func__, |
|
ssh_err(r)); |
|
goto done; |
|
} |
|
if ((r = sshkey_cert_copy(pubkey, privkey)) != 0) { |
|
error("%s: sshkey_cert_copy: %s", __func__, ssh_err(r)); |
|
goto done; |
|
} |
|
} |
|
/* success */ |
|
ret = privkey; |
|
privkey = NULL; |
|
done: |
|
sshkey_free(privkey); |
|
free(privpath); |
|
return ret; |
|
} |
|
|
|
static int |
|
sign_one(struct sshkey *signkey, const char *filename, int fd, |
|
const char *sig_namespace, sshsig_signer *signer, void *signer_ctx) |
|
{ |
|
struct sshbuf *sigbuf = NULL, *abuf = NULL; |
|
int r = SSH_ERR_INTERNAL_ERROR, wfd = -1, oerrno; |
|
char *wfile = NULL; |
|
char *asig = NULL; |
|
|
|
if (!quiet) { |
|
if (fd == STDIN_FILENO) |
|
fprintf(stderr, "Signing data on standard input\n"); |
|
else |
|
fprintf(stderr, "Signing file %s\n", filename); |
|
} |
|
if ((r = sshsig_sign_fd(signkey, NULL, fd, sig_namespace, |
|
&sigbuf, signer, signer_ctx)) != 0) { |
|
error("Signing %s failed: %s", filename, ssh_err(r)); |
|
goto out; |
|
} |
|
if ((r = sshsig_armor(sigbuf, &abuf)) != 0) { |
|
error("%s: sshsig_armor: %s", __func__, ssh_err(r)); |
|
goto out; |
|
} |
|
if ((asig = sshbuf_dup_string(abuf)) == NULL) { |
|
error("%s: buffer error", __func__); |
|
r = SSH_ERR_ALLOC_FAIL; |
|
goto out; |
|
} |
|
|
|
if (fd == STDIN_FILENO) { |
|
fputs(asig, stdout); |
|
fflush(stdout); |
|
} else { |
|
xasprintf(&wfile, "%s.sig", filename); |
|
if (confirm_overwrite(wfile)) { |
|
if ((wfd = open(wfile, O_WRONLY|O_CREAT|O_TRUNC, |
|
0666)) == -1) { |
|
oerrno = errno; |
|
error("Cannot open %s: %s", |
|
wfile, strerror(errno)); |
|
errno = oerrno; |
|
r = SSH_ERR_SYSTEM_ERROR; |
|
goto out; |
|
} |
|
if (atomicio(vwrite, wfd, asig, |
|
strlen(asig)) != strlen(asig)) { |
|
oerrno = errno; |
|
error("Cannot write to %s: %s", |
|
wfile, strerror(errno)); |
|
errno = oerrno; |
|
r = SSH_ERR_SYSTEM_ERROR; |
|
goto out; |
|
} |
|
if (!quiet) { |
|
fprintf(stderr, "Write signature to %s\n", |
|
wfile); |
|
} |
|
} |
|
} |
|
/* success */ |
|
r = 0; |
|
out: |
|
free(wfile); |
|
free(asig); |
|
sshbuf_free(abuf); |
|
sshbuf_free(sigbuf); |
|
if (wfd != -1) |
|
close(wfd); |
|
return r; |
|
} |
|
|
|
static int |
|
sign(const char *keypath, const char *sig_namespace, int argc, char **argv) |
|
{ |
|
int i, fd = -1, r, ret = -1; |
|
int agent_fd = -1; |
|
struct sshkey *pubkey = NULL, *privkey = NULL, *signkey = NULL; |
|
sshsig_signer *signer = NULL; |
|
|
|
/* Check file arguments. */ |
|
for (i = 0; i < argc; i++) { |
|
if (strcmp(argv[i], "-") != 0) |
|
continue; |
|
if (i > 0 || argc > 1) |
|
fatal("Cannot sign mix of paths and standard input"); |
|
} |
|
|
|
if ((r = sshkey_load_public(keypath, &pubkey, NULL)) != 0) { |
|
error("Couldn't load public key %s: %s", keypath, ssh_err(r)); |
|
goto done; |
|
} |
|
|
|
if ((r = ssh_get_authentication_socket(&agent_fd)) != 0) |
|
debug("Couldn't get agent socket: %s", ssh_err(r)); |
|
else { |
|
if ((r = ssh_agent_has_key(agent_fd, pubkey)) == 0) |
|
signer = agent_signer; |
|
else |
|
debug("Couldn't find key in agent: %s", ssh_err(r)); |
|
} |
|
|
|
if (signer == NULL) { |
|
/* Not using agent - try to load private key */ |
|
if ((privkey = load_sign_key(keypath, pubkey)) == NULL) |
|
goto done; |
|
signkey = privkey; |
|
} else { |
|
/* Will use key in agent */ |
|
signkey = pubkey; |
|
} |
|
|
|
if (argc == 0) { |
|
if ((r = sign_one(signkey, "(stdin)", STDIN_FILENO, |
|
sig_namespace, signer, &agent_fd)) != 0) |
|
goto done; |
|
} else { |
|
for (i = 0; i < argc; i++) { |
|
if (strcmp(argv[i], "-") == 0) |
|
fd = STDIN_FILENO; |
|
else if ((fd = open(argv[i], O_RDONLY)) == -1) { |
|
error("Cannot open %s for signing: %s", |
|
argv[i], strerror(errno)); |
|
goto done; |
|
} |
|
if ((r = sign_one(signkey, argv[i], fd, sig_namespace, |
|
signer, &agent_fd)) != 0) |
|
goto done; |
|
if (fd != STDIN_FILENO) |
|
close(fd); |
|
fd = -1; |
|
} |
|
} |
|
|
|
ret = 0; |
|
done: |
|
if (fd != -1 && fd != STDIN_FILENO) |
|
close(fd); |
|
sshkey_free(pubkey); |
|
sshkey_free(privkey); |
|
return ret; |
|
} |
|
|
|
static int |
|
verify(const char *signature, const char *sig_namespace, const char *principal, |
|
const char *allowed_keys, const char *revoked_keys) |
|
{ |
|
int r, ret = -1, sigfd = -1; |
|
struct sshbuf *sigbuf = NULL, *abuf = NULL; |
|
struct sshkey *sign_key = NULL; |
|
char *fp = NULL; |
|
|
|
if ((abuf = sshbuf_new()) == NULL) |
|
fatal("%s: sshbuf_new() failed", __func__); |
|
|
|
if ((sigfd = open(signature, O_RDONLY)) < 0) { |
|
error("Couldn't open signature file %s", signature); |
|
goto done; |
|
} |
|
|
|
if ((r = sshkey_load_file(sigfd, abuf)) != 0) { |
|
error("Couldn't read signature file: %s", ssh_err(r)); |
|
goto done; |
|
} |
|
if ((r = sshsig_dearmor(abuf, &sigbuf)) != 0) { |
|
error("%s: sshsig_armor: %s", __func__, ssh_err(r)); |
|
return r; |
|
} |
|
if ((r = sshsig_verify_fd(sigbuf, STDIN_FILENO, sig_namespace, |
|
&sign_key)) != 0) |
|
goto done; /* sshsig_verify() prints error */ |
|
|
|
if ((fp = sshkey_fingerprint(sign_key, fingerprint_hash, |
|
SSH_FP_DEFAULT)) == NULL) |
|
fatal("%s: sshkey_fingerprint failed", __func__); |
|
debug("Valid (unverified) signature from key %s", fp); |
|
free(fp); |
|
fp = NULL; |
|
|
|
if (revoked_keys != NULL) { |
|
if ((r = sshkey_check_revoked(sign_key, revoked_keys)) != 0) { |
|
debug3("sshkey_check_revoked failed: %s", ssh_err(r)); |
|
goto done; |
|
} |
|
} |
|
|
|
if (allowed_keys != NULL && |
|
(r = sshsig_check_allowed_keys(allowed_keys, sign_key, |
|
principal, sig_namespace)) != 0) { |
|
debug3("sshsig_check_allowed_keys failed: %s", ssh_err(r)); |
|
goto done; |
|
} |
|
/* success */ |
|
ret = 0; |
|
done: |
|
if (!quiet) { |
|
if (ret == 0) { |
|
if ((fp = sshkey_fingerprint(sign_key, fingerprint_hash, |
|
SSH_FP_DEFAULT)) == NULL) { |
|
fatal("%s: sshkey_fingerprint failed", |
|
__func__); |
|
} |
|
if (principal == NULL) { |
|
printf("Good \"%s\" signature with %s key %s\n", |
|
sig_namespace, sshkey_type(sign_key), fp); |
|
|
|
} else { |
|
printf("Good \"%s\" signature for %s with %s key %s\n", |
|
sig_namespace, principal, |
|
sshkey_type(sign_key), fp); |
|
} |
|
} else { |
|
printf("Could not verify signature.\n"); |
|
} |
|
} |
|
if (sigfd != -1) |
|
close(sigfd); |
|
sshbuf_free(sigbuf); |
|
sshbuf_free(abuf); |
|
sshkey_free(sign_key); |
|
free(fp); |
|
return ret; |
|
} |
|
|
static void |
static void |
usage(void) |
usage(void) |
{ |
{ |
fprintf(stderr, |
fprintf(stderr, |
"usage: ssh-keygen [-q] [-b bits] [-t dsa | ecdsa | ed25519 | rsa | rsa1]\n" |
"usage: ssh-keygen [-q] [-b bits] [-t dsa | ecdsa | ed25519 | rsa] [-m format]\n" |
" [-N new_passphrase] [-C comment] [-f output_keyfile]\n" |
" [-N new_passphrase] [-C comment] [-f output_keyfile]\n" |
" ssh-keygen -p [-P old_passphrase] [-N new_passphrase] [-f keyfile]\n" |
" ssh-keygen -p [-P old_passphrase] [-N new_passphrase] [-m format]\n" |
|
" [-f keyfile]\n" |
" ssh-keygen -i [-m key_format] [-f input_keyfile]\n" |
" ssh-keygen -i [-m key_format] [-f input_keyfile]\n" |
" ssh-keygen -e [-m key_format] [-f input_keyfile]\n" |
" ssh-keygen -e [-m key_format] [-f input_keyfile]\n" |
" ssh-keygen -y [-f input_keyfile]\n" |
" ssh-keygen -y [-f input_keyfile]\n" |
|
|
" ssh-keygen -D pkcs11\n"); |
" ssh-keygen -D pkcs11\n"); |
#endif |
#endif |
fprintf(stderr, |
fprintf(stderr, |
" ssh-keygen -F hostname [-f known_hosts_file] [-l]\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 -R hostname [-f known_hosts_file]\n" |
" ssh-keygen -R hostname [-f known_hosts_file]\n" |
" ssh-keygen -r hostname [-f input_keyfile] [-g]\n" |
" ssh-keygen -r hostname [-g] [-f input_keyfile]\n" |
#ifdef WITH_OPENSSL |
#ifdef WITH_OPENSSL |
" ssh-keygen -G output_file [-v] [-b bits] [-M memory] [-S start_point]\n" |
" ssh-keygen -G output_file [-v] [-b bits] [-M memory] [-S start_point]\n" |
" ssh-keygen -T output_file -f input_file [-v] [-a rounds] [-J num_lines]\n" |
" ssh-keygen -T output_file -f input_file [-v] [-a rounds] [-J num_lines]\n" |
" [-j start_line] [-K checkpt] [-W generator]\n" |
" [-j start_line] [-K checkpt] [-W generator]\n" |
#endif |
#endif |
" ssh-keygen -s ca_key -I certificate_identity [-h] [-n principals]\n" |
" ssh-keygen -s ca_key -I certificate_identity [-hU]\n" |
" [-O option] [-V validity_interval] [-z serial_number] file ...\n" |
" [-D pkcs11_provider] [-n principals] [-O option]\n" |
|
" [-V validity_interval] [-z serial_number] file ...\n" |
" ssh-keygen -L [-f input_keyfile]\n" |
" ssh-keygen -L [-f input_keyfile]\n" |
" ssh-keygen -A\n" |
" ssh-keygen -A\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 -f krl_file file ...\n"); |
" ssh-keygen -Q -f krl_file file ...\n" |
|
" ssh-keygen -Y sign -f sign_key -n namespace\n" |
|
" ssh-keygen -Y verify -I signer_identity -s signature_file\n" |
|
" -n namespace -f allowed_keys [-r revoked_keys]\n" |
|
" ssh-keygen -Y check-novalidate -s signature_file -n namespace\n"); |
exit(1); |
exit(1); |
} |
} |
|
|
|
|
struct passwd *pw; |
struct passwd *pw; |
struct stat st; |
struct stat st; |
int r, opt, type, fd; |
int r, opt, type, fd; |
|
int change_passphrase = 0, change_comment = 0, show_cert = 0; |
|
int find_host = 0, delete_host = 0, hash_hosts = 0; |
int gen_all_hostkeys = 0, gen_krl = 0, update_krl = 0, check_krl = 0; |
int gen_all_hostkeys = 0, gen_krl = 0, update_krl = 0, check_krl = 0; |
|
int prefer_agent = 0, convert_to = 0, convert_from = 0; |
|
int print_public = 0, print_generic = 0, cert_serial_autoinc = 0; |
|
unsigned long long cert_serial = 0; |
|
char *identity_comment = NULL, *ca_key_path = NULL; |
|
u_int32_t bits = 0; |
FILE *f; |
FILE *f; |
const char *errstr; |
const char *errstr; |
|
int log_level = SYSLOG_LEVEL_INFO; |
|
char *sign_op = NULL; |
#ifdef WITH_OPENSSL |
#ifdef WITH_OPENSSL |
/* Moduli generation/screening */ |
/* Moduli generation/screening */ |
char out_file[PATH_MAX], *checkpoint = NULL; |
char out_file[PATH_MAX], *checkpoint = NULL; |
|
|
/* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */ |
/* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */ |
sanitise_stdfd(); |
sanitise_stdfd(); |
|
|
|
#ifdef WITH_OPENSSL |
OpenSSL_add_all_algorithms(); |
OpenSSL_add_all_algorithms(); |
|
#endif |
log_init(argv[0], SYSLOG_LEVEL_INFO, SYSLOG_FACILITY_USER, 1); |
log_init(argv[0], SYSLOG_LEVEL_INFO, SYSLOG_FACILITY_USER, 1); |
|
|
|
setlocale(LC_CTYPE, ""); |
|
|
/* we need this for the home * directory. */ |
/* we need this for the home * directory. */ |
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()); |
if (gethostname(hostname, sizeof(hostname)) < 0) |
if (gethostname(hostname, sizeof(hostname)) == -1) |
fatal("gethostname: %s", strerror(errno)); |
fatal("gethostname: %s", strerror(errno)); |
|
|
/* Remaining characters: UYdw */ |
/* Remaining characters: dw */ |
while ((opt = getopt(argc, argv, "ABHLQXceghiklopquvxy" |
while ((opt = getopt(argc, argv, "ABHLQUXceghiklopquvxy" |
"C:D:E:F:G:I:J:K:M:N:O:P:R:S:T:V:W:Z:" |
"C:D:E:F:G:I:J:K:M:N:O:P:R:S:T:V:W:Y:Z:" |
"a:b:f:g:j:m:n:r:s:t:z:")) != -1) { |
"a:b:f:g:j:m:n:r:s:t:z:")) != -1) { |
switch (opt) { |
switch (opt) { |
case 'A': |
case 'A': |
gen_all_hostkeys = 1; |
gen_all_hostkeys = 1; |
break; |
break; |
case 'b': |
case 'b': |
bits = (u_int32_t)strtonum(optarg, 256, 32768, &errstr); |
bits = (u_int32_t)strtonum(optarg, 1, UINT32_MAX, |
|
&errstr); |
if (errstr) |
if (errstr) |
fatal("Bits has bad value %s (%s)", |
fatal("Bits has bad value %s (%s)", |
optarg, errstr); |
optarg, errstr); |
|
|
} |
} |
if (strcasecmp(optarg, "PKCS8") == 0) { |
if (strcasecmp(optarg, "PKCS8") == 0) { |
convert_format = FMT_PKCS8; |
convert_format = FMT_PKCS8; |
|
private_key_format = SSHKEY_PRIVATE_PKCS8; |
break; |
break; |
} |
} |
if (strcasecmp(optarg, "PEM") == 0) { |
if (strcasecmp(optarg, "PEM") == 0) { |
convert_format = FMT_PEM; |
convert_format = FMT_PEM; |
|
private_key_format = SSHKEY_PRIVATE_PEM; |
break; |
break; |
} |
} |
fatal("Unsupported conversion format \"%s\"", optarg); |
fatal("Unsupported conversion format \"%s\"", optarg); |
|
|
cert_principals = optarg; |
cert_principals = optarg; |
break; |
break; |
case 'o': |
case 'o': |
use_new_format = 1; |
/* no-op; new format is already the default */ |
break; |
break; |
case 'p': |
case 'p': |
change_passphrase = 1; |
change_passphrase = 1; |
|
|
add_cert_option(optarg); |
add_cert_option(optarg); |
break; |
break; |
case 'Z': |
case 'Z': |
new_format_cipher = optarg; |
openssh_format_cipher = optarg; |
break; |
break; |
case 'C': |
case 'C': |
identity_comment = optarg; |
identity_comment = optarg; |
|
|
case 'D': |
case 'D': |
pkcs11provider = optarg; |
pkcs11provider = optarg; |
break; |
break; |
|
case 'U': |
|
prefer_agent = 1; |
|
break; |
case 'u': |
case 'u': |
update_krl = 1; |
update_krl = 1; |
break; |
break; |
|
|
case 'V': |
case 'V': |
parse_cert_times(optarg); |
parse_cert_times(optarg); |
break; |
break; |
|
case 'Y': |
|
sign_op = optarg; |
|
break; |
case 'z': |
case 'z': |
errno = 0; |
errno = 0; |
|
if (*optarg == '+') { |
|
cert_serial_autoinc = 1; |
|
optarg++; |
|
} |
cert_serial = strtoull(optarg, &ep, 10); |
cert_serial = strtoull(optarg, &ep, 10); |
if (*optarg < '0' || *optarg > '9' || *ep != '\0' || |
if (*optarg < '0' || *optarg > '9' || *ep != '\0' || |
(errno == ERANGE && cert_serial == ULLONG_MAX)) |
(errno == ERANGE && cert_serial == ULLONG_MAX)) |
|
|
break; |
break; |
case 'J': |
case 'J': |
lines_to_process = strtoul(optarg, NULL, 10); |
lines_to_process = strtoul(optarg, NULL, 10); |
break; |
break; |
case 'j': |
case 'j': |
start_lineno = strtoul(optarg, NULL, 10); |
start_lineno = strtoul(optarg, NULL, 10); |
break; |
break; |
case 'K': |
case 'K': |
if (strlen(optarg) >= PATH_MAX) |
if (strlen(optarg) >= PATH_MAX) |
fatal("Checkpoint filename too long"); |
fatal("Checkpoint filename too long"); |
|
|
argv += optind; |
argv += optind; |
argc -= optind; |
argc -= optind; |
|
|
|
if (sign_op != NULL) { |
|
if (cert_principals == NULL) { |
|
error("Too few arguments for sign/verify: " |
|
"missing namespace"); |
|
exit(1); |
|
} |
|
if (strncmp(sign_op, "sign", 4) == 0) { |
|
if (!have_identity) { |
|
error("Too few arguments for sign: " |
|
"missing key"); |
|
exit(1); |
|
} |
|
return sign(identity_file, cert_principals, argc, argv); |
|
} else if (strncmp(sign_op, "check-novalidate", 16) == 0) { |
|
if (ca_key_path == NULL) { |
|
error("Too few arguments for check-novalidate: " |
|
"missing signature file"); |
|
exit(1); |
|
} |
|
return verify(ca_key_path, cert_principals, |
|
NULL, NULL, NULL); |
|
} else if (strncmp(sign_op, "verify", 6) == 0) { |
|
if (ca_key_path == NULL) { |
|
error("Too few arguments for verify: " |
|
"missing signature file"); |
|
exit(1); |
|
} |
|
if (!have_identity) { |
|
error("Too few arguments for sign: " |
|
"missing allowed keys file"); |
|
exit(1); |
|
} |
|
if (cert_key_id == NULL) { |
|
error("Too few arguments for verify: " |
|
"missing principal ID"); |
|
exit(1); |
|
} |
|
return verify(ca_key_path, cert_principals, |
|
cert_key_id, identity_file, rr_hostname); |
|
} |
|
usage(); |
|
/* NOTREACHED */ |
|
} |
|
|
if (ca_key_path != NULL) { |
if (ca_key_path != NULL) { |
if (argc < 1 && !gen_krl) { |
if (argc < 1 && !gen_krl) { |
error("Too few arguments."); |
error("Too few arguments."); |
|
|
} |
} |
#ifdef WITH_OPENSSL |
#ifdef WITH_OPENSSL |
if (gen_krl) { |
if (gen_krl) { |
do_gen_krl(pw, update_krl, argc, argv); |
do_gen_krl(pw, update_krl, ca_key_path, |
|
cert_serial, identity_comment, argc, argv); |
return (0); |
return (0); |
} |
} |
if (check_krl) { |
if (check_krl) { |
|
|
if (ca_key_path != NULL) { |
if (ca_key_path != NULL) { |
if (cert_key_id == NULL) |
if (cert_key_id == NULL) |
fatal("Must specify key id (-I) when certifying"); |
fatal("Must specify key id (-I) when certifying"); |
do_ca_sign(pw, argc, argv); |
do_ca_sign(pw, ca_key_path, prefer_agent, |
|
cert_serial, cert_serial_autoinc, argc, argv); |
} |
} |
if (show_cert) |
if (show_cert) |
do_show_cert(pw); |
do_show_cert(pw); |
if (delete_host || hash_hosts || find_host) |
if (delete_host || hash_hosts || find_host) { |
do_known_hosts(pw, rr_hostname); |
do_known_hosts(pw, rr_hostname, find_host, |
|
delete_host, hash_hosts); |
|
} |
if (pkcs11provider != NULL) |
if (pkcs11provider != NULL) |
do_download(pw); |
do_download(pw); |
if (print_fingerprint || print_bubblebabble) |
if (print_fingerprint || print_bubblebabble) |
|
|
if (change_passphrase) |
if (change_passphrase) |
do_change_passphrase(pw); |
do_change_passphrase(pw); |
if (change_comment) |
if (change_comment) |
do_change_comment(pw); |
do_change_comment(pw, identity_comment); |
#ifdef WITH_OPENSSL |
#ifdef WITH_OPENSSL |
if (convert_to) |
if (convert_to) |
do_convert_to(pw); |
do_convert_to(pw); |
if (convert_from) |
if (convert_from) |
do_convert_from(pw); |
do_convert_from(pw); |
#endif |
#else /* WITH_OPENSSL */ |
|
if (convert_to || convert_from) |
|
fatal("key conversion disabled at compile time"); |
|
#endif /* WITH_OPENSSL */ |
if (print_public) |
if (print_public) |
do_print_public(pw); |
do_print_public(pw); |
if (rr_hostname != NULL) { |
if (rr_hostname != NULL) { |
unsigned int n = 0; |
unsigned int n = 0; |
|
|
if (have_identity) { |
if (have_identity) { |
n = do_print_resource_record(pw, |
n = do_print_resource_record(pw, identity_file, |
identity_file, rr_hostname); |
rr_hostname, print_generic); |
if (n == 0) |
if (n == 0) |
fatal("%s: %s", identity_file, strerror(errno)); |
fatal("%s: %s", identity_file, strerror(errno)); |
exit(0); |
exit(0); |
} else { |
} else { |
|
|
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); |
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); |
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); |
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); |
|
n += do_print_resource_record(pw, |
|
_PATH_HOST_XMSS_KEY_FILE, rr_hostname, |
|
print_generic); |
if (n == 0) |
if (n == 0) |
fatal("no keys found."); |
fatal("no keys found."); |
exit(0); |
exit(0); |
|
|
printf("Generating public/private %s key pair.\n", |
printf("Generating public/private %s key pair.\n", |
key_type_name); |
key_type_name); |
if ((r = sshkey_generate(type, bits, &private)) != 0) |
if ((r = sshkey_generate(type, bits, &private)) != 0) |
fatal("key_generate failed"); |
fatal("sshkey_generate failed"); |
if ((r = sshkey_from_private(private, &public)) != 0) |
if ((r = sshkey_from_private(private, &public)) != 0) |
fatal("key_from_private failed: %s\n", ssh_err(r)); |
fatal("sshkey_from_private failed: %s\n", ssh_err(r)); |
|
|
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"); |
|
|
snprintf(dotsshdir, sizeof dotsshdir, "%s/%s", |
snprintf(dotsshdir, sizeof dotsshdir, "%s/%s", |
pw->pw_dir, _PATH_SSH_USER_DIR); |
pw->pw_dir, _PATH_SSH_USER_DIR); |
if (strstr(identity_file, dotsshdir) != NULL) { |
if (strstr(identity_file, dotsshdir) != NULL) { |
if (stat(dotsshdir, &st) < 0) { |
if (stat(dotsshdir, &st) == -1) { |
if (errno != ENOENT) { |
if (errno != ENOENT) { |
error("Could not stat %s: %s", dotsshdir, |
error("Could not stat %s: %s", dotsshdir, |
strerror(errno)); |
strerror(errno)); |
} else if (mkdir(dotsshdir, 0700) < 0) { |
} else if (mkdir(dotsshdir, 0700) == -1) { |
error("Could not create directory '%s': %s", |
error("Could not create directory '%s': %s", |
dotsshdir, strerror(errno)); |
dotsshdir, strerror(errno)); |
} else if (!quiet) |
} else if (!quiet) |
|
|
} |
} |
} |
} |
/* If the file already exists, ask the user to confirm. */ |
/* If the file already exists, ask the user to confirm. */ |
if (stat(identity_file, &st) >= 0) { |
if (!confirm_overwrite(identity_file)) |
char yesno[3]; |
exit(1); |
printf("%s already exists.\n", identity_file); |
|
printf("Overwrite (y/n)? "); |
|
fflush(stdout); |
|
if (fgets(yesno, sizeof(yesno), stdin) == NULL) |
|
exit(1); |
|
if (yesno[0] != 'y' && yesno[0] != 'Y') |
|
exit(1); |
|
} |
|
/* Ask for a passphrase (twice). */ |
/* Ask for a passphrase (twice). */ |
if (identity_passphrase) |
if (identity_passphrase) |
passphrase1 = xstrdup(identity_passphrase); |
passphrase1 = xstrdup(identity_passphrase); |
|
|
|
|
/* 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, passphrase1, |
if ((r = sshkey_save_private(private, identity_file, passphrase1, |
comment, use_new_format, new_format_cipher, rounds)) != 0) { |
comment, private_key_format, openssh_format_cipher, rounds)) != 0) { |
error("Saving key \"%s\" failed: %s", |
error("Saving key \"%s\" failed: %s", |
identity_file, ssh_err(r)); |
identity_file, ssh_err(r)); |
explicit_bzero(passphrase1, strlen(passphrase1)); |
explicit_bzero(passphrase1, strlen(passphrase1)); |
|
|
if ((r = sshkey_write(public, f)) != 0) |
if ((r = sshkey_write(public, f)) != 0) |
error("write key failed: %s", ssh_err(r)); |
error("write key failed: %s", ssh_err(r)); |
fprintf(f, " %s\n", comment); |
fprintf(f, " %s\n", comment); |
fclose(f); |
if (ferror(f) || fclose(f) != 0) |
|
fatal("write public failed: %s", strerror(errno)); |
|
|
if (!quiet) { |
if (!quiet) { |
fp = sshkey_fingerprint(public, fingerprint_hash, |
fp = sshkey_fingerprint(public, fingerprint_hash, |