src/usr.bin/ssh/ssh-keygen.c - diff

Return to ssh-keygen.c CVS log

Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/ssh-keygen.c between version 1.316 and 1.417

version 1.316, 2018/06/01 04:21:29

version 1.417, 2020/08/27 01:07:51

Line 16

#include <sys/socket.h>

#include <sys/stat.h>

#ifdef WITH_OPENSSL

#include <openssl/evp.h>

#include <openssl/pem.h>

#endif

#include <stdint.h>

#include <errno.h>

#include <fcntl.h>

#include <netdb.h>

Line 26

Line 29

#include <stdio.h>

#include <stdlib.h>

#include <string.h>

#include <stdarg.h>

#include <unistd.h>

#include <limits.h>

#include <locale.h>

Line 33

Line 37

#include "xmalloc.h"

#include "sshkey.h"

#include "authfile.h"

#include "uuencode.h"

#include "sshbuf.h"

#include "pathnames.h"

#include "log.h"

Line 49

Line 52

#include "digest.h"

#include "utf8.h"

#include "authfd.h"

#include "sshsig.h"

#include "ssh-sk.h"

#include "sk-api.h" /* XXX for SSH_SK_USER_PRESENCE_REQD; remove */

#ifdef ENABLE_PKCS11

#include "ssh-pkcs11.h"

Line 60

Line 66

# define DEFAULT_KEY_TYPE_NAME "ed25519"

#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_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 */

int print_fingerprint = 0;

static int print_fingerprint = 0;

int print_bubblebabble = 0;

static int print_bubblebabble = 0;

/* 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. */

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. */

char *identity_passphrase = NULL;

static char *identity_passphrase = NULL;

/* 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;

/* Prefer to use agent keys for CA signing */

int prefer_agent = 0;

/* Certificate serial number */

unsigned long long cert_serial = 0;

/* 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 */

char *cert_key_id = NULL;

static char *cert_key_id = NULL;

/* Comma-separated list of principal names for certifying keys */

char *cert_principals = NULL;

static char *cert_principals = NULL;

/* 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 */

#define CERTOPT_X_FWD (1)

#define CERTOPT_AGENT_FWD (1<<1)

#define CERTOPT_PORT_FWD (1<<2)

#define CERTOPT_PTY (1<<3)

#define CERTOPT_USER_RC (1<<4)

#define CERTOPT_NO_REQUIRE_USER_PRESENCE (1<<5)

#define CERTOPT_DEFAULT (CERTOPT_X_FWD|CERTOPT_AGENT_FWD| \

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 {

struct cert_ext {

char *key;

char *val;

int crit;

};

struct cert_userext *cert_userext;

static struct cert_ext *cert_ext;

size_t ncert_userext;

static size_t ncert_ext;

/* Conversion to/from various formats */

int convert_to = 0;

int convert_from = 0;

enum {

FMT_RFC4716,

FMT_PKCS8,

FMT_PEM

} 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 */

char *pkcs11provider = NULL;

static char *pkcs11provider = NULL;

/* Use new OpenSSH private key format when writing SSH2 keys instead of PEM */

/* FIDO/U2F provider to use */

int use_new_format = 0;

static char *sk_provider = NULL;

/* Format for writing private keys */

static int private_key_format = SSHKEY_PRIVATE_OPENSSH;

/* 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 /

static int rounds = 0;

* number of primality trials when screening moduli.

int rounds = 0;

/* argv0 */

extern char *__progname;

char hostname[NI_MAXHOST];

static char hostname[NI_MAXHOST];

#ifdef WITH_OPENSSL

/* moduli.c */

Line 198

Line 174

static void

type_bits_valid(int type, const char *name, u_int32_t *bitsp)

{

#ifdef WITH_OPENSSL

u_int maxbits, nid;

#endif

if (type == KEY_UNSPEC)

fatal("unknown key type %s", key_type_name);

if (*bitsp == 0) {

#ifdef WITH_OPENSSL

if (type == KEY_DSA)

u_int nid;

switch(type) {

case KEY_DSA:

*bitsp = DEFAULT_BITS_DSA;

else if (type == KEY_ECDSA) {

break;

case KEY_ECDSA:

if (name != NULL &&

(nid = sshkey_ecdsa_nid_from_name(name)) > 0)

*bitsp = sshkey_curve_nid_to_bits(nid);

if (*bitsp == 0)

*bitsp = DEFAULT_BITS_ECDSA;

} else

break;

#endif

case KEY_RSA:

*bitsp = DEFAULT_BITS;

break;

}

#endif

}

#ifdef WITH_OPENSSL

maxbits = (type == KEY_DSA) ?

OPENSSL_DSA_MAX_MODULUS_BITS : OPENSSL_RSA_MAX_MODULUS_BITS;

if (*bitsp > maxbits)

fatal("key bits exceeds maximum %d", maxbits);

switch (type) {

case KEY_DSA:

if (*bitsp != 1024)

Line 232

Line 207

if (*bitsp < SSH_RSA_MINIMUM_MODULUS_SIZE)

fatal("Invalid RSA key length: minimum is %d bits",

SSH_RSA_MINIMUM_MODULUS_SIZE);

else if (*bitsp > OPENSSL_RSA_MAX_MODULUS_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)

Line 241

Line 219

#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

ask_filename(struct passwd *pw, const char *prompt)

{

Line 259

Line 261

case KEY_ECDSA:

name = _PATH_SSH_CLIENT_ID_ECDSA;

break;

case KEY_ECDSA_SK_CERT:

case KEY_ECDSA_SK:

name = _PATH_SSH_CLIENT_ID_ECDSA_SK;

break;

case KEY_RSA_CERT:

case KEY_RSA:

name = _PATH_SSH_CLIENT_ID_RSA;

Line 267

Line 273

case KEY_ED25519_CERT:

name = _PATH_SSH_CLIENT_ID_ED25519;

break;

case KEY_ED25519_SK:

case KEY_ED25519_SK_CERT:

name = _PATH_SSH_CLIENT_ID_ED25519_SK;

break;

case KEY_XMSS:

case KEY_XMSS_CERT:

name = _PATH_SSH_CLIENT_ID_XMSS;

Line 288

Line 298

}

static struct sshkey *

load_identity(char *filename)

load_identity(const char *filename, char **commentp)

{

char *pass;

struct sshkey *prv;

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;

if (r != SSH_ERR_KEY_WRONG_PASSPHRASE)

fatal("Load key \"%s\": %s", filename, ssh_err(r));

Line 302

Line 314

pass = xstrdup(identity_passphrase);

else

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));

freezero(pass, strlen(pass));

free(pass);

if (r != 0)

fatal("Load key \"%s\": %s", filename, ssh_err(r));

return prv;

Line 319

Line 330

static void

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;

if ((r = sshkey_to_blob(k, &blob, &len)) != 0)

if ((b = sshbuf_new()) == NULL)

fatal("%s: sshbuf_new failed", __func__);

if ((r = sshkey_putb(k, b)) != 0)

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) */

snprintf(comment, sizeof(comment),

"%u-bit %s, converted by %s@%s from OpenSSH",

sshkey_size(k), sshkey_type(k),

pw->pw_name, hostname);

sshkey_free(k);

sshbuf_free(b);

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);

sshkey_free(k);

free(b64);

free(blob);

exit(0);

}

Line 371

Line 387

if (!PEM_write_RSAPublicKey(stdout, k->rsa))

fatal("PEM_write_RSAPublicKey failed");

break;

case KEY_DSA:

if (!PEM_write_DSA_PUBKEY(stdout, k->dsa))

fatal("PEM_write_DSA_PUBKEY failed");

break;

case KEY_ECDSA:

if (!PEM_write_EC_PUBKEY(stdout, k->ecdsa))

fatal("PEM_write_EC_PUBKEY failed");

break;

default:

fatal("%s: unsupported key type %s", __func__, sshkey_type(k));

}

Line 386

Line 410

if (!have_identity)

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));

if ((r = sshkey_load_public(identity_file, &k, NULL)) != 0)

k = load_identity(identity_file);

k = load_identity(identity_file, NULL);

switch (convert_format) {

case FMT_RFC4716:

do_convert_to_ssh2(pw, k);

Line 429

Line 453

}

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;

char *type, *cipher;

u_char e1, e2, e3, *sig = NULL, data[] = "abcde12345";

Line 439

Line 462

u_int magic, i1, i2, i3, i4;

size_t slen;

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)

fatal("%s: buffer error: %s", __func__, ssh_err(r));

if (magic != SSH_COM_PRIVATE_KEY_MAGIC) {

error("bad magic 0x%x != 0x%x", magic,

SSH_COM_PRIVATE_KEY_MAGIC);

sshbuf_free(b);

return NULL;

}

if ((r = sshbuf_get_u32(b, &i1)) != 0 ||

Line 462

Line 486

if (strcmp(cipher, "none") != 0) {

error("unsupported cipher %s", cipher);

free(cipher);

sshbuf_free(b);

free(type);

return NULL;

}

Line 473

Line 496

} else if (strstr(type, "rsa")) {

ktype = KEY_RSA;

} else {

sshbuf_free(b);

free(type);

return NULL;

}

if ((key = sshkey_new_private(ktype)) == NULL)

if ((key = sshkey_new(ktype)) == NULL)

fatal("sshkey_new_private failed");

fatal("sshkey_new failed");

free(type);

switch (key->type) {

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;

case KEY_RSA:

if ((r = sshbuf_get_u8(b, &e1)) != 0 ||

Line 504

Line 538

e += e3;

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);

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 = ssh_rsa_generate_additional_parameters(key)) != 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));

BN_clear_free(rsa_iqmp);

break;

}

rlen = sshbuf_len(b);

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 */

