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.418 and 1.469

version 1.418, 2020/08/27 01:08:45

version 1.469, 2023/07/14 05:31:44

Line 26

#include <fcntl.h>

#include <netdb.h>

#include <pwd.h>

#include <stdarg.h>

#include <stdio.h>

#include <stdlib.h>

#include <string.h>

#include <stdarg.h>

#include <unistd.h>

#include <limits.h>

#include <locale.h>

Line 55

#include "sshsig.h"

#include "ssh-sk.h"

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

#include "cipher.h"

#ifdef ENABLE_PKCS11

#include "ssh-pkcs11.h"

Line 120

Line 121

#define CERTOPT_PTY (1<<3)

#define CERTOPT_USER_RC (1<<4)

#define CERTOPT_NO_REQUIRE_USER_PRESENCE (1<<5)

#define CERTOPT_REQUIRE_VERIFY (1<<6)

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

Line 180

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

if (*bitsp == 0) {

#ifdef WITH_OPENSSL

u_int nid;

int nid;

switch(type) {

case KEY_DSA:

Line 309

Line 311

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

fatal_r(r, "Load key \"%s\"", filename);

if (identity_passphrase)

pass = xstrdup(identity_passphrase);

else

Line 317

Line 319

r = sshkey_load_private(filename, pass, &prv, commentp);

freezero(pass, strlen(pass));

if (r != 0)

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

fatal_r(r, "Load key \"%s\"", filename);

return prv;

}

Line 335

Line 337

int r;

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

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

fatal_f("sshbuf_new failed");

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

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

fatal_fr(r, "put key");

if ((b64 = sshbuf_dtob64_string(b, 1)) == NULL)

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

fatal_f("sshbuf_dtob64_string failed");

/* Comment + surrounds must fit into 72 chars (RFC 4716 sec 3.3) */

snprintf(comment, sizeof(comment),

Line 374

Line 376

fatal("PEM_write_EC_PUBKEY failed");

break;

default:

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

fatal_f("unsupported key type %s", sshkey_type(k));

}

exit(0);

}

Line 396

Line 398

fatal("PEM_write_EC_PUBKEY failed");

break;

default:

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

fatal_f("unsupported key type %s", sshkey_type(k));

}

exit(0);

}

Line 425

Line 427

do_convert_to_pem(k);

break;

default:

fatal("%s: unknown key format %d", __func__, convert_format);

fatal_f("unknown key format %d", convert_format);

}

exit(0);

}

Line 441

Line 443

int r;

if ((r = sshbuf_get_u32(b, &bignum_bits)) != 0)

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

fatal_fr(r, "parse");

bytes = (bignum_bits + 7) / 8;

if (sshbuf_len(b) < bytes)

fatal("%s: input buffer too small: need %d have %zu",

fatal_f("input buffer too small: need %d have %zu",

__func__, bytes, sshbuf_len(b));

bytes, sshbuf_len(b));

if (BN_bin2bn(sshbuf_ptr(b), bytes, value) == NULL)

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

fatal_f("BN_bin2bn failed");

if ((r = sshbuf_consume(b, bytes)) != 0)

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

fatal_fr(r, "consume");

}

static struct sshkey *

Line 457

Line 459

{

struct sshkey *key = NULL;

char *type, *cipher;

const char *alg = NULL;

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

int r, rlen, ktype;

u_int magic, i1, i2, i3, i4;

Line 468

Line 471

BIGNUM *rsa_p = NULL, *rsa_q = NULL, *rsa_iqmp = NULL;

if ((r = sshbuf_get_u32(b, &magic)) != 0)

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

fatal_fr(r, "parse magic");

if (magic != SSH_COM_PRIVATE_KEY_MAGIC) {

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

Line 481

Line 484

(r = sshbuf_get_u32(b, &i2)) != 0 ||

(r = sshbuf_get_u32(b, &i3)) != 0 ||

(r = sshbuf_get_u32(b, &i4)) != 0)

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

fatal_fr(r, "parse");

debug("ignore (%d %d %d %d)", i1, i2, i3, i4);

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

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

Line 510

Line 513

(dsa_g = BN_new()) == NULL ||

(dsa_pub_key = BN_new()) == NULL ||

(dsa_priv_key = BN_new()) == NULL)

fatal("%s: BN_new", __func__);

fatal_f("BN_new");

buffer_get_bignum_bits(b, dsa_p);

buffer_get_bignum_bits(b, dsa_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__);

fatal_f("DSA_set0_pqg failed");

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

fatal_f("DSA_set0_key failed");

dsa_pub_key = dsa_priv_key = NULL; /* transferred */

break;

case KEY_RSA:

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

(e1 < 30 && (r = sshbuf_get_u8(b, &e2)) != 0) ||

(e1 < 30 && (r = sshbuf_get_u8(b, &e3)) != 0))

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

fatal_fr(r, "parse RSA");

e = e1;

debug("e %lx", e);

if (e < 30) {

Line 539

Line 542

debug("e %lx", e);

}

if ((rsa_e = BN_new()) == NULL)

fatal("%s: BN_new", __func__);

fatal_f("BN_new");

if (!BN_set_word(rsa_e, e)) {

BN_clear_free(rsa_e);

sshkey_free(key);

Line 550

Line 553

(rsa_p = BN_new()) == NULL ||

(rsa_q = BN_new()) == NULL ||

(rsa_iqmp = BN_new()) == NULL)

fatal("%s: BN_new", __func__);

fatal_f("BN_new");

buffer_get_bignum_bits(b, rsa_d);

buffer_get_bignum_bits(b, rsa_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__);

fatal_f("RSA_set0_key failed");

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

fatal_f("RSA_set0_factors failed");

rsa_p = rsa_q = NULL; /* transferred */

if ((r = ssh_rsa_complete_crt_parameters(key, rsa_iqmp)) != 0)

fatal("generate RSA parameters failed: %s", ssh_err(r));

fatal_fr(r, "generate RSA parameters");

BN_clear_free(rsa_iqmp);

alg = "rsa-sha2-256";

break;

}

rlen = sshbuf_len(b);

if (rlen != 0)

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

error_f("remaining bytes in key blob %d", rlen);

/* try the key */

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

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

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

alg, NULL, NULL, 0)) != 0)

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

error_fr(r, "signing with converted key failed");

