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.356 and 1.384

version 1.356, 2019/10/16 06:03:30

version 1.384, 2020/01/21 11:06:09

Line 29

#include <stdio.h>

#include <stdlib.h>

#include <string.h>

#include <stdarg.h>

#include <unistd.h>

#include <limits.h>

#include <locale.h>

Line 52

Line 53

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

Line 114

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)

static u_int32_t certflags_flags = CERTOPT_DEFAULT;

Line 143

Line 147

/* Load key from this PKCS#11 provider */

static char *pkcs11provider = NULL;

/* FIDO/U2F provider to use */

static char *sk_provider = NULL;

/* Format for writing private keys */

static int private_key_format = SSHKEY_PRIVATE_OPENSSH;

/* Cipher for new-format private keys */

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.

static int rounds = 0;

/* argv0 */

Line 257

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 265

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 553

Line 565

error("%s: remaining bytes in key blob %d", __func__, rlen);

/* 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, 0) != 0 ||

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

NULL, 0, NULL) != 0) {

sshkey_free(key);

free(sig);

return NULL;

Line 1630

Line 1644

(certflags_flags & CERTOPT_USER_RC) != 0)

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

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

(certflags_flags & CERTOPT_NO_REQUIRE_USER_PRESENCE) != 0)

add_flag_option(c, "no-touch-required");

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

certflags_src_addr != NULL)

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

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

Line 1679

Line 1696

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)

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

{

int *agent_fdp = (int *)ctx;

Line 1695

Line 1712

int r, i, fd, 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;

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

FILE *f;

struct ssh_identitylist *agent_ids;

size_t j;

struct notifier_ctx *notifier = NULL;

#ifdef ENABLE_PKCS11

pkcs11_init(1);

Line 1744

Line 1763

fatal("CA key type %s doesn't match specified %s",

sshkey_ssh_name(ca), key_type_name);

}

ca_fp = sshkey_fingerprint(ca, fingerprint_hash, SSH_FP_DEFAULT);

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

/* Split list of principals */

Line 1765

Line 1785

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 1791

Line 1809

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

notify_complete(notifier);

if (r != 0)

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

tmp, ssh_err(r));

}

Line 1833

Line 1861

if (cert_serial_autoinc)

cert_serial++;

}

free(ca_fp);

#ifdef ENABLE_PKCS11

pkcs11_terminate();

#endif

Line 1931

Line 1960

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 1984

Line 2017

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 2111

Line 2145

exit(ok ? 0 : 1);

}

#ifdef WITH_OPENSSL

static void

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

{

Line 2406

Line 2439

ssh_krl_free(krl);

exit(ret);

}

#endif

static struct sshkey *

load_sign_key(const char *keypath, const struct sshkey *pubkey)

Line 2470

Line 2502

{

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

int r = SSH_ERR_INTERNAL_ERROR, wfd = -1, oerrno;

char *wfile = NULL;

char *wfile = NULL, *asig = NULL, *fp = NULL;

char *asig = NULL;

if (!quiet) {

if (fd == STDIN_FILENO)

Line 2479

Line 2510

else

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

}

if ((r = sshsig_sign_fd(signkey, NULL, fd, sig_namespace,

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

(signkey->sk_flags & SSH_SK_USER_PRESENCE_REQD)) {

if ((fp = sshkey_fingerprint(signkey, fingerprint_hash,

SSH_FP_DEFAULT)) == NULL)

fatal("%s: sshkey_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, fd, sig_namespace,

&sigbuf, signer, signer_ctx)) != 0) {

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

goto out;

Line 2615

Line 2655

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 ((abuf = sshbuf_new()) == NULL)

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

Line 2633

Line 2675

return r;

}

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

&sign_key)) != 0)

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

Line 2684

Line 2730

sshbuf_free(sigbuf);

sshbuf_free(abuf);

sshkey_free(sign_key);

sshkey_sig_details_free(sig_details);

free(fp);

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

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

const char *ext;

if (skprovider == NULL)

fatal("Cannot download keys without provider");