if (sshkey_sign(key, &sig, &slen, data, sizeof(data), NULL, 0) != 0 ||

if (sshkey_sign(key, &sig, &slen, data, sizeof(data),

sshkey_verify(key, sig, slen, data, sizeof(data), NULL, 0) != 0) {

NULL, NULL, NULL, 0) != 0 ||

sshkey_verify(key, sig, slen, data, sizeof(data),

NULL, 0, NULL) != 0) {

sshkey_free(key);

free(sig);

return NULL;

Line 567

Line 616

int r, blen, escaped = 0;

u_int len;

char line[1024];

u_char blob[8096];

struct sshbuf *buf;

char encoded[8096];

FILE *fp;

if ((buf = sshbuf_new()) == NULL)

fatal("sshbuf_new failed");

if ((fp = fopen(identity_file, "r")) == NULL)

fatal("%s: %s: %s", __progname, identity_file, strerror(errno));

encoded[0] = '\0';

Line 600

Line 651

(encoded[len-2] == '=') &&

(encoded[len-3] == '='))

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)

if ((*k = do_convert_private_ssh2(buf)) == NULL)

*k = do_convert_private_ssh2_from_blob(blob, blen);

fatal("%s: private key conversion failed", __func__);

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));

sshbuf_free(buf);

fclose(fp);

}

Line 623

Line 675

identity_file);

}

fclose(fp);

switch (EVP_PKEY_type(pubkey->type)) {

switch (EVP_PKEY_base_id(pubkey)) {

case EVP_PKEY_RSA:

if ((*k = sshkey_new(KEY_UNSPEC)) == NULL)

fatal("sshkey_new failed");

Line 645

Line 697

break;

default:

fatal("%s: unsupported pubkey type %d", __func__,

EVP_PKEY_type(pubkey->type));

EVP_PKEY_base_id(pubkey));

}

EVP_PKEY_free(pubkey);

return;

Line 679

Line 731

if (!have_identity)

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));

switch (convert_format) {

Line 734

Line 786

struct sshkey *prv;

struct stat st;

int r;

char *comment = NULL;

if (!have_identity)

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));

prv = load_identity(identity_file);

prv = load_identity(identity_file, &comment);

if ((r = sshkey_write(prv, stdout)) != 0)

error("sshkey_write failed: %s", ssh_err(r));

sshkey_free(prv);

if (comment != NULL && *comment != '\0')

fprintf(stdout, " %s", comment);

fprintf(stdout, "\n");

free(comment);

exit(0);

}

Line 755

Line 811

int i, nkeys;

enum sshkey_fp_rep rep;

int fptype;

char *fp, *ra;

char *fp, *ra, **comments = NULL;

fptype = print_bubblebabble ? SSH_DIGEST_SHA1 : fingerprint_hash;

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, &comments);

if (nkeys <= 0)

fatal("cannot read public key from pkcs11");

for (i = 0; i < nkeys; i++) {

Line 773

Line 829

fatal("%s: sshkey_fingerprint fail", __func__);

printf("%u %s %s (PKCS11 key)\n", sshkey_size(keys[i]),

fp, sshkey_type(keys[i]));

if (log_level >= SYSLOG_LEVEL_VERBOSE)

if (log_level_get() >= SYSLOG_LEVEL_VERBOSE)

printf("%s\n", ra);

free(ra);

free(fp);

} else {

(void) sshkey_write(keys[i], stdout); /* XXX check */

fprintf(stdout, "\n");

fprintf(stdout, "%s%s\n",

*(comments[i]) == '\0' ? "" : " ", comments[i]);

}

free(comments[i]);

sshkey_free(keys[i]);

}

free(comments);

free(keys);

pkcs11_terminate();

exit(0);

Line 821

Line 880

fatal("%s: sshkey_fingerprint failed", __func__);

mprintf("%u %s %s (%s)\n", sshkey_size(public), fp,

comment ? comment : "no comment", sshkey_type(public));

if (log_level >= SYSLOG_LEVEL_VERBOSE)

if (log_level_get() >= SYSLOG_LEVEL_VERBOSE)

printf("%s\n", ra);

free(ra);

free(fp);

Line 832

Line 891

{

struct stat st;

char *comment = NULL;

struct sshkey *public = NULL;

struct sshkey *privkey = NULL, *pubkey = NULL;

int r;

if (stat(identity_file, &st) < 0)

if (stat(identity_file, &st) == -1)

fatal("%s: %s", path, strerror(errno));

if ((r = sshkey_load_public(path, &public, &comment)) != 0) {

if ((r = sshkey_load_public(path, &pubkey, &comment)) != 0)

debug("load public \"%s\": %s", path, ssh_err(r));

if (pubkey == NULL || comment == NULL || *comment == '\0') {

free(comment);

if ((r = sshkey_load_private(path, NULL,

&public, &comment)) != 0) {

&privkey, &comment)) != 0)

debug("load private \"%s\": %s", path, ssh_err(r));

fatal("%s is not a key file.", path);

}

if (pubkey == NULL && privkey == NULL)

fatal("%s is not a key file.", path);

fingerprint_one_key(public, comment);

fingerprint_one_key(pubkey == NULL ? privkey : pubkey, comment);

sshkey_free(public);

sshkey_free(pubkey);

sshkey_free(privkey);

free(comment);

}

Line 856

Line 918

{

FILE *f;

struct sshkey *public = NULL;

char *comment = NULL, *cp, *ep, line[SSH_MAX_PUBKEY_BYTES];

char *comment = NULL, *cp, *ep, *line = NULL;

size_t linesize = 0;

int i, invalid = 1;

const char *path;

u_long lnum = 0;

Line 871

Line 934

} else if ((f = fopen(path, "r")) == NULL)

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[strcspn(cp, "\n")] = '\0';

/* Trim leading space and comments */

Line 891

Line 955

if (lnum == 1 && strcmp(identity_file, "-") != 0 &&

strstr(cp, "PRIVATE KEY") != NULL) {

free(line);

fclose(f);

fingerprint_private(path);

exit(0);

Line 937

Line 1002

invalid = 0; /* One good key in the file is sufficient */

}

fclose(f);

free(line);

if (invalid)

fatal("%s is not a public key file.", path);

Line 963

Line 1029

{ NULL, NULL, NULL }

};

u_int32_t bits = 0;

int first = 0;

struct stat st;

struct sshkey *private, *public;

char comment[1024], *prv_tmp, *pub_tmp, *prv_file, *pub_file;

int i, type, fd, r;

FILE *f;

for (i = 0; key_types[i].key_type; i++) {

public = private = NULL;

Line 1006

Line 1072

fflush(stdout);

type = sshkey_type_from_name(key_types[i].key_type);

if ((fd = mkstemp(prv_tmp)) == -1) {

error("Could not save your public key in %s: %s",

error("Could not save your private key in %s: %s",

prv_tmp, strerror(errno));

goto failnext;

}

close(fd); /* just using mkstemp() to generate/reserve a name */

(void)close(fd); /* just using mkstemp() to reserve a name */

bits = 0;

type_bits_valid(type, NULL, &bits);

if ((r = sshkey_generate(type, bits, &private)) != 0) {

Line 1022

Line 1088

snprintf(comment, sizeof comment, "%s@%s", pw->pw_name,

hostname);

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",

prv_tmp, ssh_err(r));

goto failnext;

Line 1033

Line 1100

goto failnext;

}

(void)fchmod(fd, 0644);

f = fdopen(fd, "w");

(void)close(fd);

if (f == NULL) {

if ((r = sshkey_save_public(public, pub_tmp, comment)) != 0) {

error("fdopen %s failed: %s", pub_tmp, strerror(errno));

fatal("Unable to save public key to %s: %s",

close(fd);

identity_file, ssh_err(r));

goto failnext;

}

if ((r = sshkey_write(public, f)) != 0) {

error("write key failed: %s", ssh_err(r));

fclose(f);

goto failnext;

}

fprintf(f, " %s\n", comment);

if (ferror(f) != 0) {

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) {

Line 1086

Line 1138

int has_unhashed; /* When hashing, original had unhashed hosts */

int found_key; /* For find/delete, host was found */

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

Line 1105

Line 1160

if (was_hashed || has_wild || l->marker != MRK_NONE) {

fprintf(ctx->out, "%s\n", l->line);

if (has_wild && !find_host) {

if (has_wild && !ctx->find_host) {

logit("%s:%lu: ignoring host name "

"with wildcard: %.64s", l->path,

l->linenum, l->hosts);

Line 1145

Line 1200

struct known_hosts_ctx *ctx = (struct known_hosts_ctx *)_ctx;

enum sshkey_fp_rep rep;

int fptype;

char *fp;

char *fp = NULL, *ra = NULL;

fptype = print_bubblebabble ? SSH_DIGEST_SHA1 : fingerprint_hash;

rep = print_bubblebabble ? SSH_FP_BUBBLEBABBLE : SSH_FP_DEFAULT;

if (l->status == HKF_STATUS_MATCHED) {

if (delete_host) {

if (ctx->delete_host) {

if (l->marker != MRK_NONE) {

/* Don't remove CA and revocation lines */

fprintf(ctx->out, "%s\n", l->line);

Line 1167

Line 1222

ctx->host, l->linenum);

}

return 0;

} else if (find_host) {

} else if (ctx->find_host) {

ctx->found_key = 1;

if (!quiet) {

printf("# Host %s found: line %lu %s\n",

Line 1175

Line 1230

l->linenum, l->marker == MRK_CA ? "CA" :

(l->marker == MRK_REVOKE ? "REVOKED" : ""));

}

if (hash_hosts)

if (ctx->hash_hosts)

known_hosts_hash(l, ctx);

else if (print_fingerprint) {

fp = sshkey_fingerprint(l->key, fptype, rep);

mprintf("%s %s %s %s\n", ctx->host,

ra = sshkey_fingerprint(l->key,

sshkey_type(l->key), fp, l->comment);

fingerprint_hash, SSH_FP_RANDOMART);

if (fp == NULL || ra == NULL)

fatal("%s: sshkey_fingerprint failed",

__func__);

mprintf("%s %s %s%s%s\n", ctx->host,

sshkey_type(l->key), fp,

l->comment[0] ? " " : "",

l->comment);

if (log_level_get() >= SYSLOG_LEVEL_VERBOSE)

printf("%s\n", ra);

free(ra);

free(fp);

} else

fprintf(ctx->out, "%s\n", l->line);

return 0;

}

} else if (delete_host) {

} else if (ctx->delete_host) {

/* Retain non-matching hosts when deleting */

if (l->status == HKF_STATUS_INVALID) {

ctx->invalid = 1;

Line 1198

Line 1263

}

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];

int r, fd, oerrno, inplace = 0;

struct known_hosts_ctx ctx;

u_int foreach_options;

struct stat sb;

if (!have_identity) {

cp = tilde_expand_filename(_PATH_SSH_USER_HOSTFILE, pw->pw_uid);

Line 1213

Line 1280

free(cp);

have_identity = 1;

}

if (stat(identity_file, &sb) != 0)

fatal("Cannot stat %s: %s", identity_file, strerror(errno));

memset(&ctx, 0, sizeof(ctx));

ctx.out = stdout;

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

Line 1236

Line 1308

unlink(tmp);

fatal("fdopen: %s", strerror(oerrno));

}

fchmod(fd, sb.st_mode & 0644);

inplace = 1;

}

/* XXX support identity_file == "-" for stdin */

Line 1307

Line 1380

if (!have_identity)

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));

/* Try to load the file with empty passphrase. */

r = sshkey_load_private(identity_file, "", &private, &comment);

Line 1320

Line 1393

RP_ALLOW_STDIN);

r = sshkey_load_private(identity_file, old_passphrase,

&private, &comment);

explicit_bzero(old_passphrase, strlen(old_passphrase));

freezero(old_passphrase, strlen(old_passphrase));

free(old_passphrase);

if (r != 0)

goto badkey;

} else if (r != 0) {

Line 1352

Line 1424

exit(1);

}