NULL, 0, NULL) != 0) {

else if ((r = sshkey_verify(key, sig, slen, data, sizeof(data),

alg, 0, NULL)) != 0)

error_fr(r, "verification with converted key failed");

if (r != 0) {

sshkey_free(key);

free(sig);

return NULL;

Line 652

Line 659

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

encoded[len-3] = '\0';

if ((r = sshbuf_b64tod(buf, encoded)) != 0)

fatal("%s: base64 decoding failed: %s", __func__, ssh_err(r));

fatal_fr(r, "base64 decode");

if (*private) {

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

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

fatal_f("private key conversion failed");

} else if ((r = sshkey_fromb(buf, k)) != 0)

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

fatal_fr(r, "parse key");

sshbuf_free(buf);

fclose(fp);

}

Line 671

Line 678

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

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

if ((pubkey = PEM_read_PUBKEY(fp, NULL, NULL, NULL)) == NULL) {

fatal("%s: %s is not a recognised public key format", __func__,

fatal_f("%s is not a recognised public key format",

identity_file);

}

fclose(fp);

Line 696

Line 703

(*k)->ecdsa_nid = sshkey_ecdsa_key_to_nid((*k)->ecdsa);

break;

default:

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

fatal_f("unsupported pubkey type %d",

EVP_PKEY_base_id(pubkey));

}

EVP_PKEY_free(pubkey);

Line 719

Line 726

fclose(fp);

return;

}

fatal("%s: unrecognised raw private key format", __func__);

fatal_f("unrecognised raw private key format");

}

static void

Line 745

Line 752

do_convert_from_pem(&k, &private);

break;

default:

fatal("%s: unknown key format %d", __func__, convert_format);

fatal_f("unknown key format %d", convert_format);

}

if (!private) {

Line 768

Line 775

NULL, 0, NULL, NULL);

break;

default:

fatal("%s: unsupported key type %s", __func__,

fatal_f("unsupported key type %s", sshkey_type(k));

sshkey_type(k));

}

Line 794

Line 800

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

prv = load_identity(identity_file, &comment);

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

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

fatal_fr(r, "write key");

sshkey_free(prv);

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

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

fprintf(stdout, "\n");

if (sshkey_is_sk(prv)) {

debug("sk_application: \"%s\", sk_flags 0x%02x",

prv->sk_application, prv->sk_flags);

}

sshkey_free(prv);

free(comment);

exit(0);

}

Line 826

Line 836

ra = sshkey_fingerprint(keys[i], fingerprint_hash,

SSH_FP_RANDOMART);

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

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

fatal_f("sshkey_fingerprint fail");

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

fp, sshkey_type(keys[i]));

if (log_level_get() >= SYSLOG_LEVEL_VERBOSE)

Line 877

Line 887

fp = sshkey_fingerprint(public, fptype, rep);

ra = sshkey_fingerprint(public, fingerprint_hash, SSH_FP_RANDOMART);

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

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

fatal_f("sshkey_fingerprint failed");

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

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

if (log_level_get() >= SYSLOG_LEVEL_VERBOSE)

Line 897

Line 907

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

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

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

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

debug_r(r, "load public \"%s\"", path);

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

free(comment);

if ((r = sshkey_load_private(path, NULL,

&privkey, &comment)) != 0)

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

debug_r(r, "load private \"%s\"", path);

}

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

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

Line 966

Line 976

* accept a public key prefixed with a hostname or options.

* Try a bare key first, otherwise skip the leading stuff.

comment = NULL;

if ((public = try_read_key(&cp)) == NULL) {

i = strtol(cp, &ep, 10);

if (i == 0 || ep == NULL ||

Line 1019

Line 1030

} key_types[] = {

#ifdef WITH_OPENSSL

{ "rsa", "RSA" ,_PATH_HOST_RSA_KEY_FILE },

{ "dsa", "DSA", _PATH_HOST_DSA_KEY_FILE },

{ "ecdsa", "ECDSA",_PATH_HOST_ECDSA_KEY_FILE },

#endif /* WITH_OPENSSL */

{ "ed25519", "ED25519",_PATH_HOST_ED25519_KEY_FILE },

Line 1080

Line 1090

bits = 0;

type_bits_valid(type, NULL, &bits);

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

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

error_r(r, "sshkey_generate failed");

goto failnext;

}

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

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

fatal_fr(r, "sshkey_from_private");

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

hostname);

if ((r = sshkey_save_private(private, prv_tmp, "",

comment, private_key_format, openssh_format_cipher,

rounds)) != 0) {

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

error_r(r, "Saving key \"%s\" failed", prv_tmp);

prv_tmp, ssh_err(r));

goto failnext;

}

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

Line 1102

Line 1111

(void)fchmod(fd, 0644);

(void)close(fd);

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

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

error_r(r, "Unable to save public key to %s",

identity_file, ssh_err(r));

identity_file);

goto failnext;

}

Line 1155

Line 1164

case HKF_STATUS_OK:

case HKF_STATUS_MATCHED:

* Don't hash hosts already already hashed, with wildcard

* Don't hash hosts already hashed, with wildcard

* characters or a CA/revocation marker.

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

Line 1177

Line 1186

if ((hashed = host_hash(cp, NULL, 0)) == NULL)

fatal("hash_host failed");

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

free(hashed);

ctx->has_unhashed = 1;

}

free(ohosts);

Line 1237

Line 1247

ra = sshkey_fingerprint(l->key,

fingerprint_hash, SSH_FP_RANDOMART);

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

fatal("%s: sshkey_fingerprint failed",

fatal_f("sshkey_fingerprint failed");

__func__);

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

sshkey_type(l->key), fp,

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

Line 1308

Line 1317

unlink(tmp);

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

}

fchmod(fd, sb.st_mode & 0644);

(void)fchmod(fd, sb.st_mode & 0644);

inplace = 1;

}

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

Line 1316

Line 1325

foreach_options |= print_fingerprint ? HKF_WANT_PARSE_KEY : 0;

if ((r = hostkeys_foreach(identity_file, (find_host || !hash_hosts) ?

known_hosts_find_delete : known_hosts_hash, &ctx, name, NULL,

foreach_options)) != 0) {

foreach_options, 0)) != 0) {

if (inplace)

unlink(tmp);

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

fatal_fr(r, "hostkeys_foreach");

}

if (inplace)

Line 1398

Line 1407

goto badkey;

} else if (r != 0) {

badkey:

fatal("Failed to load key %s: %s", identity_file, ssh_err(r));

fatal_r(r, "Failed to load key %s", identity_file);

}

if (comment)

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

Line 1430

Line 1439

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