pin = read_passphrase("Enter PIN for security key: ", RP_ALLOW_STDIN);

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

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

freezero(pin, strlen(pin));

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

return -1;

}

if (nkeys == 0)

logit("No keys to download");

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

free(pubpath);

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

pubpath, ssh_err(r));

break;

}

free(pubpath);

}

if (i >= nkeys)

ok = 0; /* success */

if (pass != NULL)

freezero(pass, strlen(pass));

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

sshkey_free(keys[i]);

free(keys);

return ok ? 0 : -1;

}

static void

usage(void)

{

fprintf(stderr,

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

" [-N new_passphrase] [-t dsa | ecdsa | ed25519 | rsa]\n"

" [-N new_passphrase] [-O option] [-w provider]\n"

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

" [-P old_passphrase]\n"

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

Line 2709

Line 3005

fprintf(stderr,

" ssh-keygen -F hostname [-lv] [-f known_hosts_file]\n"

" ssh-keygen -H [-f known_hosts_file]\n"

" ssh-keygen -K [-w provider]\n"

" ssh-keygen -R hostname [-f known_hosts_file]\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 -f input_file -T output_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 -I certificate_identity -s ca_key [-hU] [-D pkcs11_provider]\n"

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

Line 2737

Line 3033

int

main(int argc, char **argv)

{

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

char dotsshdir[PATH_MAX], comment[1024], *passphrase;

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

struct sshkey *private, *public;

struct passwd *pw;

struct stat st;

int r, opt, type, fd;

int r, opt, type;

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

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

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

size_t i, nopts = 0;

u_int32_t bits = 0;

FILE *f;

uint8_t sk_flags = SSH_SK_USER_PRESENCE_REQD;

const char *errstr;

int log_level = SYSLOG_LEVEL_INFO;

char *sign_op = NULL;

#ifdef WITH_OPENSSL

/* Moduli generation/screening */

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;

Line 2784

Line 3075

if (gethostname(hostname, sizeof(hostname)) == -1)

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

/* Remaining characters: dw */

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:Y: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;

Line 2865

Line 3158

case 'g':

print_generic = 1;

break;

case 'K':

download_sk = 1;

break;

case 'P':

identity_passphrase = optarg;

break;

Line 2875

Line 3171

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':

openssh_format_cipher = optarg;

Line 2887

Line 3185

quiet = 1;

break;

case 'e':

case 'x':

/* export key */

convert_to = 1;

break;

Line 2945

Line 3242

case 'Y':

sign_op = optarg;

break;

case 'w':

sk_provider = optarg;

break;

case 'z':

errno = 0;

if (*optarg == '+') {

Line 2956

Line 3256

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

Line 3061

Line 3328

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 3073

Line 3341

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

usage();

}

#ifdef WITH_OPENSSL

if (gen_krl) {

do_gen_krl(pw, update_krl, ca_key_path,

cert_serial, identity_comment, argc, argv);

Line 3083

Line 3350

do_check_krl(pw, argc, argv);

return (0);

}

#endif

if (ca_key_path != NULL) {

if (cert_key_id == NULL)

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

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

}

Line 3098

Line 3366

}

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)

Line 3147

Line 3426

}

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

Line 3455

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

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

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

} else {

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

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

}

if (!quiet) {

printf("You may need to touch your security key "

"to authorize key generation.\n");

}

passphrase = NULL;

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

fflush(stdout);

r = sshsk_enroll(type, sk_provider, sk_device,

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

sk_user, sk_flags, passphrase, NULL,

&private, NULL);

if (r == 0)

break;

if (r != SSH_ERR_KEY_WRONG_PASSPHRASE)

exit(1); /* error message already printed */

if (passphrase != NULL)

freezero(passphrase, strlen(passphrase));

passphrase = read_passphrase("Enter PIN for security "

"key: ", RP_ALLOW_STDIN);

}

if (passphrase != NULL)

freezero(passphrase, strlen(passphrase));

if (i > 3)

fatal("Too many incorrect PINs");

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 3229

Line 3529

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

if (!confirm_overwrite(identity_file))

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 3266

Line 3540

}

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

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,