/* Destroy the other copy. */

explicit_bzero(passphrase2, strlen(passphrase2));

freezero(passphrase2, strlen(passphrase2));

free(passphrase2);

}

/* Save the file using the new passphrase. */

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.",

identity_file, ssh_err(r));

explicit_bzero(passphrase1, strlen(passphrase1));

freezero(passphrase1, strlen(passphrase1));

free(passphrase1);

sshkey_free(private);

free(comment);

exit(1);

}

/* Destroy the passphrase and the copy of the key in memory. */

explicit_bzero(passphrase1, strlen(passphrase1));

freezero(passphrase1, strlen(passphrase1));

free(passphrase1);

sshkey_free(private); /* Destroys contents */

free(comment);

Line 1381

Line 1450

* Print the SSHFP RR.

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;

char *comment = NULL;

Line 1390

Line 1460

if (fname == NULL)

fatal("%s: no filename", __func__);

if (stat(fname, &st) < 0) {

if (stat(fname, &st) == -1) {

if (errno == ENOENT)

return 0;

fatal("%s: %s", fname, strerror(errno));

Line 1408

Line 1478

* Change the comment of a private key file.

static void

do_change_comment(struct passwd *pw)

do_change_comment(struct passwd *pw, const char *identity_comment)

{

char new_comment[1024], *comment, *passphrase;

struct sshkey *private;

struct sshkey *public;

struct stat st;

FILE *f;

int r;

int r, fd;

if (!have_identity)

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));

if ((r = sshkey_load_private(identity_file, "",

&private, &comment)) == 0)

Line 1438

Line 1507

/* Try to load using the passphrase. */

if ((r = sshkey_load_private(identity_file, passphrase,

&private, &comment)) != 0) {

explicit_bzero(passphrase, strlen(passphrase));

freezero(passphrase, strlen(passphrase));

free(passphrase);

fatal("Cannot load private key \"%s\": %s.",

identity_file, ssh_err(r));

}

if (private->type != KEY_ED25519 && private->type != KEY_XMSS &&

!use_new_format) {

private_key_format != SSHKEY_PRIVATE_OPENSSH) {

error("Comments are only supported for keys stored in "

"the new format (-o).");

explicit_bzero(passphrase, strlen(passphrase));

Line 1454

Line 1522

exit(1);

}

if (comment)

printf("Key now has comment '%s'\n", comment);

printf("Old comment: %s\n", comment);

else

printf("Key now has no comment\n");

printf("No existing comment\n");

if (identity_comment) {

strlcpy(new_comment, identity_comment, sizeof(new_comment));

} else {

printf("Enter new comment: ");

printf("New comment: ");

fflush(stdout);

if (!fgets(new_comment, sizeof(new_comment), stdin)) {

explicit_bzero(passphrase, strlen(passphrase));

Line 1470

Line 1538

}

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. */

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",

identity_file, ssh_err(r));

explicit_bzero(passphrase, strlen(passphrase));

freezero(passphrase, strlen(passphrase));

free(passphrase);

sshkey_free(private);

free(comment);

exit(1);

}

explicit_bzero(passphrase, strlen(passphrase));

freezero(passphrase, strlen(passphrase));

free(passphrase);

if ((r = sshkey_from_private(private, &public)) != 0)

fatal("sshkey_from_private failed: %s", ssh_err(r));

sshkey_free(private);

strlcat(identity_file, ".pub", sizeof(identity_file));

fd = open(identity_file, O_WRONLY | O_CREAT | O_TRUNC, 0644);

if ((r = sshkey_save_public(public, identity_file, new_comment)) != 0) {

if (fd == -1)

fatal("Unable to save public key to %s: %s",

fatal("Could not save your public key in %s", identity_file);

identity_file, ssh_err(r));

f = fdopen(fd, "w");

}

if (f == NULL)

fatal("fdopen %s failed: %s", identity_file, strerror(errno));

if ((r = sshkey_write(public, f)) != 0)

fatal("write key failed: %s", ssh_err(r));

sshkey_free(public);

fprintf(f, " %s\n", new_comment);

fclose(f);

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);

}

static void

add_flag_option(struct sshbuf *c, const char *name)

cert_ext_add(const char *key, const char *value, int iscrit)

{

int r;

cert_ext = xreallocarray(cert_ext, ncert_ext + 1, sizeof(*cert_ext));

cert_ext[ncert_ext].key = xstrdup(key);

debug3("%s: %s", __func__, name);

cert_ext[ncert_ext].val = value == NULL ? NULL : xstrdup(value);

if ((r = sshbuf_put_cstring(c, name)) != 0 ||

cert_ext[ncert_ext].crit = iscrit;

(r = sshbuf_put_string(c, NULL, 0)) != 0)

ncert_ext++;

fatal("%s: buffer error: %s", __func__, ssh_err(r));

}

static void

/* qsort(3) comparison function for certificate extensions */

add_string_option(struct sshbuf *c, const char *name, const char *value)

static int

cert_ext_cmp(const void *_a, const void *_b)

{

struct sshbuf *b;

const struct cert_ext *a = (const struct cert_ext *)_a;

const struct cert_ext *b = (const struct cert_ext *)_b;

int r;

debug3("%s: %s=%s", __func__, name, value);

if (a->crit != b->crit)

if ((b = sshbuf_new()) == NULL)

return (a->crit < b->crit) ? -1 : 1;

fatal("%s: sshbuf_new failed", __func__);

if ((r = strcmp(a->key, b->key)) != 0)

if ((r = sshbuf_put_cstring(b, value)) != 0 ||

return r;

(r = sshbuf_put_cstring(c, name)) != 0 ||

if ((a->val == NULL) != (b->val == NULL))

(r = sshbuf_put_stringb(c, b)) != 0)

return (a->val == NULL) ? -1 : 1;

fatal("%s: buffer error: %s", __func__, ssh_err(r));

if (a->val != NULL && (r = strcmp(a->val, b->val)) != 0)

return r;

sshbuf_free(b);

return 0;

}

#define OPTIONS_CRITICAL 1

Line 1540

Line 1612

static void

prepare_options_buf(struct sshbuf *c, int which)