if ((r = sshkey_save_private(private, identity_file, passphrase1,

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

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

error_r(r, "Saving key \"%s\" failed", identity_file);

identity_file, ssh_err(r));

freezero(passphrase1, strlen(passphrase1));

sshkey_free(private);

free(comment);

Line 1451

Line 1459

static int

do_print_resource_record(struct passwd *pw, char *fname, char *hname,

int print_generic)

int print_generic, char * const *opts, size_t nopts)

{

struct sshkey *public;

char *comment = NULL;

struct stat st;

int r;

int r, hash = -1;

size_t i;

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

if (strncasecmp(opts[i], "hashalg=", 8) == 0) {

if ((hash = ssh_digest_alg_by_name(opts[i] + 8)) == -1)

fatal("Unsupported hash algorithm");

} else {

error("Invalid option \"%s\"", opts[i]);

return SSH_ERR_INVALID_ARGUMENT;

}

if (fname == NULL)

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

fatal_f("no filename");

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

if (errno == ENOENT)

return 0;

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

}

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

fatal("Failed to read v2 public key from \"%s\": %s.",

fatal_r(r, "Failed to read v2 public key from \"%s\"", fname);

fname, ssh_err(r));

export_dns_rr(hname, public, stdout, print_generic, hash);

export_dns_rr(hname, public, stdout, print_generic);

sshkey_free(public);

free(comment);

return 1;

Line 1494

Line 1511

&private, &comment)) == 0)

passphrase = xstrdup("");

else if (r != SSH_ERR_KEY_WRONG_PASSPHRASE)

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

fatal_r(r, "Cannot load private key \"%s\"", identity_file);

identity_file, ssh_err(r));

else {

if (identity_passphrase)

passphrase = xstrdup(identity_passphrase);

Line 1508

Line 1524

if ((r = sshkey_load_private(identity_file, passphrase,

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

freezero(passphrase, strlen(passphrase));

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

fatal_r(r, "Cannot load private key \"%s\"",

identity_file, ssh_err(r));

identity_file);

}

Line 1550

Line 1566

if ((r = sshkey_save_private(private, identity_file, passphrase,

new_comment, private_key_format, openssh_format_cipher,

rounds)) != 0) {

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

error_r(r, "Saving key \"%s\" failed", identity_file);

identity_file, ssh_err(r));

freezero(passphrase, strlen(passphrase));

sshkey_free(private);

free(comment);

Line 1559

Line 1574

}

freezero(passphrase, strlen(passphrase));

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

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

fatal_fr(r, "sshkey_from_private");

sshkey_free(private);

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

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

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

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

fatal_r(r, "Unable to save public key to %s", identity_file);

identity_file, ssh_err(r));

}

sshkey_free(public);

free(comment);

Line 1618

Line 1631

const struct cert_ext *ext;

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

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

fatal_f("sshbuf_new failed");

sshbuf_reset(c);

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

ext = &cert_ext[i];

Line 1627

Line 1640

continue;

if (ext->val == NULL) {

/* flag option */

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

debug3_f("%s", ext->key);

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

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

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

fatal_fr(r, "prepare flag");

} else {

/* key/value option */

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

debug3_f("%s=%s", ext->key, ext->val);

sshbuf_reset(b);

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

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

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

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

fatal_fr(r, "prepare k/v");

}

sshbuf_free(b);

Line 1652

Line 1665

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

if (certflags_src_addr != NULL)

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

if ((certflags_flags & CERTOPT_REQUIRE_VERIFY) != 0)

cert_ext_add("verify-required", NULL, 1);

/* extensions */

if ((certflags_flags & CERTOPT_X_FWD) != 0)

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

Line 1678

Line 1693

int r, i, nkeys;

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

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

fatal_r(r, "Couldn't load CA public key \"%s\"", path);

path, ssh_err(r));

nkeys = pkcs11_add_provider(pkcs11provider, identity_passphrase,

&keys, NULL);

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

debug3_f("%d keys", nkeys);

if (nkeys <= 0)

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

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

Line 1743

Line 1757

* agent.

if ((r = sshkey_load_public(tmp, &ca, NULL)) != 0)

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

fatal_r(r, "Cannot load CA public key %s", tmp);

tmp, ssh_err(r));

if ((r = ssh_get_authentication_socket(&agent_fd)) != 0)

fatal("Cannot use public key for CA signature: %s",

fatal_r(r, "Cannot use public key for CA signature");

ssh_err(r));

if ((r = ssh_fetch_identitylist(agent_fd, &agent_ids)) != 0)

fatal("Retrieve agent key list: %s", ssh_err(r));

fatal_r(r, "Retrieve agent key list");

found = 0;

for (j = 0; j < agent_ids->nkeys; j++) {

if (sshkey_equal(ca, agent_ids->keys[j])) {

Line 1768

Line 1780

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

fatal_f("couldn't read PIN");

}

free(tmp);

Line 1803

Line 1815

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

fatal_r(r, "load pubkey \"%s\"", tmp);

__func__, tmp, ssh_err(r));

if (sshkey_is_cert(public))

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

fatal_f("key \"%s\" type %s cannot be certified",

__func__, tmp, sshkey_type(public));

tmp, sshkey_type(public));

/* Prepare certificate to sign */

if ((r = sshkey_to_certified(public)) != 0)

fatal("Could not upgrade key %s to certificate: %s",

fatal_r(r, "Could not upgrade key %s to certificate", tmp);

tmp, ssh_err(r));

public->cert->type = cert_key_type;

public->cert->serial = (u_int64_t)cert_serial;

public->cert->key_id = xstrdup(cert_key_id);

Line 1825

Line 1835

OPTIONS_EXTENSIONS);

if ((r = sshkey_from_private(ca,

&public->cert->signature_key)) != 0)

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

fatal_r(r, "sshkey_from_private (ca key)");

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

if ((r = sshkey_certify_custom(public, ca,

key_type_name, sk_provider, NULL, agent_signer,

&agent_fd)) != 0)

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

fatal_r(r, "Couldn't certify %s via agent", tmp);

tmp, ssh_err(r));

} else {

if (sshkey_is_sk(ca) &&

(ca->sk_flags & SSH_SK_USER_PRESENCE_REQD)) {

Line 1842

Line 1851

}

r = sshkey_certify(public, ca, key_type_name,

sk_provider, pin);

notify_complete(notifier);

notify_complete(notifier, "User presence confirmed");

if (r != 0)

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

fatal_r(r, "Couldn't certify key %s", tmp);

tmp, ssh_err(r));

}

if ((cp = strrchr(tmp, '.')) != NULL && strcmp(cp, ".pub") == 0)

Line 1854

Line 1862

free(tmp);

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

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

fatal_r(r, "Unable to save public key to %s",

identity_file, ssh_err(r));

identity_file);

}

if (!quiet) {

Line 1899

Line 1907

}

static void

parse_hex_u64(const char *s, uint64_t *up)

{

char *ep;

unsigned long long ull;

errno = 0;

ull = strtoull(s, &ep, 16);

if (*s == '\0' || *ep != '\0')

fatal("Invalid certificate time: not a number");

if (errno == ERANGE && ull == ULONG_MAX)

fatal_fr(SSH_ERR_SYSTEM_ERROR, "Invalid certificate time");

*up = (uint64_t)ull;

}

static void

parse_cert_times(char *timespec)

{

char *from, *to;

Line 1920

Line 1943

* from:to, where

* from := [+-]timespec | YYYYMMDD | YYYYMMDDHHMMSS | "always"

* from := [+-]timespec | YYYYMMDD | YYYYMMDDHHMMSS | 0x... | "always"

* to := [+-]timespec | YYYYMMDD | YYYYMMDDHHMMSS | "forever"

* to := [+-]timespec | YYYYMMDD | YYYYMMDDHHMMSS | 0x... | "forever"

from = xstrdup(timespec);

to = strchr(from, ':');

Line 1933

Line 1956

cert_valid_from = parse_relative_time(from, now);

else if (strcmp(from, "always") == 0)

cert_valid_from = 0;

else if (strncmp(from, "0x", 2) == 0)

parse_hex_u64(from, &cert_valid_from);

else if (parse_absolute_time(from, &cert_valid_from) != 0)

fatal("Invalid from time \"%s\"", from);

Line 1940

Line 1965

cert_valid_to = parse_relative_time(to, now);

else if (strcmp(to, "forever") == 0)

cert_valid_to = ~(u_int64_t)0;

else if (strncmp(to, "0x", 2) == 0)

parse_hex_u64(to, &cert_valid_to);

else if (parse_absolute_time(to, &cert_valid_to) != 0)

fatal("Invalid to time \"%s\"", to);

Line 1980

Line 2007

certflags_flags &= ~CERTOPT_NO_REQUIRE_USER_PRESENCE;

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

certflags_flags |= CERTOPT_NO_REQUIRE_USER_PRESENCE;

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

certflags_flags &= ~CERTOPT_REQUIRE_VERIFY;

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

certflags_flags |= CERTOPT_REQUIRE_VERIFY;

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

val = opt + 14;

if (*val == '\0')

Line 1997

Line 2028

fatal("Invalid source-address list");

certflags_src_addr = xstrdup(val);

} else if (strncasecmp(opt, "extension:", 10) == 0 ||

(iscrit = (strncasecmp(opt, "critical:", 9) == 0))) {

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

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

*cp++ = '\0';

Line 2015

Line 2046

int r;

if ((options = sshbuf_fromb(optbuf)) == NULL)

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

fatal_f("sshbuf_fromb failed");

while (sshbuf_len(options) != 0) {

sshbuf_free(option);

option = NULL;

if ((r = sshbuf_get_cstring(options, &name, NULL)) != 0 ||

(r = sshbuf_froms(options, &option)) != 0)

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

fatal_fr(r, "parse option");

printf(" %s", name);

if (!in_critical &&

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

Line 2035

Line 2066

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

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

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

fatal("%s: buffer error: %s",

fatal_fr(r, "parse critical");

__func__, ssh_err(r));

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

free(arg);

} else if (in_critical &&

strcmp(name, "verify-required") == 0) {

printf("\n");

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

hex = sshbuf_dtob16(option);

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

Line 2065

Line 2098

ca_fp = sshkey_fingerprint(key->cert->signature_key,

fingerprint_hash, SSH_FP_DEFAULT);

if (key_fp == NULL || ca_fp == NULL)

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

fatal_f("sshkey_fingerprint fail");

sshkey_format_cert_validity(key->cert, valid, sizeof(valid));

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

Line 2138

Line 2171

if ((key = sshkey_new(KEY_UNSPEC)) == NULL)

fatal("sshkey_new");

if ((r = sshkey_read(key, &cp)) != 0) {

error("%s:%lu: invalid key: %s", path,

error_r(r, "%s:%lu: invalid key", path, lnum);

lnum, ssh_err(r));

continue;

}

if (!sshkey_is_cert(key)) {

Line 2166

Line 2198

int r;

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

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

fatal_r(r, "Unable to load KRL %s", path);

/* XXX check sigs */

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

*krlp == NULL)

fatal("Invalid KRL file: %s", ssh_err(r));

fatal_r(r, "Invalid KRL file %s", path);

sshbuf_free(krlbuf);

}

Line 2191

Line 2223

* OpenSSH base64 hashes omit trailing '='

* characters; put them back for decode.

tlen = strlen(cp);

if ((tlen = strlen(cp)) >= SIZE_MAX - 5)

fatal_f("hash too long: %zu bytes", tlen);

tmp = xmalloc(tlen + 4 + 1);

strlcpy(tmp, cp, tlen + 1);

while ((tlen % 4) != 0) {

Line 2199

Line 2232

tmp[tlen] = '\0';

}

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

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

fatal_f("sshbuf_new failed");

if ((r = sshbuf_b64tod(b, tmp)) != 0)

fatal("%s:%lu: decode hash failed: %s", file, lnum, ssh_err(r));

fatal_r(r, "%s:%lu: decode hash failed", file, lnum);

free(tmp);

*lenp = sshbuf_len(b);

*blobp = xmalloc(*lenp);

Line 2233

Line 2266

if (!quiet)

printf("Revoking from %s\n", path);

while (getline(&line, &linesize, krl_spec) != -1) {

if (linesize >= INT_MAX) {

fatal_f("%s contains unparsable line, len=%zu",

path, linesize);

}

lnum++;

was_explicit_key = was_sha1 = was_sha256 = was_hash = 0;

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

Line 2287

Line 2324

}

if (ssh_krl_revoke_cert_by_serial_range(krl,

ca, serial, serial2) != 0) {

fatal("%s: revoke serial failed",

fatal_f("revoke serial failed");

__func__);

}

} else if (strncasecmp(cp, "id:", 3) == 0) {

if (ca == NULL && !wild_ca) {

Line 2298

Line 2334

cp += 3;

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

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

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

fatal_f("revoke key ID failed");

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

fatal_fr(r, "revoke key failed");

__func__, ssh_err(r));

} else {

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

cp += 4;

Line 2328

Line 2363

if ((key = sshkey_new(KEY_UNSPEC)) == NULL)

fatal("sshkey_new");

if ((r = sshkey_read(key, &cp)) != 0)

fatal("%s:%lu: invalid key: %s",

fatal_r(r, "%s:%lu: invalid key", path, lnum);

path, lnum, ssh_err(r));

if (was_explicit_key)

r = ssh_krl_revoke_key_explicit(krl, key);

else if (was_sha1) {

Line 2349

Line 2383

} else

r = ssh_krl_revoke_key(krl, key);

if (r != 0)

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

fatal_fr(r, "revoke key failed");

__func__, ssh_err(r));

freezero(blob, blen);

blob = NULL;

blen = 0;

Line 2390

Line 2423

else {

tmp = tilde_expand_filename(ca_key_path, pw->pw_uid);

if ((r = sshkey_load_public(tmp, &ca, NULL)) != 0)

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

fatal_r(r, "Cannot load CA public key %s", tmp);

tmp, ssh_err(r));

free(tmp);

}