{

struct sshbuf *b;

size_t i;

int r;

const struct cert_ext *ext;

if ((b = sshbuf_new()) == NULL)

fatal("%s: sshbuf_new failed", __func__);

sshbuf_reset(c);

if ((which & OPTIONS_CRITICAL) != 0 &&

for (i = 0; i < ncert_ext; i++) {

certflags_command != NULL)

ext = &cert_ext[i];

add_string_option(c, "force-command", certflags_command);

if ((ext->crit && (which & OPTIONS_EXTENSIONS)) ||

if ((which & OPTIONS_EXTENSIONS) != 0 &&

(!ext->crit && (which & OPTIONS_CRITICAL)))

(certflags_flags & CERTOPT_X_FWD) != 0)

add_flag_option(c, "permit-X11-forwarding");

if ((which & OPTIONS_EXTENSIONS) != 0 &&

(certflags_flags & CERTOPT_AGENT_FWD) != 0)

add_flag_option(c, "permit-agent-forwarding");

if ((which & OPTIONS_EXTENSIONS) != 0 &&

(certflags_flags & CERTOPT_PORT_FWD) != 0)

add_flag_option(c, "permit-port-forwarding");

if ((which & OPTIONS_EXTENSIONS) != 0 &&

(certflags_flags & CERTOPT_PTY) != 0)

add_flag_option(c, "permit-pty");

if ((which & OPTIONS_EXTENSIONS) != 0 &&

(certflags_flags & CERTOPT_USER_RC) != 0)

add_flag_option(c, "permit-user-rc");

if ((which & OPTIONS_CRITICAL) != 0 &&

certflags_src_addr != NULL)

add_string_option(c, "source-address", certflags_src_addr);

for (i = 0; i < ncert_userext; i++) {

if ((cert_userext[i].crit && (which & OPTIONS_EXTENSIONS)) ||

(!cert_userext[i].crit && (which & OPTIONS_CRITICAL)))

continue;

if (cert_userext[i].val == NULL)

if (ext->val == NULL) {

add_flag_option(c, cert_userext[i].key);

/* flag option */

else {

debug3("%s: %s", __func__, ext->key);

add_string_option(c, cert_userext[i].key,

if ((r = sshbuf_put_cstring(c, ext->key)) != 0 ||

cert_userext[i].val);

(r = sshbuf_put_string(c, NULL, 0)) != 0)

fatal("%s: buffer: %s", __func__, ssh_err(r));

} else {

/* key/value option */

debug3("%s: %s=%s", __func__, ext->key, ext->val);

sshbuf_reset(b);

if ((r = sshbuf_put_cstring(c, ext->key)) != 0 ||

(r = sshbuf_put_cstring(b, ext->val)) != 0 ||

(r = sshbuf_put_stringb(c, b)) != 0)

fatal("%s: buffer: %s", __func__, ssh_err(r));

}

sshbuf_free(b);

}

static void

finalise_cert_exts(void)

{

/* critical options */

if (certflags_command != NULL)

cert_ext_add("force-command", certflags_command, 1);

if (certflags_src_addr != NULL)

cert_ext_add("source-address", certflags_src_addr, 1);

/* extensions */

if ((certflags_flags & CERTOPT_X_FWD) != 0)

cert_ext_add("permit-X11-forwarding", NULL, 0);

if ((certflags_flags & CERTOPT_AGENT_FWD) != 0)

cert_ext_add("permit-agent-forwarding", NULL, 0);

if ((certflags_flags & CERTOPT_PORT_FWD) != 0)

cert_ext_add("permit-port-forwarding", NULL, 0);

if ((certflags_flags & CERTOPT_PTY) != 0)

cert_ext_add("permit-pty", NULL, 0);

if ((certflags_flags & CERTOPT_USER_RC) != 0)

cert_ext_add("permit-user-rc", NULL, 0);

if ((certflags_flags & CERTOPT_NO_REQUIRE_USER_PRESENCE) != 0)

cert_ext_add("no-touch-required", NULL, 0);

/* order lexically by key */

if (ncert_ext > 0)

qsort(cert_ext, ncert_ext, sizeof(*cert_ext), cert_ext_cmp);

}

static struct sshkey *

load_pkcs11_key(char *path)

{

Line 1588

Line 1681

fatal("Couldn't load CA public key \"%s\": %s",

path, ssh_err(r));

nkeys = pkcs11_add_provider(pkcs11provider, identity_passphrase, &keys);

nkeys = pkcs11_add_provider(pkcs11provider, identity_passphrase,

&keys, NULL);

debug3("%s: %d keys", __func__, nkeys);

if (nkeys <= 0)

fatal("cannot read public key from pkcs11");

Line 1609

Line 1703

/* Signer for sshkey_certify_custom that uses the agent */

static int

agent_signer(const struct sshkey *key, u_char **sigp, size_t *lenp,

agent_signer(struct sshkey *key, u_char **sigp, size_t *lenp,

const u_char *data, size_t datalen,

const char *alg, u_int compat, void *ctx)

const char *alg, const char *provider, const char *pin,

u_int compat, void *ctx)

{

int *agent_fdp = (int *)ctx;

Line 1620

Line 1715

}

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, found, agent_fd = -1;

int r, i, found, agent_fd = -1;

u_int n;

struct sshkey *ca, *public;

char valid[64], *otmp, *tmp, *cp, *out, *comment, **plist = NULL;

char valid[64], *otmp, *tmp, *cp, *out, *comment;

FILE *f;

char *ca_fp = NULL, **plist = NULL, *pin = NULL;

struct ssh_identitylist *agent_ids;

size_t j;

struct notifier_ctx *notifier = NULL;

#ifdef ENABLE_PKCS11

pkcs11_init(1);

Line 1665

Line 1763

ca->flags |= SSHKEY_FLAG_EXT;

} else {

/* CA key is assumed to be a private key on the filesystem */

ca = load_identity(tmp);

ca = load_identity(tmp, NULL);

if (sshkey_is_sk(ca) &&

(ca->sk_flags & SSH_SK_USER_VERIFICATION_REQD)) {

if ((pin = read_passphrase("Enter PIN for CA key: ",

RP_ALLOW_STDIN)) == NULL)

fatal("%s: couldn't read PIN", __func__);

}

free(tmp);

if (key_type_name != NULL &&

if (key_type_name != NULL) {

sshkey_type_from_name(key_type_name) != ca->type) {

if (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);

}

} else if (ca->type == KEY_RSA) {

/* Default to a good signature algorithm */

key_type_name = "rsa-sha2-512";

}

ca_fp = sshkey_fingerprint(ca, fingerprint_hash, SSH_FP_DEFAULT);

finalise_cert_exts();

for (i = 0; i < argc; i++) {

/* Split list of principals */

n = 0;

Line 1690

Line 1800

}

if (n > SSHKEY_CERT_MAX_PRINCIPALS)

fatal("Too many certificate principals specified");

tmp = tilde_expand_filename(argv[i], pw->pw_uid);

if ((r = sshkey_load_public(tmp, &public, &comment)) != 0)

fatal("%s: unable to open \"%s\": %s",

__func__, tmp, ssh_err(r));

if (public->type != KEY_RSA && public->type != KEY_DSA &&

if (sshkey_is_cert(public))

public->type != KEY_ECDSA && public->type != KEY_ED25519 &&

public->type != KEY_XMSS)

fatal("%s: key \"%s\" type %s cannot be certified",

__func__, tmp, sshkey_type(public));

Line 1721

Line 1829

if (agent_fd != -1 && (ca->flags & SSHKEY_FLAG_EXT) != 0) {

if ((r = sshkey_certify_custom(public, ca,

key_type_name, agent_signer, &agent_fd)) != 0)

key_type_name, sk_provider, NULL, 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)

if (sshkey_is_sk(ca) &&

(ca->sk_flags & SSH_SK_USER_PRESENCE_REQD)) {

notifier = notify_start(0,

"Confirm user presence for key %s %s",

sshkey_type(ca), ca_fp);

}

r = sshkey_certify(public, ca, key_type_name,

sk_provider, pin);

notify_complete(notifier);

if (r != 0)

fatal("Couldn't certify key %s: %s",

tmp, ssh_err(r));

}

Line 1735

Line 1853

xasprintf(&out, "%s-cert.pub", tmp);

free(tmp);

if ((fd = open(out, O_WRONLY|O_CREAT|O_TRUNC, 0644)) == -1)

if ((r = sshkey_save_public(public, out, comment)) != 0) {

fatal("Could not open \"%s\" for writing: %s", out,

fatal("Unable to save public key to %s: %s",

strerror(errno));

identity_file, ssh_err(r));

if ((f = fdopen(fd, "w")) == NULL)

}

fatal("%s: fdopen: %s", __func__, strerror(errno));

if ((r = sshkey_write(public, f)) != 0)

fatal("Could not write certified key to %s: %s",

out, ssh_err(r));

fprintf(f, " %s\n", comment);

fclose(f);

if (!quiet) {

sshkey_format_cert_validity(public->cert,

Line 1760

Line 1872

sshkey_free(public);

free(out);

if (cert_serial_autoinc)

cert_serial++;

}

if (pin != NULL)

freezero(pin, strlen(pin));

free(ca_fp);

#ifdef ENABLE_PKCS11

pkcs11_terminate();

#endif

Line 1859

Line 1976

certflags_flags &= ~CERTOPT_USER_RC;

else if (strcasecmp(opt, "permit-user-rc") == 0)

certflags_flags |= CERTOPT_USER_RC;

else if (strcasecmp(opt, "touch-required") == 0)

certflags_flags &= ~CERTOPT_NO_REQUIRE_USER_PRESENCE;

else if (strcasecmp(opt, "no-touch-required") == 0)

certflags_flags |= CERTOPT_NO_REQUIRE_USER_PRESENCE;

else if (strncasecmp(opt, "force-command=", 14) == 0) {

val = opt + 14;

if (*val == '\0')

Line 1880

Line 2001

val = xstrdup(strchr(opt, ':') + 1);

if ((cp = strchr(val, '=')) != NULL)

*cp++ = '\0';

cert_userext = xreallocarray(cert_userext, ncert_userext + 1,

cert_ext_add(val, cp, iscrit);

sizeof(*cert_userext));

free(val);

cert_userext[ncert_userext].key = val;

cert_userext[ncert_userext].val = cp == NULL ?

NULL : xstrdup(cp);

cert_userext[ncert_userext].crit = iscrit;

ncert_userext++;

} else

fatal("Unsupported certificate option \"%s\"", opt);

}

Line 1894

Line 2010

static void

show_options(struct sshbuf *optbuf, int in_critical)

{

char *name, *arg;

char *name, *arg, *hex;

struct sshbuf *options, *option = NULL;

int r;

Line 1912

Line 2028

strcmp(name, "permit-agent-forwarding") == 0 ||

strcmp(name, "permit-port-forwarding") == 0 ||

strcmp(name, "permit-pty") == 0 ||

strcmp(name, "permit-user-rc") == 0))

strcmp(name, "permit-user-rc") == 0 ||

strcmp(name, "no-touch-required") == 0)) {

printf("\n");

else if (in_critical &&

} else if (in_critical &&

(strcmp(name, "force-command") == 0 ||

strcmp(name, "source-address") == 0)) {

if ((r = sshbuf_get_cstring(option, &arg, NULL)) != 0)

Line 1922

Line 2039

__func__, ssh_err(r));

printf(" %s\n", arg);

free(arg);

} else {

} else if (sshbuf_len(option) > 0) {

printf(" UNKNOWN OPTION (len %zu)\n",

hex = sshbuf_dtob16(option);

sshbuf_len(option));

printf(" UNKNOWN OPTION: %s (len %zu)\n",

hex, sshbuf_len(option));

sshbuf_reset(option);

}

free(hex);

} else

printf(" UNKNOWN FLAG OPTION\n");

free(name);

if (sshbuf_len(option) != 0)

fatal("Option corrupt: extra data at end");

Line 1951

Line 2071

printf(" Type: %s %s certificate\n", sshkey_ssh_name(key),

sshkey_cert_type(key));

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(" Serial: %llu\n", (unsigned long long)key->cert->serial);

printf(" Valid: %s\n", valid);

Line 1988

Line 2109

struct stat st;

int r, is_stdin = 0, ok = 0;

FILE *f;

char *cp, line[SSH_MAX_PUBKEY_BYTES];

char *cp, *line = NULL;

const char *path;

size_t linesize = 0;

u_long lnum = 0;

if (!have_identity)

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));

path = identity_file;

Line 2005

Line 2127

} else if ((f = fopen(identity_file, "r")) == NULL)

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);

key = NULL;

/* Trim leading space and comments */

Line 2030

Line 2153

printf("%s:%lu:\n", path, lnum);

print_cert(key);

}

free(line);

sshkey_free(key);

fclose(f);

exit(ok ? 0 : 1);

}

#ifdef WITH_OPENSSL

static void

load_krl(const char *path, struct ssh_krl **krlp)

{

struct sshbuf *krlbuf;

int r, fd;

int r;

if ((krlbuf = sshbuf_new()) == NULL)

if ((r = sshbuf_load_file(path, &krlbuf)) != 0)

fatal("sshbuf_new failed");

if ((fd = open(path, O_RDONLY)) == -1)

fatal("open %s: %s", path, strerror(errno));

if ((r = sshkey_load_file(fd, krlbuf)) != 0)

fatal("Unable to load KRL: %s", ssh_err(r));

close(fd);

/* XXX check sigs */

if ((r = ssh_krl_from_blob(krlbuf, krlp, NULL, 0)) != 0 ||

*krlp == NULL)

Line 2057

Line 2175

}

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,

const struct sshkey *ca, struct ssh_krl *krl)

{

struct sshkey *key = NULL;

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;

int i, was_explicit_key, was_sha1, r;

int i, was_explicit_key, was_sha1, was_sha256, was_hash, r;

FILE *krl_spec;

path = tilde_expand_filename(file, pw->pw_uid);

Line 2077

Line 2232

if (!quiet)

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");

/* Trim trailing space, comments and strip \n */

for (i = 0, r = -1; cp[i] != '\0'; i++) {

Line 2144

Line 2299

cp = cp + strspn(cp, " \t");

if (ssh_krl_revoke_cert_by_key_id(krl, ca, cp) != 0)

fatal("%s: revoke key ID failed", __func__);

} else if (strncasecmp(cp, "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);

if (r != 0)

fatal("%s: revoke key failed: %s",

__func__, ssh_err(r));

} else {

if (strncasecmp(cp, "key:", 4) == 0) {

cp += 4;

Line 2153

Line 2316

cp += 5;

cp = cp + strspn(cp, " \t");

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.

* Parsing will fail if it isn't.

Line 2166

Line 2332

path, lnum, ssh_err(r));

if (was_explicit_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);

if (r != 0)

fatal("%s: revoke key failed: %s",

__func__, ssh_err(r));

freezero(blob, blen);

blob = NULL;

blen = 0;

sshkey_free(key);

}

if (strcmp(path, "-") != 0)

fclose(krl_spec);

free(line);

free(path);

}

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 stat sb;

struct sshkey *ca = NULL;

int fd, i, r, wild_ca = 0;

int i, r, wild_ca = 0;

char *tmp;

struct sshbuf *kbuf;

Line 2217

Line 2401

else if ((krl = ssh_krl_init()) == NULL)

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++)

update_krl_from_file(pw, argv[i], wild_ca, ca, krl);

Line 2229

Line 2413

fatal("sshbuf_new failed");

if (ssh_krl_to_blob(krl, kbuf, NULL, 0) != 0)

fatal("Couldn't generate KRL");

if ((fd = open(identity_file, O_WRONLY|O_CREAT|O_TRUNC, 0644)) == -1)

if ((r = sshbuf_write_file(identity_file, kbuf)) != 0)

fatal("open %s: %s", identity_file, strerror(errno));

if (atomicio(vwrite, fd, (void *)sshbuf_ptr(kbuf), sshbuf_len(kbuf)) !=

sshbuf_len(kbuf))

fatal("write %s: %s", identity_file, strerror(errno));

close(fd);

sshbuf_free(kbuf);

ssh_krl_free(krl);

sshkey_free(ca);

}

static void

do_check_krl(struct passwd *pw, int argc, char **argv)

do_check_krl(struct passwd *pw, int print_krl, int argc, char **argv)