Line 2435

Line 2467

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

fatal_r(r, "Cannot load public key %s", argv[i]);

argv[i], ssh_err(r));

r = ssh_krl_check_key(krl, k);

printf("%s%s%s%s: %s\n", argv[i],

*comment ? " (" : "", comment, *comment ? ")" : "",

Line 2455

Line 2486

{

size_t i, slen, plen = strlen(keypath);

char *privpath = xstrdup(keypath);

const char *suffixes[] = { "-cert.pub", ".pub", NULL };

static const char * const suffixes[] = { "-cert.pub", ".pub", NULL };

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

int r;

int r, waspub = 0;

struct stat st;

* If passed a public key filename, then try to locate the corresponding

Line 2470

Line 2502

strcmp(privpath + plen - slen, suffixes[i]) != 0)

continue;

privpath[plen - slen] = '\0';

debug("%s: %s looks like a public key, using private key "

debug_f("%s looks like a public key, using private key "

"path %s instead", __func__, keypath, privpath);

"path %s instead", keypath, privpath);

waspub = 1;

}

if ((privkey = load_identity(privpath, NULL)) == NULL) {

if (waspub && stat(privpath, &st) != 0 && errno == ENOENT)

error("Couldn't load identity %s", keypath);

fatal("No private key found for public key \"%s\"", keypath);

goto done;

if ((r = sshkey_load_private(privpath, "", &privkey, NULL)) != 0 &&

}

(r != SSH_ERR_KEY_WRONG_PASSPHRASE)) {

debug_fr(r, "load private key \"%s\"", privpath);

fatal("No private key found for \"%s\"", privpath);

} else if (privkey == NULL)

privkey = load_identity(privpath, NULL);

if (!sshkey_equal_public(pubkey, privkey)) {

error("Public key %s doesn't match private %s",

keypath, privpath);

Line 2488

Line 2526

* it capable of signing.

if ((r = sshkey_to_certified(privkey)) != 0) {

error("%s: sshkey_to_certified: %s", __func__,

error_fr(r, "sshkey_to_certified");

ssh_err(r));

goto done;

}

if ((r = sshkey_cert_copy(pubkey, privkey)) != 0) {

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

error_fr(r, "sshkey_cert_copy");

goto done;

}

Line 2508

Line 2545

static int

sign_one(struct sshkey *signkey, const char *filename, int fd,

const char *sig_namespace, sshsig_signer *signer, void *signer_ctx)

const char *sig_namespace, const char *hashalg, sshsig_signer *signer,

void *signer_ctx)

{

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

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

Line 2527

Line 2565

sshkey_type(signkey));

if ((pin = read_passphrase(prompt,

RP_ALLOW_STDIN)) == NULL)

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

fatal_f("couldn't read PIN");

}

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

fatal_f("fingerprint failed");

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

sshkey_type(signkey), fp);

free(fp);

}

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

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

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

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

error_r(r, "Signing %s failed", filename);

goto out;

}

if ((r = sshsig_armor(sigbuf, &abuf)) != 0) {

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

error_fr(r, "sshsig_armor");

goto out;

}

if ((asig = sshbuf_dup_string(abuf)) == NULL) {

error("%s: buffer error", __func__);

error_f("buffer error");

r = SSH_ERR_ALLOC_FAIL;

goto out;

}

Line 2599

Line 2637

}

static int

sig_sign(const char *keypath, const char *sig_namespace, int argc, char **argv)

sig_process_opts(char * const *opts, size_t nopts, char **hashalgp,

uint64_t *verify_timep, int *print_pubkey)

{

size_t i;

time_t now;

if (verify_timep != NULL)

*verify_timep = 0;

if (print_pubkey != NULL)

*print_pubkey = 0;

if (hashalgp != NULL)

*hashalgp = NULL;

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

if (hashalgp != NULL &&

strncasecmp(opts[i], "hashalg=", 8) == 0) {

*hashalgp = xstrdup(opts[i] + 8);

} else if (verify_timep &&

strncasecmp(opts[i], "verify-time=", 12) == 0) {

if (parse_absolute_time(opts[i] + 12,

verify_timep) != 0 || *verify_timep == 0) {

error("Invalid \"verify-time\" option");

return SSH_ERR_INVALID_ARGUMENT;

}

} else if (print_pubkey &&

strcasecmp(opts[i], "print-pubkey") == 0) {

*print_pubkey = 1;

} else {

error("Invalid option \"%s\"", opts[i]);

return SSH_ERR_INVALID_ARGUMENT;

}

if (verify_timep && *verify_timep == 0) {

if ((now = time(NULL)) < 0) {

error("Time is before epoch");

return SSH_ERR_INVALID_ARGUMENT;

}

*verify_timep = (uint64_t)now;

}

return 0;

}

static int

sig_sign(const char *keypath, const char *sig_namespace, int require_agent,

int argc, char **argv, char * const *opts, size_t nopts)

{

int i, fd = -1, r, ret = -1;

int agent_fd = -1;

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

sshsig_signer *signer = NULL;

char *hashalg = NULL;

/* Check file arguments. */

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

Line 2614

Line 2697

fatal("Cannot sign mix of paths and standard input");

}

if (sig_process_opts(opts, nopts, &hashalg, NULL, NULL) != 0)

goto done; /* error already logged */

if ((r = sshkey_load_public(keypath, &pubkey, NULL)) != 0) {

error("Couldn't load public key %s: %s", keypath, ssh_err(r));

error_r(r, "Couldn't load public key %s", keypath);

goto done;

}

if ((r = ssh_get_authentication_socket(&agent_fd)) != 0)

if ((r = ssh_get_authentication_socket(&agent_fd)) != 0) {

debug("Couldn't get agent socket: %s", ssh_err(r));

if (require_agent)

else {

fatal("Couldn't get agent socket");

debug_r(r, "Couldn't get agent socket");

} else {

if ((r = ssh_agent_has_key(agent_fd, pubkey)) == 0)

signer = agent_signer;

else

else {

debug("Couldn't find key in agent: %s", ssh_err(r));

if (require_agent)

fatal("Couldn't find key in agent");

debug_r(r, "Couldn't find key in agent");

}

if (signer == NULL) {

Line 2640

Line 2731

if (argc == 0) {

if ((r = sign_one(signkey, "(stdin)", STDIN_FILENO,

sig_namespace, signer, &agent_fd)) != 0)

sig_namespace, hashalg, signer, &agent_fd)) != 0)

goto done;

} else {

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

Line 2652

Line 2743

goto done;

}

if ((r = sign_one(signkey, argv[i], fd, sig_namespace,

signer, &agent_fd)) != 0)

hashalg, signer, &agent_fd)) != 0)

goto done;

if (fd != STDIN_FILENO)

close(fd);

Line 2666

Line 2757

close(fd);

sshkey_free(pubkey);

sshkey_free(privkey);

free(hashalg);

return ret;

}

static int

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

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

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

char * const *opts, size_t nopts)

{

int r, ret = -1;

int print_pubkey = 0;

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

struct sshkey *sign_key = NULL;

char *fp = NULL;

struct sshkey_sig_details *sig_details = NULL;

uint64_t verify_time = 0;

if (sig_process_opts(opts, nopts, NULL, &verify_time,

&print_pubkey) != 0)

goto done; /* error already logged */

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

if ((r = sshbuf_load_file(signature, &abuf)) != 0) {

error("Couldn't read signature file: %s", ssh_err(r));

error_r(r, "Couldn't read signature file");

goto done;

}

if ((r = sshsig_dearmor(abuf, &sigbuf)) != 0) {

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

error_fr(r, "sshsig_armor");

goto done;

}

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

Line 2695

Line 2794

if ((fp = sshkey_fingerprint(sign_key, fingerprint_hash,

SSH_FP_DEFAULT)) == NULL)

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

fatal_f("sshkey_fingerprint failed");

debug("Valid (unverified) signature from key %s", fp);

if (sig_details != NULL) {

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

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

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

sig_details->sk_counter, sig_details->sk_flags);

}

free(fp);

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

debug3_fr(r, "sshkey_check_revoked");

goto done;

}

if (allowed_keys != NULL &&

if (allowed_keys != NULL && (r = sshsig_check_allowed_keys(allowed_keys,

(r = sshsig_check_allowed_keys(allowed_keys, sign_key,

sign_key, principal, sig_namespace, verify_time)) != 0) {

principal, sig_namespace)) != 0) {

debug3_fr(r, "sshsig_check_allowed_keys");

debug3("sshsig_check_allowed_keys failed: %s", ssh_err(r));

goto done;

}

/* success */

Line 2723

Line 2821

if (!quiet) {

if (ret == 0) {

if ((fp = sshkey_fingerprint(sign_key, fingerprint_hash,

SSH_FP_DEFAULT)) == NULL) {

SSH_FP_DEFAULT)) == NULL)

fatal("%s: sshkey_fingerprint failed",

fatal_f("sshkey_fingerprint failed");

__func__);

}

if (principal == NULL) {

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

}

/* Print the signature key if requested */

if (ret == 0 && print_pubkey && sign_key != NULL) {

if ((r = sshkey_write(sign_key, stdout)) == 0)

fputc('\n', stdout);

else {

error_r(r, "Could not print public key.\n");

ret = -1;

}

sshbuf_free(sigbuf);

sshbuf_free(abuf);

sshkey_free(sign_key);

Line 2749

Line 2854

}

static int

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

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

char * const *opts, size_t nopts)

{

int r, ret = -1;

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

struct sshkey *sign_key = NULL;

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

uint64_t verify_time = 0;

if (sig_process_opts(opts, nopts, NULL, &verify_time, NULL) != 0)

goto done; /* error already logged */

if ((r = sshbuf_load_file(signature, &abuf)) != 0) {

error("Couldn't read signature file: %s", ssh_err(r));

error_r(r, "Couldn't read signature file");

goto done;

}

if ((r = sshsig_dearmor(abuf, &sigbuf)) != 0) {

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

error_fr(r, "sshsig_armor");

goto done;

}

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

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

error_fr(r, "sshsig_get_pubkey");

__func__, ssh_err(r));

goto done;

}

if ((r = sshsig_find_principals(allowed_keys, sign_key,

&principals)) != 0) {

verify_time, &principals)) != 0) {

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

if (r != SSH_ERR_KEY_NOT_FOUND)

__func__, ssh_err(r));

error_fr(r, "sshsig_find_principal");

goto done;

}

ret = 0;

Line 2791

Line 2901

return ret;

}

static int

sig_match_principals(const char *allowed_keys, char *principal,

char * const *opts, size_t nopts)

{

int r;

char **principals = NULL;

size_t i, nprincipals = 0;

if ((r = sig_process_opts(opts, nopts, NULL, NULL, NULL)) != 0)

return r; /* error already logged */

if ((r = sshsig_match_principals(allowed_keys, principal,

&principals, &nprincipals)) != 0) {

debug_f("match: %s", ssh_err(r));

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

return r;

}

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

printf("%s\n", principals[i]);

free(principals[i]);

}

free(principals);

return 0;

}

static void

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

{

Line 2864

Line 3000

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

free(checkpoint);

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

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

generator_wanted = (u_int32_t)strtonum(

Line 2902

Line 3039

generator_wanted, checkpoint,

start_lineno, lines_to_process) != 0)

fatal("modulus screening failed");

if (in != stdin)

(void)fclose(in);

free(checkpoint);

#else /* WITH_OPENSSL */

fatal("Moduli screening is not supported");

#endif /* WITH_OPENSSL */

}

/* Read and confirm a passphrase */

static char *

private_key_passphrase(void)

read_check_passphrase(const char *prompt1, const char *prompt2,

const char *retry_prompt)

{

char *passphrase1, *passphrase2;

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

for (;;) {

if (identity_passphrase)

passphrase1 = read_passphrase(prompt1, RP_ALLOW_STDIN);

passphrase1 = xstrdup(identity_passphrase);

passphrase2 = read_passphrase(prompt2, RP_ALLOW_STDIN);

else if (identity_new_passphrase)

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

passphrase1 = xstrdup(identity_new_passphrase);

else {

passphrase_again:

passphrase1 =

read_passphrase("Enter passphrase (empty for no "

"passphrase): ", RP_ALLOW_STDIN);

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

RP_ALLOW_STDIN);

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

* The passphrases do not match. Clear them and

* retry.

freezero(passphrase1, strlen(passphrase1));

freezero(passphrase2, strlen(passphrase2));

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

return passphrase1;

goto passphrase_again;

}

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

/* The passphrases do not match. Clear them and retry. */

freezero(passphrase1, strlen(passphrase1));

freezero(passphrase2, strlen(passphrase2));

fputs(retry_prompt, stdout);

fputc('\n', stdout);

fflush(stdout);

}