{

int i, r, ret = 0;

char *comment;

Line 2251

Line 2431

if (*identity_file == '\0')

fatal("KRL checking requires an input file");

load_krl(identity_file, &krl);

if (print_krl)

krl_dump(krl, stdout);

for (i = 0; i < argc; i++) {

if ((r = sshkey_load_public(argv[i], &k, &comment)) != 0)

fatal("Cannot load public key %s: %s",

Line 2267

Line 2449

ssh_krl_free(krl);

exit(ret);

}

#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 corresponding

* 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, *asig = NULL, *fp = NULL;

char *pin = NULL, *prompt = NULL;

if (!quiet) {

if (fd == STDIN_FILENO)

fprintf(stderr, "Signing data on standard input\n");

else

fprintf(stderr, "Signing file %s\n", filename);

}

if (signer == NULL && sshkey_is_sk(signkey)) {

if ((signkey->sk_flags & SSH_SK_USER_VERIFICATION_REQD)) {

xasprintf(&prompt, "Enter PIN for %s key: ",

sshkey_type(signkey));

if ((pin = read_passphrase(prompt,

RP_ALLOW_STDIN)) == NULL)

fatal("%s: couldn't read PIN", __func__);

}

if ((signkey->sk_flags & SSH_SK_USER_PRESENCE_REQD)) {

if ((fp = sshkey_fingerprint(signkey, fingerprint_hash,

SSH_FP_DEFAULT)) == NULL)

fatal("%s: fingerprint failed", __func__);

fprintf(stderr, "Confirm user presence for key %s %s\n",

sshkey_type(signkey), fp);

free(fp);

}

if ((r = sshsig_sign_fd(signkey, NULL, sk_provider, pin,

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(prompt);

free(asig);

if (pin != NULL)

freezero(pin, strlen(pin));

sshbuf_free(abuf);

sshbuf_free(sigbuf);

if (wfd != -1)

close(wfd);

return r;

}

static int

sig_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

sig_verify(const char *signature, const char *sig_namespace,

const char *principal, const char *allowed_keys, const char *revoked_keys)

{

int r, ret = -1;

struct sshbuf *sigbuf = NULL, *abuf = NULL;

struct sshkey *sign_key = NULL;

char *fp = NULL;

struct sshkey_sig_details *sig_details = NULL;

memset(&sig_details, 0, sizeof(sig_details));

if ((r = sshbuf_load_file(signature, &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));

goto done;

}

if ((r = sshsig_verify_fd(sigbuf, STDIN_FILENO, sig_namespace,

&sign_key, &sig_details)) != 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);

if (sig_details != NULL) {

debug2("%s: signature details: counter = %u, flags = 0x%02x",

__func__, sig_details->sk_counter, sig_details->sk_flags);

}

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");

}

sshbuf_free(sigbuf);

sshbuf_free(abuf);

sshkey_free(sign_key);

sshkey_sig_details_free(sig_details);

free(fp);

return ret;

}

static int

sig_find_principals(const char *signature, const char *allowed_keys) {

int r, ret = -1;

struct sshbuf *sigbuf = NULL, *abuf = NULL;

struct sshkey *sign_key = NULL;

char *principals = NULL, *cp, *tmp;

if ((r = sshbuf_load_file(signature, &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));

goto done;

}

if ((r = sshsig_get_pubkey(sigbuf, &sign_key)) != 0) {

error("%s: sshsig_get_pubkey: %s",

__func__, ssh_err(r));

goto done;

}

if ((r = sshsig_find_principals(allowed_keys, sign_key,

&principals)) != 0) {

error("%s: sshsig_get_principal: %s",

__func__, ssh_err(r));

goto done;

}

ret = 0;

done:

if (ret == 0 ) {

/* Emit matching principals one per line */

tmp = principals;

while ((cp = strsep(&tmp, ",")) != NULL && *cp != '\0')

puts(cp);

} else {

fprintf(stderr, "No principal matched.\n");

}

sshbuf_free(sigbuf);

sshbuf_free(abuf);

sshkey_free(sign_key);

free(principals);

return ret;

}

static void

do_moduli_gen(const char *out_file, char **opts, size_t nopts)

{

#ifdef WITH_OPENSSL

/* Moduli generation/screening */

u_int32_t memory = 0;

BIGNUM *start = NULL;

int moduli_bits = 0;

FILE *out;

size_t i;

const char *errstr;

/* Parse options */

for (i = 0; i < nopts; i++) {

if (strncmp(opts[i], "memory=", 7) == 0) {

memory = (u_int32_t)strtonum(opts[i]+7, 1,

UINT_MAX, &errstr);

if (errstr) {

fatal("Memory limit is %s: %s",

errstr, opts[i]+7);

}

} else if (strncmp(opts[i], "start=", 6) == 0) {

/* XXX - also compare length against bits */

if (BN_hex2bn(&start, opts[i]+6) == 0)

fatal("Invalid start point.");

} else if (strncmp(opts[i], "bits=", 5) == 0) {

moduli_bits = (int)strtonum(opts[i]+5, 1,

INT_MAX, &errstr);

if (errstr) {

fatal("Invalid number: %s (%s)",

opts[i]+12, errstr);

}

} else {

fatal("Option \"%s\" is unsupported for moduli "

"generation", opts[i]);

}

if ((out = fopen(out_file, "w")) == NULL) {

fatal("Couldn't open modulus candidate file \"%s\": %s",

out_file, strerror(errno));

}

setvbuf(out, NULL, _IOLBF, 0);

if (moduli_bits == 0)

moduli_bits = DEFAULT_BITS;

if (gen_candidates(out, memory, moduli_bits, start) != 0)

fatal("modulus candidate generation failed");

#else /* WITH_OPENSSL */

fatal("Moduli generation is not supported");

#endif /* WITH_OPENSSL */

}

static void

do_moduli_screen(const char *out_file, char **opts, size_t nopts)

{

#ifdef WITH_OPENSSL

/* Moduli generation/screening */

char *checkpoint = NULL;

u_int32_t generator_wanted = 0;

unsigned long start_lineno = 0, lines_to_process = 0;

int prime_tests = 0;

FILE *out, *in = stdin;

size_t i;

const char *errstr;

/* Parse options */

for (i = 0; i < nopts; i++) {

if (strncmp(opts[i], "lines=", 6) == 0) {

lines_to_process = strtoul(opts[i]+6, NULL, 10);

} else if (strncmp(opts[i], "start-line=", 11) == 0) {

start_lineno = strtoul(opts[i]+11, NULL, 10);

} else if (strncmp(opts[i], "checkpoint=", 11) == 0) {

checkpoint = xstrdup(opts[i]+11);

} else if (strncmp(opts[i], "generator=", 10) == 0) {

generator_wanted = (u_int32_t)strtonum(

opts[i]+10, 1, UINT_MAX, &errstr);

if (errstr != NULL) {

fatal("Generator invalid: %s (%s)",

opts[i]+10, errstr);

}

} else if (strncmp(opts[i], "prime-tests=", 12) == 0) {

prime_tests = (int)strtonum(opts[i]+12, 1,

INT_MAX, &errstr);

if (errstr) {

fatal("Invalid number: %s (%s)",

opts[i]+12, errstr);

}

} else {

fatal("Option \"%s\" is unsupported for moduli "

"screening", opts[i]);

}

if (have_identity && strcmp(identity_file, "-") != 0) {

if ((in = fopen(identity_file, "r")) == NULL) {

fatal("Couldn't open modulus candidate "

"file \"%s\": %s", identity_file,

strerror(errno));

}

if ((out = fopen(out_file, "a")) == NULL) {

fatal("Couldn't open moduli file \"%s\": %s",

out_file, strerror(errno));

}

setvbuf(out, NULL, _IOLBF, 0);

if (prime_test(in, out, prime_tests == 0 ? 100 : prime_tests,

generator_wanted, checkpoint,

start_lineno, lines_to_process) != 0)

fatal("modulus screening failed");

#else /* WITH_OPENSSL */

fatal("Moduli screening is not supported");

#endif /* WITH_OPENSSL */

}

static char *

private_key_passphrase(void)

{

char *passphrase1, *passphrase2;

/* Ask for a passphrase (twice). */

if (identity_passphrase)

passphrase1 = xstrdup(identity_passphrase);

else if (identity_new_passphrase)

passphrase1 = xstrdup(identity_new_passphrase);

else {

passphrase_again:

passphrase1 =

read_passphrase("Enter passphrase (empty for no "

"passphrase): ", RP_ALLOW_STDIN);

passphrase2 = read_passphrase("Enter same passphrase again: ",

RP_ALLOW_STDIN);

if (strcmp(passphrase1, passphrase2) != 0) {

* The passphrases do not match. Clear them and

* retry.

freezero(passphrase1, strlen(passphrase1));

freezero(passphrase2, strlen(passphrase2));

printf("Passphrases do not match. Try again.\n");

goto passphrase_again;

}

/* Clear the other copy of the passphrase. */

freezero(passphrase2, strlen(passphrase2));

}

return passphrase1;

}

static const char *

skip_ssh_url_preamble(const char *s)

{

if (strncmp(s, "ssh://", 6) == 0)

return s + 6;

else if (strncmp(s, "ssh:", 4) == 0)

return s + 4;

return s;

}

static int

do_download_sk(const char *skprovider, const char *device)

{

struct sshkey **keys;

size_t nkeys, i;

int r, ret = -1;

char *fp, *pin = NULL, *pass = NULL, *path, *pubpath;

const char *ext;

if (skprovider == NULL)

fatal("Cannot download keys without provider");

for (i = 0; i < 2; i++) {

if (i == 1) {

pin = read_passphrase("Enter PIN for authenticator: ",

RP_ALLOW_STDIN);

}

if ((r = sshsk_load_resident(skprovider, device, pin,

&keys, &nkeys)) != 0) {

if (i == 0 && r == SSH_ERR_KEY_WRONG_PASSPHRASE)

continue;

if (pin != NULL)

freezero(pin, strlen(pin));

error("Unable to load resident keys: %s", ssh_err(r));

return -1;

}

if (nkeys == 0)

logit("No keys to download");

if (pin != NULL)

freezero(pin, strlen(pin));

for (i = 0; i < nkeys; i++) {

if (keys[i]->type != KEY_ECDSA_SK &&

keys[i]->type != KEY_ED25519_SK) {

error("Unsupported key type %s (%d)",

sshkey_type(keys[i]), keys[i]->type);

continue;

}

if ((fp = sshkey_fingerprint(keys[i],

fingerprint_hash, SSH_FP_DEFAULT)) == NULL)

fatal("%s: sshkey_fingerprint failed", __func__);

debug("%s: key %zu: %s %s %s (flags 0x%02x)", __func__, i,

sshkey_type(keys[i]), fp, keys[i]->sk_application,

keys[i]->sk_flags);

ext = skip_ssh_url_preamble(keys[i]->sk_application);

xasprintf(&path, "id_%s_rk%s%s",

keys[i]->type == KEY_ECDSA_SK ? "ecdsa_sk" : "ed25519_sk",

*ext == '\0' ? "" : "_", ext);

/* If the file already exists, ask the user to confirm. */

if (!confirm_overwrite(path)) {

free(path);

break;

}

/* Save the key with the application string as the comment */

if (pass == NULL)

pass = private_key_passphrase();

if ((r = sshkey_save_private(keys[i], path, pass,

keys[i]->sk_application, private_key_format,

openssh_format_cipher, rounds)) != 0) {

error("Saving key \"%s\" failed: %s",

path, ssh_err(r));

free(path);

break;

}

if (!quiet) {

printf("Saved %s key%s%s to %s\n",

sshkey_type(keys[i]),

*ext != '\0' ? " " : "",

*ext != '\0' ? keys[i]->sk_application : "",

path);

}

/* Save public key too */

xasprintf(&pubpath, "%s.pub", path);

free(path);

if ((r = sshkey_save_public(keys[i], pubpath,

keys[i]->sk_application)) != 0) {

error("Saving public key \"%s\" failed: %s",

pubpath, ssh_err(r));

free(pubpath);

break;

}

free(pubpath);

}

if (i >= nkeys)

ret = 0; /* success */

if (pass != NULL)

freezero(pass, strlen(pass));

for (i = 0; i < nkeys; i++)

sshkey_free(keys[i]);

free(keys);

return ret;

}

static void

usage(void)

{

fprintf(stderr,

"usage: ssh-keygen [-q] [-b bits] [-t dsa | ecdsa | ed25519 | rsa]\n"

"usage: ssh-keygen [-q] [-a rounds] [-b bits] [-C comment] [-f output_keyfile]\n"

" [-N new_passphrase] [-C comment] [-f output_keyfile]\n"

" [-m format] [-N new_passphrase] [-O option]\n"

" ssh-keygen -p [-P old_passphrase] [-N new_passphrase] [-f keyfile]\n"

" ssh-keygen -i [-m key_format] [-f input_keyfile]\n"

" [-w provider]\n"

" ssh-keygen -e [-m key_format] [-f input_keyfile]\n"

" ssh-keygen -p [-a rounds] [-f keyfile] [-m format] [-N new_passphrase]\n"

" [-P old_passphrase]\n"

" ssh-keygen -i [-f input_keyfile] [-m key_format]\n"

" ssh-keygen -e [-f input_keyfile] [-m key_format]\n"

" ssh-keygen -y [-f input_keyfile]\n"

" ssh-keygen -c [-P passphrase] [-C comment] [-f keyfile]\n"

" ssh-keygen -c [-a rounds] [-C comment] [-f keyfile] [-P passphrase]\n"

" ssh-keygen -l [-v] [-E fingerprint_hash] [-f input_keyfile]\n"

" ssh-keygen -B [-f input_keyfile]\n");

#ifdef ENABLE_PKCS11

Line 2287

Line 3069

" ssh-keygen -D pkcs11\n");

#endif

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 -K [-a rounds] [-w provider]\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

" ssh-keygen -G output_file [-v] [-b bits] [-M memory] [-S start_point]\n"

" ssh-keygen -M generate [-O option] output_file\n"

" ssh-keygen -T output_file -f input_file [-v] [-a rounds] [-J num_lines]\n"

" ssh-keygen -M screen [-f input_file] [-O option] output_file\n"

" [-j start_line] [-K checkpt] [-W generator]\n"

#endif

" ssh-keygen -s ca_key -I certificate_identity [-h] [-U]\n"

" ssh-keygen -I certificate_identity -s ca_key [-hU] [-D pkcs11_provider]\n"

" [-D pkcs11_provider] [-n principals] [-O option]\n"

" [-n principals] [-O option] [-V validity_interval]\n"

" [-V validity_interval] [-z serial_number] file ...\n"

" [-z serial_number] file ...\n"

" ssh-keygen -L [-f input_keyfile]\n"

" ssh-keygen -A\n"

" ssh-keygen -A [-a rounds] [-f prefix_path]\n"

" ssh-keygen -k -f krl_file [-u] [-s ca_public] [-z version_number]\n"

" file ...\n"

" ssh-keygen -Q -f krl_file file ...\n");

" ssh-keygen -Q [-l] -f krl_file [file ...]\n"

" ssh-keygen -Y find-principals -s signature_file -f allowed_signers_file\n"

" ssh-keygen -Y check-novalidate -n namespace -s signature_file\n"

" ssh-keygen -Y sign -f key_file -n namespace file ...\n"

" ssh-keygen -Y verify -f allowed_signers_file -I signer_identity\n"

" -n namespace -s signature_file [-r revocation_file]\n");

exit(1);

}

Line 2313

Line 3100

int

main(int argc, char **argv)

{

char dotsshdir[PATH_MAX], comment[1024], *passphrase1, *passphrase2;

char comment[1024], *passphrase;

char *rr_hostname = NULL, *ep, *fp, *ra;

struct sshkey *private, *public;

struct passwd *pw;

struct stat st;

int r, opt, type;

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;

FILE *f;

int prefer_agent = 0, convert_to = 0, convert_from = 0;

int print_public = 0, print_generic = 0, cert_serial_autoinc = 0;

int do_gen_candidates = 0, do_screen_candidates = 0, download_sk = 0;

unsigned long long cert_serial = 0;

char *identity_comment = NULL, *ca_key_path = NULL, **opts = NULL;

char *sk_application = NULL, *sk_device = NULL, *sk_user = NULL;

char *sk_attestaion_path = NULL;

struct sshbuf *challenge = NULL, *attest = NULL;

size_t i, nopts = 0;

u_int32_t bits = 0;

uint8_t sk_flags = SSH_SK_USER_PRESENCE_REQD;

const char *errstr;

#ifdef WITH_OPENSSL

int log_level = SYSLOG_LEVEL_INFO;

/* Moduli generation/screening */

char *sign_op = NULL;

char out_file[PATH_MAX], *checkpoint = NULL;

u_int32_t memory = 0, generator_wanted = 0;

int do_gen_candidates = 0, do_screen_candidates = 0;

unsigned long start_lineno = 0, lines_to_process = 0;

BIGNUM *start = NULL;

#endif

extern int optind;

extern char *optarg;

ssh_malloc_init(); /* must be called before any mallocs */

/* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */

sanitise_stdfd();

#ifdef WITH_OPENSSL

OpenSSL_add_all_algorithms();

#endif

log_init(argv[0], SYSLOG_LEVEL_INFO, SYSLOG_FACILITY_USER, 1);

setlocale(LC_CTYPE, "");

Line 2347

Line 3140

pw = getpwuid(getuid());

if (!pw)

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));

/* Remaining characters: Ydw */

sk_provider = getenv("SSH_SK_PROVIDER");

while ((opt = getopt(argc, argv, "ABHLQUXceghiklopquvxy"

"C:D:E:F:G:I:J:K:M:N:O:P:R:S:T:V:W:Z:"

/* Remaining characters: dGjJSTWx */

"a:b:f:g:j:m:n:r:s:t:z:")) != -1) {

while ((opt = getopt(argc, argv, "ABHKLQUXceghiklopquvy"

"C:D:E:F:I:M:N:O:P:R:V:Y:Z:"

"a:b:f:g:m:n:r:s:t:w:z:")) != -1) {

switch (opt) {

case 'A':

gen_all_hostkeys = 1;

break;

case 'b':

bits = (u_int32_t)strtonum(optarg, 10, 32768, &errstr);

bits = (u_int32_t)strtonum(optarg, 1, UINT32_MAX,

&errstr);

if (errstr)

fatal("Bits has bad value %s (%s)",

optarg, errstr);

Line 2400

Line 3196

}

if (strcasecmp(optarg, "PKCS8") == 0) {

convert_format = FMT_PKCS8;

private_key_format = SSHKEY_PRIVATE_PKCS8;

break;

}

if (strcasecmp(optarg, "PEM") == 0) {

convert_format = FMT_PEM;

private_key_format = SSHKEY_PRIVATE_PEM;

break;

}

fatal("Unsupported conversion format \"%s\"", optarg);

Line 2411

Line 3209

cert_principals = optarg;

break;

case 'o':

use_new_format = 1;

/* no-op; new format is already the default */

break;

case 'p':

change_passphrase = 1;

Line 2428

Line 3226

case 'g':

print_generic = 1;

break;

case 'K':

download_sk = 1;

break;

case 'P':

identity_passphrase = optarg;

break;

Line 2438

Line 3239

check_krl = 1;

break;

case 'O':

add_cert_option(optarg);

opts = xrecallocarray(opts, nopts, nopts + 1,

sizeof(*opts));

opts[nopts++] = xstrdup(optarg);

break;

case 'Z':

new_format_cipher = optarg;

openssh_format_cipher = optarg;

break;

case 'C':

identity_comment = optarg;

Line 2450

Line 3253

quiet = 1;

break;

case 'e':

case 'x':

/* export key */

convert_to = 1;

break;

Line 2505

Line 3307

case 'V':

parse_cert_times(optarg);

break;

case 'Y':

sign_op = optarg;

break;

case 'w':

sk_provider = optarg;

break;

case 'z':

errno = 0;

if (*optarg == '+') {

cert_serial_autoinc = 1;

optarg++;

}

cert_serial = strtoull(optarg, &ep, 10);

if (*optarg < '0' || *optarg > '9' || *ep != '\0' ||

(errno == ERANGE && cert_serial == ULLONG_MAX))

fatal("Invalid serial number \"%s\"", optarg);

break;

#ifdef WITH_OPENSSL

/* Moduli generation/screening */

case 'G':

do_gen_candidates = 1;

if (strlcpy(out_file, optarg, sizeof(out_file)) >=

sizeof(out_file))

fatal("Output filename too long");

break;

case 'J':

lines_to_process = strtoul(optarg, NULL, 10);

break;

case 'j':

start_lineno = strtoul(optarg, NULL, 10);

break;

case 'K':

if (strlen(optarg) >= PATH_MAX)

fatal("Checkpoint filename too long");

checkpoint = xstrdup(optarg);

break;

case 'M':

memory = (u_int32_t)strtonum(optarg, 1, UINT_MAX,

if (strcmp(optarg, "generate") == 0)

&errstr);

do_gen_candidates = 1;

if (errstr)

else if (strcmp(optarg, "screen") == 0)

fatal("Memory limit is %s: %s", errstr, optarg);

do_screen_candidates = 1;

else

fatal("Unsupported moduli option %s", optarg);

break;

case 'S':

/* XXX - also compare length against bits */

if (BN_hex2bn(&start, optarg) == 0)

fatal("Invalid start point.");

break;

case 'T':

do_screen_candidates = 1;

if (strlcpy(out_file, optarg, sizeof(out_file)) >=

sizeof(out_file))

fatal("Output filename too long");

break;

case 'W':

generator_wanted = (u_int32_t)strtonum(optarg, 1,

UINT_MAX, &errstr);

if (errstr != NULL)

fatal("Desired generator invalid: %s (%s)",

optarg, errstr);

break;

#endif /* WITH_OPENSSL */

case '?':

default:

usage();

}

if (sk_provider == NULL)

sk_provider = "internal";

/* reinit */

log_init(argv[0], log_level, SYSLOG_FACILITY_USER, 1);

argv += optind;

argc -= optind;

if (sign_op != NULL) {

if (strncmp(sign_op, "find-principals", 15) == 0) {

if (ca_key_path == NULL) {

error("Too few arguments for find-principals:"

"missing signature file");

exit(1);

}

if (!have_identity) {

error("Too few arguments for find-principals:"

"missing allowed keys file");

exit(1);

}

return sig_find_principals(ca_key_path, identity_file);

} else if (strncmp(sign_op, "sign", 4) == 0) {

if (cert_principals == NULL ||

*cert_principals == '\0') {

error("Too few arguments for sign: "

"missing namespace");

exit(1);

}

if (!have_identity) {

error("Too few arguments for sign: "

"missing key");

exit(1);

}

return sig_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 sig_verify(ca_key_path, cert_principals,

NULL, NULL, NULL);

} else if (strncmp(sign_op, "verify", 6) == 0) {

if (cert_principals == NULL ||

*cert_principals == '\0') {

error("Too few arguments for verify: "

"missing namespace");

exit(1);

}

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 sig_verify(ca_key_path, cert_principals,

cert_key_id, identity_file, rr_hostname);

}

error("Unsupported operation for -Y: \"%s\"", sign_op);

usage();

/* NOTREACHED */

}

if (ca_key_path != NULL) {

if (argc < 1 && !gen_krl) {

error("Too few arguments.");

usage();

}

} else if (argc > 0 && !gen_krl && !check_krl) {

} else if (argc > 0 && !gen_krl && !check_krl &&

!do_gen_candidates && !do_screen_candidates) {

error("Too many arguments.");

usage();

}

Line 2585

Line 3430

error("Cannot use -l with -H or -R.");

usage();

}

#ifdef WITH_OPENSSL

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);

}

if (check_krl) {

do_check_krl(pw, argc, argv);

do_check_krl(pw, print_fingerprint, argc, argv);

return (0);

}

#endif

if (ca_key_path != NULL) {

if (cert_key_id == NULL)

fatal("Must specify key id (-I) when certifying");

do_ca_sign(pw, argc, argv);

for (i = 0; i < nopts; i++)

add_cert_option(opts[i]);

do_ca_sign(pw, ca_key_path, prefer_agent,

cert_serial, cert_serial_autoinc, argc, argv);

}

if (show_cert)

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)

do_download(pw);

if (download_sk) {

for (i = 0; i < nopts; i++) {

if (strncasecmp(opts[i], "device=", 7) == 0) {

sk_device = xstrdup(opts[i] + 7);

} else {

fatal("Option \"%s\" is unsupported for "

"FIDO authenticator download", opts[i]);

}

return do_download_sk(sk_provider, sk_device);

}

if (print_fingerprint || print_bubblebabble)

do_fingerprint(pw);

if (change_passphrase)

do_change_passphrase(pw);

if (change_comment)

do_change_comment(pw);

do_change_comment(pw, identity_comment);

#ifdef WITH_OPENSSL

if (convert_to)

do_convert_to(pw);

if (convert_from)

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)

do_print_public(pw);

if (rr_hostname != NULL) {

unsigned int n = 0;

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)

fatal("%s: %s", identity_file, strerror(errno));

exit(0);

} else {

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,

_PATH_HOST_DSA_KEY_FILE, rr_hostname);