return passphrase1;

/* NOTREACHED */

return NULL;

}

static const char *

static char *

skip_ssh_url_preamble(const char *s)

private_key_passphrase(void)

{

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

if (identity_passphrase)

return s + 6;

return xstrdup(identity_passphrase);

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

if (identity_new_passphrase)

return s + 4;

return xstrdup(identity_new_passphrase);

return s;

return read_check_passphrase(

"Enter passphrase (empty for no passphrase): ",

"Enter same passphrase again: ",

"Passphrases do not match. Try again.");

}

static char *

sk_suffix(const char *application, const uint8_t *user, size_t userlen)

{

char *ret, *cp;

size_t slen, i;

/* Trim off URL-like preamble */

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

ret = xstrdup(application + 6);

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

ret = xstrdup(application + 4);

else

ret = xstrdup(application);

/* Count trailing zeros in user */

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

if (user[userlen - i - 1] != 0)

break;

}

if (i >= userlen)

return ret; /* user-id was default all-zeros */

/* Append user-id, escaping non-UTF-8 characters */

slen = userlen - i;

if (asmprintf(&cp, INT_MAX, NULL, "%.*s", (int)slen, user) == -1)

fatal_f("asmprintf failed");

/* Don't emit a user-id that contains path or control characters */

if (strchr(cp, '/') != NULL || strstr(cp, "..") != NULL ||

strchr(cp, '\\') != NULL) {

free(cp);

cp = tohex(user, slen);

}

xextendf(&ret, "_", "%s", cp);

free(cp);

return ret;

}

static int

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

{

struct sshkey **keys;

struct sshsk_resident_key **srks;

size_t nkeys, i;

size_t nsrks, i;

int r, ret = -1;

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

const char *ext;

struct sshkey *key;

if (skprovider == NULL)

fatal("Cannot download keys without provider");

Line 2967

Line 3141

printf("You may need to touch your authenticator "

"to authorize key download.\n");

}

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

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

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

&srks, &nsrks)) != 0) {

if (pin != NULL)

freezero(pin, strlen(pin));

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

error_r(r, "Unable to load resident keys");

return -1;

}

if (nkeys == 0)

if (nsrks == 0)

logit("No keys to download");

if (pin != NULL)

freezero(pin, strlen(pin));

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

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

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

key = srks[i]->key;

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

if (key->type != KEY_ECDSA_SK && key->type != KEY_ED25519_SK) {

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

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

sshkey_type(key), key->type);

continue;

}

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

if ((fp = sshkey_fingerprint(key, fingerprint_hash,

fingerprint_hash, SSH_FP_DEFAULT)) == NULL)

SSH_FP_DEFAULT)) == NULL)

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

fatal_f("sshkey_fingerprint failed");

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

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

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

sshkey_type(key), fp, key->sk_application, key->sk_flags);

keys[i]->sk_flags);

ext = sk_suffix(key->sk_application,

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

srks[i]->user_id, srks[i]->user_id_len);

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

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

key->type == KEY_ECDSA_SK ? "ecdsa_sk" : "ed25519_sk",

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

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

Line 3006

Line 3180

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

if ((r = sshkey_save_private(key, path, pass,

keys[i]->sk_application, private_key_format,

key->sk_application, private_key_format,

openssh_format_cipher, rounds)) != 0) {

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

error_r(r, "Saving key \"%s\" failed", path);

path, ssh_err(r));

free(path);

break;

}

if (!quiet) {

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

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

sshkey_type(keys[i]),

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

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

*ext != '\0' ? key->sk_application : "",

path);

}

/* Save public key too */

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

free(path);

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

if ((r = sshkey_save_public(key, pubpath,

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

key->sk_application)) != 0) {

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

error_r(r, "Saving public key \"%s\" failed", pubpath);

pubpath, ssh_err(r));

free(pubpath);

break;

}

free(pubpath);

}

if (i >= nkeys)

if (i >= nsrks)

ret = 0; /* success */

if (pass != NULL)

freezero(pass, strlen(pass));

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

sshsk_free_resident_keys(srks, nsrks);

sshkey_free(keys[i]);

free(keys);

return ret;

}

static void

save_attestation(struct sshbuf *attest, const char *path)

{

mode_t omask;

int r;

if (path == NULL)

return; /* nothing to do */

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

fatal("Enrollment did not return attestation data");

omask = umask(077);

r = sshbuf_write_file(path, attest);

umask(omask);

if (r != 0)

fatal_r(r, "Unable to write attestation data \"%s\"", path);

if (!quiet)

printf("Your FIDO attestation certificate has been saved in "

"%s\n", path);

}

static int

confirm_sk_overwrite(const char *application, const char *user)

{

char yesno[3];

printf("A resident key scoped to '%s' with user id '%s' already "

"exists.\n", application == NULL ? "ssh:" : application,

user == NULL ? "null" : user);

printf("Overwrite key in token (y/n)? ");

fflush(stdout);

if (fgets(yesno, sizeof(yesno), stdin) == NULL)

return 0;

if (yesno[0] != 'y' && yesno[0] != 'Y')

return 0;

return 1;

}

static void

usage(void)

{

fprintf(stderr,

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

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

" [-w provider]\n"

" [-w provider] [-Z cipher]\n"

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

" [-P old_passphrase]\n"

" [-P old_passphrase] [-Z cipher]\n"

#ifdef WITH_OPENSSL

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

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

#endif

" ssh-keygen -y [-f input_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"

Line 3084

Line 3292

" 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 match-principals -I signer_identity -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 sign -f key_file -n namespace file [-O option] ...\n"

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

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

" -n namespace -s signature_file [-r krl_file] [-O option]\n");

exit(1);

}

Line 3097

Line 3306

int

main(int argc, char **argv)

{

char comment[1024], *passphrase;

char comment[1024], *passphrase = NULL;

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

struct sshkey *private, *public;

struct passwd *pw;

Line 3111

Line 3320

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;

char *sk_attestation_path = NULL;

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

size_t i, nopts = 0;

u_int32_t bits = 0;

Line 3137

Line 3346

pw = getpwuid(getuid());

if (!pw)

fatal("No user exists for uid %lu", (u_long)getuid());

pw = pwcopy(pw);

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

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

Line 3242

Line 3452

break;

case 'Z':

openssh_format_cipher = optarg;

if (cipher_by_name(openssh_format_cipher) == NULL)

fatal("Invalid OpenSSH-format cipher '%s'",

openssh_format_cipher);

break;

case 'C':

identity_comment = optarg;

Line 3329

Line 3542

else

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

break;

case '?':

default:

usage();

}

Line 3348

Line 3560

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

return sig_find_principals(ca_key_path, identity_file,

opts, nopts);

} else if (strncmp(sign_op, "match-principals", 16) == 0) {

if (!have_identity) {

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

"missing allowed keys file");

exit(1);

}

if (cert_key_id == NULL) {

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

"missing principal ID");

exit(1);

}

return sig_match_principals(identity_file, cert_key_id,

opts, nopts);

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

/* NB. cert_principals is actually namespace, via -n */

if (cert_principals == NULL ||

*cert_principals == '\0') {

error("Too few arguments for sign: "

Line 3370

Line 3597

exit(1);

}

return sig_sign(identity_file, cert_principals,

argc, argv);

prefer_agent, argc, argv, opts, nopts);

} else if (strncmp(sign_op, "check-novalidate", 16) == 0) {

/* NB. cert_principals is actually namespace, via -n */

if (cert_principals == NULL ||

*cert_principals == '\0') {

error("Too few arguments for check-novalidate: "

"missing namespace");

exit(1);

}

if (ca_key_path == NULL) {

error("Too few arguments for check-novalidate: "

"missing signature file");

exit(1);

}

return sig_verify(ca_key_path, cert_principals,

NULL, NULL, NULL);

NULL, NULL, NULL, opts, nopts);

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

/* NB. cert_principals is actually namespace, via -n */

if (cert_principals == NULL ||

*cert_principals == '\0') {

error("Too few arguments for verify: "

Line 3398

Line 3633

}

if (cert_key_id == NULL) {

error("Too few arguments for verify: "

"missing principal ID");

"missing principal identity");

exit(1);

}

return sig_verify(ca_key_path, cert_principals,

cert_key_id, identity_file, rr_hostname);

cert_key_id, identity_file, rr_hostname,

opts, nopts);

}

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

usage();

Line 3485

Line 3721

if (have_identity) {

n = do_print_resource_record(pw, identity_file,

rr_hostname, print_generic);

rr_hostname, print_generic, opts, nopts);

if (n == 0)

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

exit(0);

Line 3493

Line 3729

n += do_print_resource_record(pw,

_PATH_HOST_RSA_KEY_FILE, rr_hostname,

print_generic);

print_generic, opts, nopts);

n += do_print_resource_record(pw,

_PATH_HOST_DSA_KEY_FILE, rr_hostname,

print_generic);

print_generic, opts, nopts);

n += do_print_resource_record(pw,

_PATH_HOST_ECDSA_KEY_FILE, rr_hostname,

print_generic);

print_generic, opts, nopts);

n += do_print_resource_record(pw,

_PATH_HOST_ED25519_KEY_FILE, rr_hostname,

print_generic);

print_generic, opts, nopts);

n += do_print_resource_record(pw,

_PATH_HOST_XMSS_KEY_FILE, rr_hostname,

print_generic);

print_generic, opts, nopts);

if (n == 0)

fatal("no keys found.");

exit(0);

Line 3558

Line 3794

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

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

&challenge)) != 0) {

fatal("Unable to load FIDO enrollment "

fatal_r(r, "Unable to load FIDO "

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

"enrollment challenge \"%s\"",

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

opts[i] + 10);

}

} else if (strncasecmp(opts[i],

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

sk_attestaion_path = opts[i] + 18;

sk_attestation_path = opts[i] + 18;

} else if (strncasecmp(opts[i],

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

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

Line 3577

Line 3813

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

}

if (!quiet) {

printf("You may need to touch your authenticator "

"to authorize key generation.\n");

}

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

fatal("sshbuf_new failed");

if ((sk_flags &

r = 0;

(SSH_SK_USER_VERIFICATION_REQD|SSH_SK_RESIDENT_KEY))) {

for (i = 0 ;;) {

passphrase = read_passphrase("Enter PIN for "

if (!quiet) {

"authenticator: ", RP_ALLOW_STDIN);

printf("You may need to touch your "

} else {

"authenticator%s to authorize key "

passphrase = NULL;

"generation.\n",

}

r == 0 ? "" : " again");

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

}

fflush(stdout);

r = sshsk_enroll(type, sk_provider, sk_device,

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

Line 3598

Line 3830

&private, attest);

if (r == 0)

break;

if (r == SSH_ERR_KEY_BAD_PERMISSIONS &&

(sk_flags & SSH_SK_RESIDENT_KEY) != 0 &&

(sk_flags & SSH_SK_FORCE_OPERATION) == 0 &&

confirm_sk_overwrite(sk_application, sk_user)) {

sk_flags |= SSH_SK_FORCE_OPERATION;

continue;

}

if (r != SSH_ERR_KEY_WRONG_PASSPHRASE)

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

fatal_r(r, "Key enrollment failed");

else if (passphrase != NULL) {

error("PIN incorrect");

freezero(passphrase, strlen(passphrase));

passphrase = NULL;

}

if (i >= 3)

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

Line 3626

Line 3860

break;

}

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

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

fatal_r(r, "sshkey_from_private");

if (!have_identity)

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

Line 3650

Line 3884

/* Save the key with the given passphrase and comment. */

if ((r = sshkey_save_private(private, identity_file, passphrase,

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

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

error_r(r, "Saving key \"%s\" failed", identity_file);

identity_file, ssh_err(r));

freezero(passphrase, strlen(passphrase));

exit(1);

}

Line 3664

Line 3897

}

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

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

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

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

fatal_r(r, "Unable to save public key to %s", identity_file);

identity_file, ssh_err(r));

}

if (!quiet) {

fp = sshkey_fingerprint(public, fingerprint_hash,

Line 3686

Line 3917

free(fp);

}

if (sk_attestaion_path != NULL) {

if (sk_attestation_path != NULL)

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

save_attestation(attest, sk_attestation_path);

fatal("Enrollment did not return attestation "

"certificate");

}

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

fatal("Unable to write attestation certificate "

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

}

if (!quiet) {

printf("Your FIDO attestation certificate has been "

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

}

sshbuf_free(attest);

sshkey_free(public);