_PATH_HOST_DSA_KEY_FILE, rr_hostname,

print_generic);

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,

_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);

_PATH_HOST_XMSS_KEY_FILE, rr_hostname,

print_generic);

if (n == 0)

fatal("no keys found.");

exit(0);

}

#ifdef WITH_OPENSSL

if (do_gen_candidates || do_screen_candidates) {

if (argc <= 0)

fatal("No output file specified");

else if (argc > 1)

fatal("Too many output files specified");

}

if (do_gen_candidates) {

FILE *out = fopen(out_file, "w");

do_moduli_gen(argv[0], opts, nopts);

return 0;

if (out == NULL) {

error("Couldn't open modulus candidate file \"%s\": %s",

out_file, strerror(errno));

return (1);

}

if (bits == 0)

bits = DEFAULT_BITS;

if (gen_candidates(out, memory, bits, start) != 0)

fatal("modulus candidate generation failed");

return (0);

}

if (do_screen_candidates) {

FILE *in;

do_moduli_screen(argv[0], opts, nopts);

FILE *out = fopen(out_file, "a");

return 0;

if (have_identity && strcmp(identity_file, "-") != 0) {

if ((in = fopen(identity_file, "r")) == NULL) {

fatal("Couldn't open modulus candidate "

"file \"%s\": %s", identity_file,

strerror(errno));

}

} else

in = stdin;

if (out == NULL) {

fatal("Couldn't open moduli file \"%s\": %s",

out_file, strerror(errno));

}

if (prime_test(in, out, rounds == 0 ? 100 : rounds,

generator_wanted, checkpoint,

start_lineno, lines_to_process) != 0)

fatal("modulus screening failed");

return (0);

}

#endif

if (gen_all_hostkeys) {

do_gen_all_hostkeys(pw);

Line 2703

Line 3544

if (!quiet)

printf("Generating public/private %s key pair.\n",

key_type_name);

if ((r = sshkey_generate(type, bits, &private)) != 0)

switch (type) {

fatal("sshkey_generate failed");

case KEY_ECDSA_SK:

case KEY_ED25519_SK:

for (i = 0; i < nopts; i++) {

if (strcasecmp(opts[i], "no-touch-required") == 0) {

sk_flags &= ~SSH_SK_USER_PRESENCE_REQD;

} else if (strcasecmp(opts[i], "verify-required") == 0) {

sk_flags |= SSH_SK_USER_VERIFICATION_REQD;

} else if (strcasecmp(opts[i], "resident") == 0) {

sk_flags |= SSH_SK_RESIDENT_KEY;

} else if (strncasecmp(opts[i], "device=", 7) == 0) {

sk_device = xstrdup(opts[i] + 7);

} else if (strncasecmp(opts[i], "user=", 5) == 0) {

sk_user = xstrdup(opts[i] + 5);

} else if (strncasecmp(opts[i], "challenge=", 10) == 0) {

if ((r = sshbuf_load_file(opts[i] + 10,

&challenge)) != 0) {

fatal("Unable to load FIDO enrollment "

"challenge \"%s\": %s",

opts[i] + 10, ssh_err(r));

}

} else if (strncasecmp(opts[i],

"write-attestation=", 18) == 0) {

sk_attestaion_path = opts[i] + 18;

} else if (strncasecmp(opts[i],

"application=", 12) == 0) {

sk_application = xstrdup(opts[i] + 12);

if (strncmp(sk_application, "ssh:", 4) != 0) {

fatal("FIDO application string must "

"begin with \"ssh:\"");

}

} else {

fatal("Option \"%s\" is unsupported for "

"FIDO authenticator enrollment", opts[i]);

}

if (!quiet) {

printf("You may need to touch your authenticator "

"to authorize key generation.\n");

}

passphrase = NULL;

if ((attest = sshbuf_new()) == NULL)

fatal("sshbuf_new failed");

for (i = 0 ; ; i++) {

fflush(stdout);

r = sshsk_enroll(type, sk_provider, sk_device,

sk_application == NULL ? "ssh:" : sk_application,

sk_user, sk_flags, passphrase, challenge,

&private, attest);

if (r == 0)

break;

if (r != SSH_ERR_KEY_WRONG_PASSPHRASE)

fatal("Key enrollment failed: %s", ssh_err(r));

else if (i > 0)

error("PIN incorrect");

if (passphrase != NULL) {

freezero(passphrase, strlen(passphrase));

passphrase = NULL;

}

if (i >= 3)

fatal("Too many incorrect PINs");

passphrase = read_passphrase("Enter PIN for "

"authenticator: ", RP_ALLOW_STDIN);

if (!quiet) {

printf("You may need to touch your "

"authenticator (again) to authorize "

"key generation.\n");

}

if (passphrase != NULL) {

freezero(passphrase, strlen(passphrase));

passphrase = NULL;

}

break;

default:

if ((r = sshkey_generate(type, bits, &private)) != 0)

fatal("sshkey_generate failed");

break;

}

if ((r = sshkey_from_private(private, &public)) != 0)

fatal("sshkey_from_private failed: %s\n", ssh_err(r));

Line 2712

Line 3630

ask_filename(pw, "Enter file in which to save the key");

/* Create ~/.ssh directory if it doesn't already exist. */

snprintf(dotsshdir, sizeof dotsshdir, "%s/%s",

hostfile_create_user_ssh_dir(identity_file, !quiet);

pw->pw_dir, _PATH_SSH_USER_DIR);

if (strstr(identity_file, dotsshdir) != NULL) {

if (stat(dotsshdir, &st) < 0) {

if (errno != ENOENT) {

error("Could not stat %s: %s", dotsshdir,

strerror(errno));

} else if (mkdir(dotsshdir, 0700) < 0) {

error("Could not create directory '%s': %s",

dotsshdir, strerror(errno));

} else if (!quiet)

printf("Created directory '%s'.\n", dotsshdir);

}

/* 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). */

if (identity_passphrase)

passphrase1 = xstrdup(identity_passphrase);

else if (identity_new_passphrase)

passphrase1 = xstrdup(identity_new_passphrase);

else {

passphrase_again:

passphrase1 =

read_passphrase("Enter passphrase (empty for no "

"passphrase): ", RP_ALLOW_STDIN);

passphrase2 = read_passphrase("Enter same passphrase again: ",

RP_ALLOW_STDIN);

if (strcmp(passphrase1, passphrase2) != 0) {

* The passphrases do not match. Clear them and

* retry.

explicit_bzero(passphrase1, strlen(passphrase1));

explicit_bzero(passphrase2, strlen(passphrase2));

free(passphrase1);

free(passphrase2);

printf("Passphrases do not match. Try again.\n");

goto passphrase_again;

}

/* Clear the other copy of the passphrase. */

explicit_bzero(passphrase2, strlen(passphrase2));

free(passphrase2);

}

/* Determine the passphrase for the private key */

passphrase = private_key_passphrase();

if (identity_comment) {

strlcpy(comment, identity_comment, sizeof(comment));

} else {

Line 2774

Line 3646

}

/* 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, passphrase,

comment, use_new_format, new_format_cipher, rounds)) != 0) {

comment, private_key_format, openssh_format_cipher, rounds)) != 0) {

error("Saving key \"%s\" failed: %s",

identity_file, ssh_err(r));

explicit_bzero(passphrase1, strlen(passphrase1));

freezero(passphrase, strlen(passphrase));

free(passphrase1);

exit(1);

}

/* Clear the passphrase. */

freezero(passphrase, strlen(passphrase));

explicit_bzero(passphrase1, strlen(passphrase1));

free(passphrase1);

/* Clear the private key and the random number generator. */

sshkey_free(private);

if (!quiet)

if (!quiet) {

printf("Your identification has been saved in %s.\n", identity_file);

printf("Your identification has been saved in %s\n",

identity_file);

}

strlcat(identity_file, ".pub", sizeof(identity_file));

if ((fd = open(identity_file, O_WRONLY|O_CREAT|O_TRUNC, 0644)) == -1)

if ((r = sshkey_save_public(public, identity_file, comment)) != 0) {

fatal("Unable to save public key to %s: %s",

identity_file, strerror(errno));

identity_file, ssh_err(r));

if ((f = fdopen(fd, "w")) == NULL)

}

fatal("fdopen %s failed: %s", identity_file, strerror(errno));

if ((r = sshkey_write(public, f)) != 0)

error("write key failed: %s", ssh_err(r));

fprintf(f, " %s\n", comment);

if (ferror(f) || fclose(f) != 0)

fatal("write public failed: %s", strerror(errno));

if (!quiet) {

fp = sshkey_fingerprint(public, fingerprint_hash,

Line 2811

Line 3674

SSH_FP_RANDOMART);

if (fp == NULL || ra == NULL)

fatal("sshkey_fingerprint failed");

printf("Your public key has been saved in %s.\n",

printf("Your public key has been saved in %s\n",

identity_file);

printf("The key fingerprint is:\n");

printf("%s %s\n", fp, comment);

Line 2821

Line 3684

free(fp);

}

if (sk_attestaion_path != NULL) {

if (attest == NULL || sshbuf_len(attest) == 0) {

fatal("Enrollment did not return attestation "

"certificate");

}

if ((r = sshbuf_write_file(sk_attestaion_path, attest)) != 0) {

fatal("Unable to write attestation certificate "

"\"%s\": %s", sk_attestaion_path, ssh_err(r));

}

if (!quiet) {

printf("Your FIDO attestation certificate has been "

"saved in %s\n", sk_attestaion_path);

}

sshbuf_free(attest);

sshkey_free(public);

exit(0);

}