| version 1.342, 2019/09/02 23:46:46 |
version 1.453, 2022/05/31 14:05:12 |
|
|
| #include <sys/socket.h> |
#include <sys/socket.h> |
| #include <sys/stat.h> |
#include <sys/stat.h> |
| |
|
| |
#ifdef WITH_OPENSSL |
| #include <openssl/evp.h> |
#include <openssl/evp.h> |
| #include <openssl/pem.h> |
#include <openssl/pem.h> |
| |
#endif |
| |
|
| |
#include <stdint.h> |
| #include <errno.h> |
#include <errno.h> |
| #include <fcntl.h> |
#include <fcntl.h> |
| #include <netdb.h> |
#include <netdb.h> |
| #include <pwd.h> |
#include <pwd.h> |
| |
#include <stdarg.h> |
| #include <stdio.h> |
#include <stdio.h> |
| #include <stdlib.h> |
#include <stdlib.h> |
| #include <string.h> |
#include <string.h> |
|
|
| #include "digest.h" |
#include "digest.h" |
| #include "utf8.h" |
#include "utf8.h" |
| #include "authfd.h" |
#include "authfd.h" |
| |
#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 |
#ifdef ENABLE_PKCS11 |
| #include "ssh-pkcs11.h" |
#include "ssh-pkcs11.h" |
|
|
| static int fingerprint_hash = SSH_FP_HASH_DEFAULT; |
static int fingerprint_hash = SSH_FP_HASH_DEFAULT; |
| |
|
| /* The identity file name, given on the command line or entered by the user. */ |
/* The identity file name, given on the command line or entered by the user. */ |
| static char identity_file[1024]; |
static char identity_file[PATH_MAX]; |
| static int have_identity = 0; |
static int have_identity = 0; |
| |
|
| /* This is set to the passphrase if given on the command line. */ |
/* This is set to the passphrase if given on the command line. */ |
|
|
| static u_int64_t cert_valid_to = ~0ULL; |
static u_int64_t cert_valid_to = ~0ULL; |
| |
|
| /* Certificate options */ |
/* Certificate options */ |
| #define CERTOPT_X_FWD (1) |
#define CERTOPT_X_FWD (1) |
| #define CERTOPT_AGENT_FWD (1<<1) |
#define CERTOPT_AGENT_FWD (1<<1) |
| #define CERTOPT_PORT_FWD (1<<2) |
#define CERTOPT_PORT_FWD (1<<2) |
| #define CERTOPT_PTY (1<<3) |
#define CERTOPT_PTY (1<<3) |
| #define CERTOPT_USER_RC (1<<4) |
#define CERTOPT_USER_RC (1<<4) |
| |
#define CERTOPT_NO_REQUIRE_USER_PRESENCE (1<<5) |
| |
#define CERTOPT_REQUIRE_VERIFY (1<<6) |
| #define CERTOPT_DEFAULT (CERTOPT_X_FWD|CERTOPT_AGENT_FWD| \ |
#define CERTOPT_DEFAULT (CERTOPT_X_FWD|CERTOPT_AGENT_FWD| \ |
| CERTOPT_PORT_FWD|CERTOPT_PTY|CERTOPT_USER_RC) |
CERTOPT_PORT_FWD|CERTOPT_PTY|CERTOPT_USER_RC) |
| static u_int32_t certflags_flags = CERTOPT_DEFAULT; |
static u_int32_t certflags_flags = CERTOPT_DEFAULT; |
|
|
| static char *certflags_src_addr = NULL; |
static char *certflags_src_addr = NULL; |
| |
|
| /* Arbitrary extensions specified by user */ |
/* Arbitrary extensions specified by user */ |
| struct cert_userext { |
struct cert_ext { |
| char *key; |
char *key; |
| char *val; |
char *val; |
| int crit; |
int crit; |
| }; |
}; |
| static struct cert_userext *cert_userext; |
static struct cert_ext *cert_ext; |
| static size_t ncert_userext; |
static size_t ncert_ext; |
| |
|
| /* Conversion to/from various formats */ |
/* Conversion to/from various formats */ |
| enum { |
enum { |
|
|
| /* Load key from this PKCS#11 provider */ |
/* Load key from this PKCS#11 provider */ |
| static char *pkcs11provider = NULL; |
static char *pkcs11provider = NULL; |
| |
|
| |
/* FIDO/U2F provider to use */ |
| |
static char *sk_provider = NULL; |
| |
|
| /* Format for writing private keys */ |
/* Format for writing private keys */ |
| static int private_key_format = SSHKEY_PRIVATE_OPENSSH; |
static int private_key_format = SSHKEY_PRIVATE_OPENSSH; |
| |
|
| /* Cipher for new-format private keys */ |
/* Cipher for new-format private keys */ |
| static char *openssh_format_cipher = NULL; |
static char *openssh_format_cipher = NULL; |
| |
|
| /* |
/* Number of KDF rounds to derive new format keys. */ |
| * Number of KDF rounds to derive new format keys / |
|
| * number of primality trials when screening moduli. |
|
| */ |
|
| static int rounds = 0; |
static int rounds = 0; |
| |
|
| /* argv0 */ |
/* argv0 */ |
|
|
| fatal("unknown key type %s", key_type_name); |
fatal("unknown key type %s", key_type_name); |
| if (*bitsp == 0) { |
if (*bitsp == 0) { |
| #ifdef WITH_OPENSSL |
#ifdef WITH_OPENSSL |
| u_int nid; |
int nid; |
| |
|
| switch(type) { |
switch(type) { |
| case KEY_DSA: |
case KEY_DSA: |
|
|
| #endif |
#endif |
| } |
} |
| |
|
| |
/* |
| |
* Checks whether a file exists and, if so, asks the user whether they wish |
| |
* to overwrite it. |
| |
* Returns nonzero if the file does not already exist or if the user agrees to |
| |
* overwrite, or zero otherwise. |
| |
*/ |
| |
static int |
| |
confirm_overwrite(const char *filename) |
| |
{ |
| |
char yesno[3]; |
| |
struct stat st; |
| |
|
| |
if (stat(filename, &st) != 0) |
| |
return 1; |
| |
printf("%s already exists.\n", filename); |
| |
printf("Overwrite (y/n)? "); |
| |
fflush(stdout); |
| |
if (fgets(yesno, sizeof(yesno), stdin) == NULL) |
| |
return 0; |
| |
if (yesno[0] != 'y' && yesno[0] != 'Y') |
| |
return 0; |
| |
return 1; |
| |
} |
| |
|
| static void |
static void |
| ask_filename(struct passwd *pw, const char *prompt) |
ask_filename(struct passwd *pw, const char *prompt) |
| { |
{ |
|
|
| case KEY_ECDSA: |
case KEY_ECDSA: |
| name = _PATH_SSH_CLIENT_ID_ECDSA; |
name = _PATH_SSH_CLIENT_ID_ECDSA; |
| break; |
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_CERT: |
| case KEY_RSA: |
case KEY_RSA: |
| name = _PATH_SSH_CLIENT_ID_RSA; |
name = _PATH_SSH_CLIENT_ID_RSA; |
|
|
| case KEY_ED25519_CERT: |
case KEY_ED25519_CERT: |
| name = _PATH_SSH_CLIENT_ID_ED25519; |
name = _PATH_SSH_CLIENT_ID_ED25519; |
| break; |
break; |
| |
case KEY_ED25519_SK: |
| |
case KEY_ED25519_SK_CERT: |
| |
name = _PATH_SSH_CLIENT_ID_ED25519_SK; |
| |
break; |
| case KEY_XMSS: |
case KEY_XMSS: |
| case KEY_XMSS_CERT: |
case KEY_XMSS_CERT: |
| name = _PATH_SSH_CLIENT_ID_XMSS; |
name = _PATH_SSH_CLIENT_ID_XMSS; |
|
|
| if ((r = sshkey_load_private(filename, "", &prv, commentp)) == 0) |
if ((r = sshkey_load_private(filename, "", &prv, commentp)) == 0) |
| return prv; |
return prv; |
| if (r != SSH_ERR_KEY_WRONG_PASSPHRASE) |
if (r != SSH_ERR_KEY_WRONG_PASSPHRASE) |
| fatal("Load key \"%s\": %s", filename, ssh_err(r)); |
fatal_r(r, "Load key \"%s\"", filename); |
| if (identity_passphrase) |
if (identity_passphrase) |
| pass = xstrdup(identity_passphrase); |
pass = xstrdup(identity_passphrase); |
| else |
else |
| pass = read_passphrase("Enter passphrase: ", RP_ALLOW_STDIN); |
pass = read_passphrase("Enter passphrase: ", RP_ALLOW_STDIN); |
| r = sshkey_load_private(filename, pass, &prv, commentp); |
r = sshkey_load_private(filename, pass, &prv, commentp); |
| explicit_bzero(pass, strlen(pass)); |
freezero(pass, strlen(pass)); |
| free(pass); |
|
| if (r != 0) |
if (r != 0) |
| fatal("Load key \"%s\": %s", filename, ssh_err(r)); |
fatal_r(r, "Load key \"%s\"", filename); |
| return prv; |
return prv; |
| } |
} |
| |
|
|
|
| int r; |
int r; |
| |
|
| if ((b = sshbuf_new()) == NULL) |
if ((b = sshbuf_new()) == NULL) |
| fatal("%s: sshbuf_new failed", __func__); |
fatal_f("sshbuf_new failed"); |
| if ((r = sshkey_putb(k, b)) != 0) |
if ((r = sshkey_putb(k, b)) != 0) |
| fatal("key_to_blob failed: %s", ssh_err(r)); |
fatal_fr(r, "put key"); |
| if ((b64 = sshbuf_dtob64_string(b, 1)) == NULL) |
if ((b64 = sshbuf_dtob64_string(b, 1)) == NULL) |
| fatal("%s: sshbuf_dtob64_string failed", __func__); |
fatal_f("sshbuf_dtob64_string failed"); |
| |
|
| /* Comment + surrounds must fit into 72 chars (RFC 4716 sec 3.3) */ |
/* Comment + surrounds must fit into 72 chars (RFC 4716 sec 3.3) */ |
| snprintf(comment, sizeof(comment), |
snprintf(comment, sizeof(comment), |
|
|
| fatal("PEM_write_EC_PUBKEY failed"); |
fatal("PEM_write_EC_PUBKEY failed"); |
| break; |
break; |
| default: |
default: |
| fatal("%s: unsupported key type %s", __func__, sshkey_type(k)); |
fatal_f("unsupported key type %s", sshkey_type(k)); |
| } |
} |
| exit(0); |
exit(0); |
| } |
} |
|
|
| if (!PEM_write_RSAPublicKey(stdout, k->rsa)) |
if (!PEM_write_RSAPublicKey(stdout, k->rsa)) |
| fatal("PEM_write_RSAPublicKey failed"); |
fatal("PEM_write_RSAPublicKey failed"); |
| break; |
break; |
| |
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: |
default: |
| fatal("%s: unsupported key type %s", __func__, sshkey_type(k)); |
fatal_f("unsupported key type %s", sshkey_type(k)); |
| } |
} |
| exit(0); |
exit(0); |
| } |
} |
|
|
| do_convert_to_pem(k); |
do_convert_to_pem(k); |
| break; |
break; |
| default: |
default: |
| fatal("%s: unknown key format %d", __func__, convert_format); |
fatal_f("unknown key format %d", convert_format); |
| } |
} |
| exit(0); |
exit(0); |
| } |
} |
|
|
| int r; |
int r; |
| |
|
| if ((r = sshbuf_get_u32(b, &bignum_bits)) != 0) |
if ((r = sshbuf_get_u32(b, &bignum_bits)) != 0) |
| fatal("%s: buffer error: %s", __func__, ssh_err(r)); |
fatal_fr(r, "parse"); |
| bytes = (bignum_bits + 7) / 8; |
bytes = (bignum_bits + 7) / 8; |
| if (sshbuf_len(b) < bytes) |
if (sshbuf_len(b) < bytes) |
| fatal("%s: input buffer too small: need %d have %zu", |
fatal_f("input buffer too small: need %d have %zu", |
| __func__, bytes, sshbuf_len(b)); |
bytes, sshbuf_len(b)); |
| if (BN_bin2bn(sshbuf_ptr(b), bytes, value) == NULL) |
if (BN_bin2bn(sshbuf_ptr(b), bytes, value) == NULL) |
| fatal("%s: BN_bin2bn failed", __func__); |
fatal_f("BN_bin2bn failed"); |
| if ((r = sshbuf_consume(b, bytes)) != 0) |
if ((r = sshbuf_consume(b, bytes)) != 0) |
| fatal("%s: buffer error: %s", __func__, ssh_err(r)); |
fatal_fr(r, "consume"); |
| } |
} |
| |
|
| static struct sshkey * |
static struct sshkey * |
|
|
| BIGNUM *rsa_p = NULL, *rsa_q = NULL, *rsa_iqmp = NULL; |
BIGNUM *rsa_p = NULL, *rsa_q = NULL, *rsa_iqmp = NULL; |
| |
|
| if ((r = sshbuf_get_u32(b, &magic)) != 0) |
if ((r = sshbuf_get_u32(b, &magic)) != 0) |
| fatal("%s: buffer error: %s", __func__, ssh_err(r)); |
fatal_fr(r, "parse magic"); |
| |
|
| if (magic != SSH_COM_PRIVATE_KEY_MAGIC) { |
if (magic != SSH_COM_PRIVATE_KEY_MAGIC) { |
| error("bad magic 0x%x != 0x%x", magic, |
error("bad magic 0x%x != 0x%x", magic, |
|
|
| (r = sshbuf_get_u32(b, &i2)) != 0 || |
(r = sshbuf_get_u32(b, &i2)) != 0 || |
| (r = sshbuf_get_u32(b, &i3)) != 0 || |
(r = sshbuf_get_u32(b, &i3)) != 0 || |
| (r = sshbuf_get_u32(b, &i4)) != 0) |
(r = sshbuf_get_u32(b, &i4)) != 0) |
| fatal("%s: buffer error: %s", __func__, ssh_err(r)); |
fatal_fr(r, "parse"); |
| debug("ignore (%d %d %d %d)", i1, i2, i3, i4); |
debug("ignore (%d %d %d %d)", i1, i2, i3, i4); |
| if (strcmp(cipher, "none") != 0) { |
if (strcmp(cipher, "none") != 0) { |
| error("unsupported cipher %s", cipher); |
error("unsupported cipher %s", cipher); |
|
|
| (dsa_g = BN_new()) == NULL || |
(dsa_g = BN_new()) == NULL || |
| (dsa_pub_key = BN_new()) == NULL || |
(dsa_pub_key = BN_new()) == NULL || |
| (dsa_priv_key = BN_new()) == NULL) |
(dsa_priv_key = BN_new()) == NULL) |
| fatal("%s: BN_new", __func__); |
fatal_f("BN_new"); |
| buffer_get_bignum_bits(b, dsa_p); |
buffer_get_bignum_bits(b, dsa_p); |
| buffer_get_bignum_bits(b, dsa_g); |
buffer_get_bignum_bits(b, dsa_g); |
| buffer_get_bignum_bits(b, dsa_q); |
buffer_get_bignum_bits(b, dsa_q); |
| buffer_get_bignum_bits(b, dsa_pub_key); |
buffer_get_bignum_bits(b, dsa_pub_key); |
| buffer_get_bignum_bits(b, dsa_priv_key); |
buffer_get_bignum_bits(b, dsa_priv_key); |
| if (!DSA_set0_pqg(key->dsa, dsa_p, dsa_q, dsa_g)) |
if (!DSA_set0_pqg(key->dsa, dsa_p, dsa_q, dsa_g)) |
| fatal("%s: DSA_set0_pqg failed", __func__); |
fatal_f("DSA_set0_pqg failed"); |
| dsa_p = dsa_q = dsa_g = NULL; /* transferred */ |
dsa_p = dsa_q = dsa_g = NULL; /* transferred */ |
| if (!DSA_set0_key(key->dsa, dsa_pub_key, dsa_priv_key)) |
if (!DSA_set0_key(key->dsa, dsa_pub_key, dsa_priv_key)) |
| fatal("%s: DSA_set0_key failed", __func__); |
fatal_f("DSA_set0_key failed"); |
| dsa_pub_key = dsa_priv_key = NULL; /* transferred */ |
dsa_pub_key = dsa_priv_key = NULL; /* transferred */ |
| break; |
break; |
| case KEY_RSA: |
case KEY_RSA: |
| if ((r = sshbuf_get_u8(b, &e1)) != 0 || |
if ((r = sshbuf_get_u8(b, &e1)) != 0 || |
| (e1 < 30 && (r = sshbuf_get_u8(b, &e2)) != 0) || |
(e1 < 30 && (r = sshbuf_get_u8(b, &e2)) != 0) || |
| (e1 < 30 && (r = sshbuf_get_u8(b, &e3)) != 0)) |
(e1 < 30 && (r = sshbuf_get_u8(b, &e3)) != 0)) |
| fatal("%s: buffer error: %s", __func__, ssh_err(r)); |
fatal_fr(r, "parse RSA"); |
| e = e1; |
e = e1; |
| debug("e %lx", e); |
debug("e %lx", e); |
| if (e < 30) { |
if (e < 30) { |
|
|
| debug("e %lx", e); |
debug("e %lx", e); |
| } |
} |
| if ((rsa_e = BN_new()) == NULL) |
if ((rsa_e = BN_new()) == NULL) |
| fatal("%s: BN_new", __func__); |
fatal_f("BN_new"); |
| if (!BN_set_word(rsa_e, e)) { |
if (!BN_set_word(rsa_e, e)) { |
| BN_clear_free(rsa_e); |
BN_clear_free(rsa_e); |
| sshkey_free(key); |
sshkey_free(key); |
|
|
| (rsa_p = BN_new()) == NULL || |
(rsa_p = BN_new()) == NULL || |
| (rsa_q = BN_new()) == NULL || |
(rsa_q = BN_new()) == NULL || |
| (rsa_iqmp = BN_new()) == NULL) |
(rsa_iqmp = BN_new()) == NULL) |
| fatal("%s: BN_new", __func__); |
fatal_f("BN_new"); |
| buffer_get_bignum_bits(b, rsa_d); |
buffer_get_bignum_bits(b, rsa_d); |
| buffer_get_bignum_bits(b, rsa_n); |
buffer_get_bignum_bits(b, rsa_n); |
| buffer_get_bignum_bits(b, rsa_iqmp); |
buffer_get_bignum_bits(b, rsa_iqmp); |
| buffer_get_bignum_bits(b, rsa_q); |
buffer_get_bignum_bits(b, rsa_q); |
| buffer_get_bignum_bits(b, rsa_p); |
buffer_get_bignum_bits(b, rsa_p); |
| if (!RSA_set0_key(key->rsa, rsa_n, rsa_e, rsa_d)) |
if (!RSA_set0_key(key->rsa, rsa_n, rsa_e, rsa_d)) |
| fatal("%s: RSA_set0_key failed", __func__); |
fatal_f("RSA_set0_key failed"); |
| rsa_n = rsa_e = rsa_d = NULL; /* transferred */ |
rsa_n = rsa_e = rsa_d = NULL; /* transferred */ |
| if (!RSA_set0_factors(key->rsa, rsa_p, rsa_q)) |
if (!RSA_set0_factors(key->rsa, rsa_p, rsa_q)) |
| fatal("%s: RSA_set0_factors failed", __func__); |
fatal_f("RSA_set0_factors failed"); |
| rsa_p = rsa_q = NULL; /* transferred */ |
rsa_p = rsa_q = NULL; /* transferred */ |
| if ((r = ssh_rsa_complete_crt_parameters(key, rsa_iqmp)) != 0) |
if ((r = ssh_rsa_complete_crt_parameters(key, rsa_iqmp)) != 0) |
| fatal("generate RSA parameters failed: %s", ssh_err(r)); |
fatal_fr(r, "generate RSA parameters"); |
| BN_clear_free(rsa_iqmp); |
BN_clear_free(rsa_iqmp); |
| break; |
break; |
| } |
} |
| rlen = sshbuf_len(b); |
rlen = sshbuf_len(b); |
| if (rlen != 0) |
if (rlen != 0) |
| error("%s: remaining bytes in key blob %d", __func__, rlen); |
error_f("remaining bytes in key blob %d", rlen); |
| |
|
| /* try the key */ |
/* try the key */ |
| if (sshkey_sign(key, &sig, &slen, data, sizeof(data), 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); |
sshkey_free(key); |
| free(sig); |
free(sig); |
| return NULL; |
return NULL; |
|
|
| (encoded[len-3] == '=')) |
(encoded[len-3] == '=')) |
| encoded[len-3] = '\0'; |
encoded[len-3] = '\0'; |
| if ((r = sshbuf_b64tod(buf, encoded)) != 0) |
if ((r = sshbuf_b64tod(buf, encoded)) != 0) |
| fatal("%s: base64 decoding failed: %s", __func__, ssh_err(r)); |
fatal_fr(r, "base64 decode"); |
| if (*private) |
if (*private) { |
| *k = do_convert_private_ssh2(buf); |
if ((*k = do_convert_private_ssh2(buf)) == NULL) |
| else if ((r = sshkey_fromb(buf, k)) != 0) |
fatal_f("private key conversion failed"); |
| fatal("decode blob failed: %s", ssh_err(r)); |
} else if ((r = sshkey_fromb(buf, k)) != 0) |
| |
fatal_fr(r, "parse key"); |
| |
sshbuf_free(buf); |
| fclose(fp); |
fclose(fp); |
| } |
} |
| |
|
|
|
| if ((fp = fopen(identity_file, "r")) == NULL) |
if ((fp = fopen(identity_file, "r")) == NULL) |
| fatal("%s: %s: %s", __progname, identity_file, strerror(errno)); |
fatal("%s: %s: %s", __progname, identity_file, strerror(errno)); |
| if ((pubkey = PEM_read_PUBKEY(fp, NULL, NULL, NULL)) == NULL) { |
if ((pubkey = PEM_read_PUBKEY(fp, NULL, NULL, NULL)) == NULL) { |
| fatal("%s: %s is not a recognised public key format", __func__, |
fatal_f("%s is not a recognised public key format", |
| identity_file); |
identity_file); |
| } |
} |
| fclose(fp); |
fclose(fp); |
|
|
| (*k)->ecdsa_nid = sshkey_ecdsa_key_to_nid((*k)->ecdsa); |
(*k)->ecdsa_nid = sshkey_ecdsa_key_to_nid((*k)->ecdsa); |
| break; |
break; |
| default: |
default: |
| fatal("%s: unsupported pubkey type %d", __func__, |
fatal_f("unsupported pubkey type %d", |
| EVP_PKEY_base_id(pubkey)); |
EVP_PKEY_base_id(pubkey)); |
| } |
} |
| EVP_PKEY_free(pubkey); |
EVP_PKEY_free(pubkey); |
|
|
| fclose(fp); |
fclose(fp); |
| return; |
return; |
| } |
} |
| fatal("%s: unrecognised raw private key format", __func__); |
fatal_f("unrecognised raw private key format"); |
| } |
} |
| |
|
| static void |
static void |
|
|
| do_convert_from_pem(&k, &private); |
do_convert_from_pem(&k, &private); |
| break; |
break; |
| default: |
default: |
| fatal("%s: unknown key format %d", __func__, convert_format); |
fatal_f("unknown key format %d", convert_format); |
| } |
} |
| |
|
| if (!private) { |
if (!private) { |
|
|
| NULL, 0, NULL, NULL); |
NULL, 0, NULL, NULL); |
| break; |
break; |
| default: |
default: |
| fatal("%s: unsupported key type %s", __func__, |
fatal_f("unsupported key type %s", sshkey_type(k)); |
| sshkey_type(k)); |
|
| } |
} |
| } |
} |
| |
|
|
|
| fatal("%s: %s", identity_file, strerror(errno)); |
fatal("%s: %s", identity_file, strerror(errno)); |
| prv = load_identity(identity_file, &comment); |
prv = load_identity(identity_file, &comment); |
| if ((r = sshkey_write(prv, stdout)) != 0) |
if ((r = sshkey_write(prv, stdout)) != 0) |
| error("sshkey_write failed: %s", ssh_err(r)); |
fatal_fr(r, "write key"); |
| sshkey_free(prv); |
|
| if (comment != NULL && *comment != '\0') |
if (comment != NULL && *comment != '\0') |
| fprintf(stdout, " %s", comment); |
fprintf(stdout, " %s", comment); |
| fprintf(stdout, "\n"); |
fprintf(stdout, "\n"); |
| |
if (sshkey_is_sk(prv)) { |
| |
debug("sk_application: \"%s\", sk_flags 0x%02x", |
| |
prv->sk_application, prv->sk_flags); |
| |
} |
| |
sshkey_free(prv); |
| free(comment); |
free(comment); |
| exit(0); |
exit(0); |
| } |
} |
|
|
| int i, nkeys; |
int i, nkeys; |
| enum sshkey_fp_rep rep; |
enum sshkey_fp_rep rep; |
| int fptype; |
int fptype; |
| char *fp, *ra; |
char *fp, *ra, **comments = NULL; |
| |
|
| fptype = print_bubblebabble ? SSH_DIGEST_SHA1 : fingerprint_hash; |
fptype = print_bubblebabble ? SSH_DIGEST_SHA1 : fingerprint_hash; |
| rep = print_bubblebabble ? SSH_FP_BUBBLEBABBLE : SSH_FP_DEFAULT; |
rep = print_bubblebabble ? SSH_FP_BUBBLEBABBLE : SSH_FP_DEFAULT; |
| |
|
| pkcs11_init(1); |
pkcs11_init(1); |
| nkeys = pkcs11_add_provider(pkcs11provider, NULL, &keys); |
nkeys = pkcs11_add_provider(pkcs11provider, NULL, &keys, &comments); |
| if (nkeys <= 0) |
if (nkeys <= 0) |
| fatal("cannot read public key from pkcs11"); |
fatal("cannot read public key from pkcs11"); |
| for (i = 0; i < nkeys; i++) { |
for (i = 0; i < nkeys; i++) { |
|
|
| ra = sshkey_fingerprint(keys[i], fingerprint_hash, |
ra = sshkey_fingerprint(keys[i], fingerprint_hash, |
| SSH_FP_RANDOMART); |
SSH_FP_RANDOMART); |
| if (fp == NULL || ra == NULL) |
if (fp == NULL || ra == NULL) |
| fatal("%s: sshkey_fingerprint fail", __func__); |
fatal_f("sshkey_fingerprint fail"); |
| printf("%u %s %s (PKCS11 key)\n", sshkey_size(keys[i]), |
printf("%u %s %s (PKCS11 key)\n", sshkey_size(keys[i]), |
| fp, sshkey_type(keys[i])); |
fp, sshkey_type(keys[i])); |
| if (log_level_get() >= SYSLOG_LEVEL_VERBOSE) |
if (log_level_get() >= SYSLOG_LEVEL_VERBOSE) |
|
|
| free(fp); |
free(fp); |
| } else { |
} else { |
| (void) sshkey_write(keys[i], stdout); /* XXX check */ |
(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]); |
sshkey_free(keys[i]); |
| } |
} |
| |
free(comments); |
| free(keys); |
free(keys); |
| pkcs11_terminate(); |
pkcs11_terminate(); |
| exit(0); |
exit(0); |
|
|
| fp = sshkey_fingerprint(public, fptype, rep); |
fp = sshkey_fingerprint(public, fptype, rep); |
| ra = sshkey_fingerprint(public, fingerprint_hash, SSH_FP_RANDOMART); |
ra = sshkey_fingerprint(public, fingerprint_hash, SSH_FP_RANDOMART); |
| if (fp == NULL || ra == NULL) |
if (fp == NULL || ra == NULL) |
| fatal("%s: sshkey_fingerprint failed", __func__); |
fatal_f("sshkey_fingerprint failed"); |
| mprintf("%u %s %s (%s)\n", sshkey_size(public), fp, |
mprintf("%u %s %s (%s)\n", sshkey_size(public), fp, |
| comment ? comment : "no comment", sshkey_type(public)); |
comment ? comment : "no comment", sshkey_type(public)); |
| if (log_level_get() >= SYSLOG_LEVEL_VERBOSE) |
if (log_level_get() >= SYSLOG_LEVEL_VERBOSE) |
|
|
| { |
{ |
| struct stat st; |
struct stat st; |
| char *comment = NULL; |
char *comment = NULL; |
| struct sshkey *public = NULL; |
struct sshkey *privkey = NULL, *pubkey = NULL; |
| int r; |
int r; |
| |
|
| if (stat(identity_file, &st) == -1) |
if (stat(identity_file, &st) == -1) |
| fatal("%s: %s", path, strerror(errno)); |
fatal("%s: %s", path, strerror(errno)); |
| if ((r = sshkey_load_public(path, &public, &comment)) != 0) { |
if ((r = sshkey_load_public(path, &pubkey, &comment)) != 0) |
| debug("load public \"%s\": %s", path, ssh_err(r)); |
debug_r(r, "load public \"%s\"", path); |
| |
if (pubkey == NULL || comment == NULL || *comment == '\0') { |
| |
free(comment); |
| if ((r = sshkey_load_private(path, NULL, |
if ((r = sshkey_load_private(path, NULL, |
| &public, &comment)) != 0) { |
&privkey, &comment)) != 0) |
| debug("load private \"%s\": %s", path, ssh_err(r)); |
debug_r(r, "load private \"%s\"", path); |
| 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); |
free(comment); |
| } |
} |
| |
|
|
|
| struct sshkey *private, *public; |
struct sshkey *private, *public; |
| char comment[1024], *prv_tmp, *pub_tmp, *prv_file, *pub_file; |
char comment[1024], *prv_tmp, *pub_tmp, *prv_file, *pub_file; |
| int i, type, fd, r; |
int i, type, fd, r; |
| FILE *f; |
|
| |
|
| for (i = 0; key_types[i].key_type; i++) { |
for (i = 0; key_types[i].key_type; i++) { |
| public = private = NULL; |
public = private = NULL; |
|
|
| fflush(stdout); |
fflush(stdout); |
| type = sshkey_type_from_name(key_types[i].key_type); |
type = sshkey_type_from_name(key_types[i].key_type); |
| if ((fd = mkstemp(prv_tmp)) == -1) { |
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)); |
prv_tmp, strerror(errno)); |
| goto failnext; |
goto failnext; |
| } |
} |
| close(fd); /* just using mkstemp() to generate/reserve a name */ |
(void)close(fd); /* just using mkstemp() to reserve a name */ |
| bits = 0; |
bits = 0; |
| type_bits_valid(type, NULL, &bits); |
type_bits_valid(type, NULL, &bits); |
| if ((r = sshkey_generate(type, bits, &private)) != 0) { |
if ((r = sshkey_generate(type, bits, &private)) != 0) { |
| error("sshkey_generate failed: %s", ssh_err(r)); |
error_r(r, "sshkey_generate failed"); |
| goto failnext; |
goto failnext; |
| } |
} |
| if ((r = sshkey_from_private(private, &public)) != 0) |
if ((r = sshkey_from_private(private, &public)) != 0) |
| fatal("sshkey_from_private failed: %s", ssh_err(r)); |
fatal_fr(r, "sshkey_from_private"); |
| snprintf(comment, sizeof comment, "%s@%s", pw->pw_name, |
snprintf(comment, sizeof comment, "%s@%s", pw->pw_name, |
| hostname); |
hostname); |
| if ((r = sshkey_save_private(private, prv_tmp, "", |
if ((r = sshkey_save_private(private, prv_tmp, "", |
| comment, private_key_format, openssh_format_cipher, |
comment, private_key_format, openssh_format_cipher, |
| rounds)) != 0) { |
rounds)) != 0) { |
| error("Saving key \"%s\" failed: %s", |
error_r(r, "Saving key \"%s\" failed", prv_tmp); |
| prv_tmp, ssh_err(r)); |
|
| goto failnext; |
goto failnext; |
| } |
} |
| if ((fd = mkstemp(pub_tmp)) == -1) { |
if ((fd = mkstemp(pub_tmp)) == -1) { |
|
|
| goto failnext; |
goto failnext; |
| } |
} |
| (void)fchmod(fd, 0644); |
(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)); |
error_r(r, "Unable to save public key to %s", |
| close(fd); |
identity_file); |
| goto failnext; |
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. */ |
/* Rename temporary files to their permanent locations. */ |
| if (rename(pub_tmp, pub_file) != 0) { |
if (rename(pub_tmp, pub_file) != 0) { |
|
|
| if ((hashed = host_hash(cp, NULL, 0)) == NULL) |
if ((hashed = host_hash(cp, NULL, 0)) == NULL) |
| fatal("hash_host failed"); |
fatal("hash_host failed"); |
| fprintf(ctx->out, "%s %s\n", hashed, l->rawkey); |
fprintf(ctx->out, "%s %s\n", hashed, l->rawkey); |
| |
free(hashed); |
| ctx->has_unhashed = 1; |
ctx->has_unhashed = 1; |
| } |
} |
| free(ohosts); |
free(ohosts); |
|
|
| ra = sshkey_fingerprint(l->key, |
ra = sshkey_fingerprint(l->key, |
| fingerprint_hash, SSH_FP_RANDOMART); |
fingerprint_hash, SSH_FP_RANDOMART); |
| if (fp == NULL || ra == NULL) |
if (fp == NULL || ra == NULL) |
| fatal("%s: sshkey_fingerprint failed", |
fatal_f("sshkey_fingerprint failed"); |
| __func__); |
mprintf("%s %s %s%s%s\n", ctx->host, |
| mprintf("%s %s %s %s\n", ctx->host, |
sshkey_type(l->key), fp, |
| sshkey_type(l->key), fp, l->comment); |
l->comment[0] ? " " : "", |
| |
l->comment); |
| if (log_level_get() >= SYSLOG_LEVEL_VERBOSE) |
if (log_level_get() >= SYSLOG_LEVEL_VERBOSE) |
| printf("%s\n", ra); |
printf("%s\n", ra); |
| free(ra); |
free(ra); |
|
|
| int r, fd, oerrno, inplace = 0; |
int r, fd, oerrno, inplace = 0; |
| struct known_hosts_ctx ctx; |
struct known_hosts_ctx ctx; |
| u_int foreach_options; |
u_int foreach_options; |
| |
struct stat sb; |
| |
|
| if (!have_identity) { |
if (!have_identity) { |
| cp = tilde_expand_filename(_PATH_SSH_USER_HOSTFILE, pw->pw_uid); |
cp = tilde_expand_filename(_PATH_SSH_USER_HOSTFILE, pw->pw_uid); |
|
|
| free(cp); |
free(cp); |
| have_identity = 1; |
have_identity = 1; |
| } |
} |
| |
if (stat(identity_file, &sb) != 0) |
| |
fatal("Cannot stat %s: %s", identity_file, strerror(errno)); |
| |
|
| memset(&ctx, 0, sizeof(ctx)); |
memset(&ctx, 0, sizeof(ctx)); |
| ctx.out = stdout; |
ctx.out = stdout; |
|
|
| unlink(tmp); |
unlink(tmp); |
| fatal("fdopen: %s", strerror(oerrno)); |
fatal("fdopen: %s", strerror(oerrno)); |
| } |
} |
| |
fchmod(fd, sb.st_mode & 0644); |
| inplace = 1; |
inplace = 1; |
| } |
} |
| /* XXX support identity_file == "-" for stdin */ |
/* XXX support identity_file == "-" for stdin */ |
|
|
| foreach_options |= print_fingerprint ? HKF_WANT_PARSE_KEY : 0; |
foreach_options |= print_fingerprint ? HKF_WANT_PARSE_KEY : 0; |
| if ((r = hostkeys_foreach(identity_file, (find_host || !hash_hosts) ? |
if ((r = hostkeys_foreach(identity_file, (find_host || !hash_hosts) ? |
| known_hosts_find_delete : known_hosts_hash, &ctx, name, NULL, |
known_hosts_find_delete : known_hosts_hash, &ctx, name, NULL, |
| foreach_options)) != 0) { |
foreach_options, 0)) != 0) { |
| if (inplace) |
if (inplace) |
| unlink(tmp); |
unlink(tmp); |
| fatal("%s: hostkeys_foreach failed: %s", __func__, ssh_err(r)); |
fatal_fr(r, "hostkeys_foreach"); |
| } |
} |
| |
|
| if (inplace) |
if (inplace) |
|
|
| RP_ALLOW_STDIN); |
RP_ALLOW_STDIN); |
| r = sshkey_load_private(identity_file, old_passphrase, |
r = sshkey_load_private(identity_file, old_passphrase, |
| &private, &comment); |
&private, &comment); |
| explicit_bzero(old_passphrase, strlen(old_passphrase)); |
freezero(old_passphrase, strlen(old_passphrase)); |
| free(old_passphrase); |
|
| if (r != 0) |
if (r != 0) |
| goto badkey; |
goto badkey; |
| } else if (r != 0) { |
} else if (r != 0) { |
| badkey: |
badkey: |
| fatal("Failed to load key %s: %s", identity_file, ssh_err(r)); |
fatal_r(r, "Failed to load key %s", identity_file); |
| } |
} |
| if (comment) |
if (comment) |
| mprintf("Key has comment '%s'\n", comment); |
mprintf("Key has comment '%s'\n", comment); |
|
|
| exit(1); |
exit(1); |
| } |
} |
| /* Destroy the other copy. */ |
/* Destroy the other copy. */ |
| explicit_bzero(passphrase2, strlen(passphrase2)); |
freezero(passphrase2, strlen(passphrase2)); |
| free(passphrase2); |
|
| } |
} |
| |
|
| /* Save the file using the new passphrase. */ |
/* Save the file using the new passphrase. */ |
| if ((r = sshkey_save_private(private, identity_file, passphrase1, |
if ((r = sshkey_save_private(private, identity_file, passphrase1, |
| comment, private_key_format, openssh_format_cipher, rounds)) != 0) { |
comment, private_key_format, openssh_format_cipher, rounds)) != 0) { |
| error("Saving key \"%s\" failed: %s.", |
error_r(r, "Saving key \"%s\" failed", identity_file); |
| identity_file, ssh_err(r)); |
freezero(passphrase1, strlen(passphrase1)); |
| explicit_bzero(passphrase1, strlen(passphrase1)); |
|
| free(passphrase1); |
|
| sshkey_free(private); |
sshkey_free(private); |
| free(comment); |
free(comment); |
| exit(1); |
exit(1); |
| } |
} |
| /* Destroy the passphrase and the copy of the key in memory. */ |
/* 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 */ |
sshkey_free(private); /* Destroys contents */ |
| free(comment); |
free(comment); |
| |
|
|
|
| int r; |
int r; |
| |
|
| if (fname == NULL) |
if (fname == NULL) |
| fatal("%s: no filename", __func__); |
fatal_f("no filename"); |
| if (stat(fname, &st) == -1) { |
if (stat(fname, &st) == -1) { |
| if (errno == ENOENT) |
if (errno == ENOENT) |
| return 0; |
return 0; |
| fatal("%s: %s", fname, strerror(errno)); |
fatal("%s: %s", fname, strerror(errno)); |
| } |
} |
| if ((r = sshkey_load_public(fname, &public, &comment)) != 0) |
if ((r = sshkey_load_public(fname, &public, &comment)) != 0) |
| fatal("Failed to read v2 public key from \"%s\": %s.", |
fatal_r(r, "Failed to read v2 public key from \"%s\"", fname); |
| fname, ssh_err(r)); |
|
| export_dns_rr(hname, public, stdout, print_generic); |
export_dns_rr(hname, public, stdout, print_generic); |
| sshkey_free(public); |
sshkey_free(public); |
| free(comment); |
free(comment); |
|
|
| struct sshkey *private; |
struct sshkey *private; |
| struct sshkey *public; |
struct sshkey *public; |
| struct stat st; |
struct stat st; |
| FILE *f; |
int r; |
| int r, fd; |
|
| |
|
| if (!have_identity) |
if (!have_identity) |
| ask_filename(pw, "Enter file in which the key is"); |
ask_filename(pw, "Enter file in which the key is"); |
|
|
| &private, &comment)) == 0) |
&private, &comment)) == 0) |
| passphrase = xstrdup(""); |
passphrase = xstrdup(""); |
| else if (r != SSH_ERR_KEY_WRONG_PASSPHRASE) |
else if (r != SSH_ERR_KEY_WRONG_PASSPHRASE) |
| fatal("Cannot load private key \"%s\": %s.", |
fatal_r(r, "Cannot load private key \"%s\"", identity_file); |
| identity_file, ssh_err(r)); |
|
| else { |
else { |
| if (identity_passphrase) |
if (identity_passphrase) |
| passphrase = xstrdup(identity_passphrase); |
passphrase = xstrdup(identity_passphrase); |
|
|
| /* Try to load using the passphrase. */ |
/* Try to load using the passphrase. */ |
| if ((r = sshkey_load_private(identity_file, passphrase, |
if ((r = sshkey_load_private(identity_file, passphrase, |
| &private, &comment)) != 0) { |
&private, &comment)) != 0) { |
| explicit_bzero(passphrase, strlen(passphrase)); |
freezero(passphrase, strlen(passphrase)); |
| free(passphrase); |
fatal_r(r, "Cannot load private key \"%s\"", |
| fatal("Cannot load private key \"%s\": %s.", |
identity_file); |
| identity_file, ssh_err(r)); |
|
| } |
} |
| } |
} |
| |
|
|
|
| if ((r = sshkey_save_private(private, identity_file, passphrase, |
if ((r = sshkey_save_private(private, identity_file, passphrase, |
| new_comment, private_key_format, openssh_format_cipher, |
new_comment, private_key_format, openssh_format_cipher, |
| rounds)) != 0) { |
rounds)) != 0) { |
| error("Saving key \"%s\" failed: %s", |
error_r(r, "Saving key \"%s\" failed", identity_file); |
| identity_file, ssh_err(r)); |
freezero(passphrase, strlen(passphrase)); |
| explicit_bzero(passphrase, strlen(passphrase)); |
|
| free(passphrase); |
|
| sshkey_free(private); |
sshkey_free(private); |
| free(comment); |
free(comment); |
| exit(1); |
exit(1); |
| } |
} |
| explicit_bzero(passphrase, strlen(passphrase)); |
freezero(passphrase, strlen(passphrase)); |
| free(passphrase); |
|
| if ((r = sshkey_from_private(private, &public)) != 0) |
if ((r = sshkey_from_private(private, &public)) != 0) |
| fatal("sshkey_from_private failed: %s", ssh_err(r)); |
fatal_fr(r, "sshkey_from_private"); |
| sshkey_free(private); |
sshkey_free(private); |
| |
|
| strlcat(identity_file, ".pub", sizeof(identity_file)); |
strlcat(identity_file, ".pub", sizeof(identity_file)); |
| 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_r(r, "Unable to save public key to %s", identity_file); |
| fatal("Could not save your public key in %s", identity_file); |
|
| 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); |
sshkey_free(public); |
| fprintf(f, " %s\n", new_comment); |
|
| fclose(f); |
|
| |
|
| free(comment); |
free(comment); |
| |
|
| if (strlen(new_comment) > 0) |
if (strlen(new_comment) > 0) |
|
|
| } |
} |
| |
|
| static void |
static void |
| add_flag_option(struct sshbuf *c, const char *name) |
cert_ext_add(const char *key, const char *value, int iscrit) |
| { |
{ |
| int r; |
cert_ext = xreallocarray(cert_ext, ncert_ext + 1, sizeof(*cert_ext)); |
| |
cert_ext[ncert_ext].key = xstrdup(key); |
| debug3("%s: %s", __func__, name); |
cert_ext[ncert_ext].val = value == NULL ? NULL : xstrdup(value); |
| if ((r = sshbuf_put_cstring(c, name)) != 0 || |
cert_ext[ncert_ext].crit = iscrit; |
| (r = sshbuf_put_string(c, NULL, 0)) != 0) |
ncert_ext++; |
| fatal("%s: buffer error: %s", __func__, ssh_err(r)); |
|
| } |
} |
| |
|
| static void |
/* qsort(3) comparison function for certificate extensions */ |
| add_string_option(struct sshbuf *c, const char *name, const char *value) |
static int |
| |
cert_ext_cmp(const void *_a, const void *_b) |
| { |
{ |
| struct sshbuf *b; |
const struct cert_ext *a = (const struct cert_ext *)_a; |
| |
const struct cert_ext *b = (const struct cert_ext *)_b; |
| int r; |
int r; |
| |
|
| debug3("%s: %s=%s", __func__, name, value); |
if (a->crit != b->crit) |
| if ((b = sshbuf_new()) == NULL) |
return (a->crit < b->crit) ? -1 : 1; |
| fatal("%s: sshbuf_new failed", __func__); |
if ((r = strcmp(a->key, b->key)) != 0) |
| if ((r = sshbuf_put_cstring(b, value)) != 0 || |
return r; |
| (r = sshbuf_put_cstring(c, name)) != 0 || |
if ((a->val == NULL) != (b->val == NULL)) |
| (r = sshbuf_put_stringb(c, b)) != 0) |
return (a->val == NULL) ? -1 : 1; |
| fatal("%s: buffer error: %s", __func__, ssh_err(r)); |
if (a->val != NULL && (r = strcmp(a->val, b->val)) != 0) |
| |
return r; |
| sshbuf_free(b); |
return 0; |
| } |
} |
| |
|
| #define OPTIONS_CRITICAL 1 |
#define OPTIONS_CRITICAL 1 |
|
|
| static void |
static void |
| prepare_options_buf(struct sshbuf *c, int which) |
prepare_options_buf(struct sshbuf *c, int which) |
| { |
{ |
| |
struct sshbuf *b; |
| size_t i; |
size_t i; |
| |
int r; |
| |
const struct cert_ext *ext; |
| |
|
| |
if ((b = sshbuf_new()) == NULL) |
| |
fatal_f("sshbuf_new failed"); |
| sshbuf_reset(c); |
sshbuf_reset(c); |
| if ((which & OPTIONS_CRITICAL) != 0 && |
for (i = 0; i < ncert_ext; i++) { |
| certflags_command != NULL) |
ext = &cert_ext[i]; |
| add_string_option(c, "force-command", certflags_command); |
if ((ext->crit && (which & OPTIONS_EXTENSIONS)) || |
| if ((which & OPTIONS_EXTENSIONS) != 0 && |
(!ext->crit && (which & OPTIONS_CRITICAL))) |
| (certflags_flags & CERTOPT_X_FWD) != 0) |
|
| add_flag_option(c, "permit-X11-forwarding"); |
|
| if ((which & OPTIONS_EXTENSIONS) != 0 && |
|
| (certflags_flags & CERTOPT_AGENT_FWD) != 0) |
|
| add_flag_option(c, "permit-agent-forwarding"); |
|
| if ((which & OPTIONS_EXTENSIONS) != 0 && |
|
| (certflags_flags & CERTOPT_PORT_FWD) != 0) |
|
| add_flag_option(c, "permit-port-forwarding"); |
|
| if ((which & OPTIONS_EXTENSIONS) != 0 && |
|
| (certflags_flags & CERTOPT_PTY) != 0) |
|
| add_flag_option(c, "permit-pty"); |
|
| if ((which & OPTIONS_EXTENSIONS) != 0 && |
|
| (certflags_flags & CERTOPT_USER_RC) != 0) |
|
| add_flag_option(c, "permit-user-rc"); |
|
| if ((which & OPTIONS_CRITICAL) != 0 && |
|
| certflags_src_addr != NULL) |
|
| add_string_option(c, "source-address", certflags_src_addr); |
|
| for (i = 0; i < ncert_userext; i++) { |
|
| if ((cert_userext[i].crit && (which & OPTIONS_EXTENSIONS)) || |
|
| (!cert_userext[i].crit && (which & OPTIONS_CRITICAL))) |
|
| continue; |
continue; |
| if (cert_userext[i].val == NULL) |
if (ext->val == NULL) { |
| add_flag_option(c, cert_userext[i].key); |
/* flag option */ |
| else { |
debug3_f("%s", ext->key); |
| add_string_option(c, cert_userext[i].key, |
if ((r = sshbuf_put_cstring(c, ext->key)) != 0 || |
| cert_userext[i].val); |
(r = sshbuf_put_string(c, NULL, 0)) != 0) |
| |
fatal_fr(r, "prepare flag"); |
| |
} else { |
| |
/* key/value option */ |
| |
debug3_f("%s=%s", ext->key, ext->val); |
| |
sshbuf_reset(b); |
| |
if ((r = sshbuf_put_cstring(c, ext->key)) != 0 || |
| |
(r = sshbuf_put_cstring(b, ext->val)) != 0 || |
| |
(r = sshbuf_put_stringb(c, b)) != 0) |
| |
fatal_fr(r, "prepare k/v"); |
| } |
} |
| } |
} |
| |
sshbuf_free(b); |
| } |
} |
| |
|
| |
static void |
| |
finalise_cert_exts(void) |
| |
{ |
| |
/* critical options */ |
| |
if (certflags_command != NULL) |
| |
cert_ext_add("force-command", certflags_command, 1); |
| |
if (certflags_src_addr != NULL) |
| |
cert_ext_add("source-address", certflags_src_addr, 1); |
| |
if ((certflags_flags & CERTOPT_REQUIRE_VERIFY) != 0) |
| |
cert_ext_add("verify-required", NULL, 1); |
| |
/* extensions */ |
| |
if ((certflags_flags & CERTOPT_X_FWD) != 0) |
| |
cert_ext_add("permit-X11-forwarding", NULL, 0); |
| |
if ((certflags_flags & CERTOPT_AGENT_FWD) != 0) |
| |
cert_ext_add("permit-agent-forwarding", NULL, 0); |
| |
if ((certflags_flags & CERTOPT_PORT_FWD) != 0) |
| |
cert_ext_add("permit-port-forwarding", NULL, 0); |
| |
if ((certflags_flags & CERTOPT_PTY) != 0) |
| |
cert_ext_add("permit-pty", NULL, 0); |
| |
if ((certflags_flags & CERTOPT_USER_RC) != 0) |
| |
cert_ext_add("permit-user-rc", NULL, 0); |
| |
if ((certflags_flags & CERTOPT_NO_REQUIRE_USER_PRESENCE) != 0) |
| |
cert_ext_add("no-touch-required", NULL, 0); |
| |
/* order lexically by key */ |
| |
if (ncert_ext > 0) |
| |
qsort(cert_ext, ncert_ext, sizeof(*cert_ext), cert_ext_cmp); |
| |
} |
| |
|
| static struct sshkey * |
static struct sshkey * |
| load_pkcs11_key(char *path) |
load_pkcs11_key(char *path) |
| { |
{ |
|
|
| int r, i, nkeys; |
int r, i, nkeys; |
| |
|
| if ((r = sshkey_load_public(path, &public, NULL)) != 0) |
if ((r = sshkey_load_public(path, &public, NULL)) != 0) |
| fatal("Couldn't load CA public key \"%s\": %s", |
fatal_r(r, "Couldn't load CA public key \"%s\"", path); |
| path, ssh_err(r)); |
|
| |
|
| nkeys = pkcs11_add_provider(pkcs11provider, identity_passphrase, &keys); |
nkeys = pkcs11_add_provider(pkcs11provider, identity_passphrase, |
| debug3("%s: %d keys", __func__, nkeys); |
&keys, NULL); |
| |
debug3_f("%d keys", nkeys); |
| if (nkeys <= 0) |
if (nkeys <= 0) |
| fatal("cannot read public key from pkcs11"); |
fatal("cannot read public key from pkcs11"); |
| for (i = 0; i < nkeys; i++) { |
for (i = 0; i < nkeys; i++) { |
|
|
| static int |
static int |
| agent_signer(struct sshkey *key, u_char **sigp, size_t *lenp, |
agent_signer(struct sshkey *key, u_char **sigp, size_t *lenp, |
| const u_char *data, size_t datalen, |
const u_char *data, size_t datalen, |
| const char *alg, u_int compat, void *ctx) |
const char *alg, const char *provider, const char *pin, |
| |
u_int compat, void *ctx) |
| { |
{ |
| int *agent_fdp = (int *)ctx; |
int *agent_fdp = (int *)ctx; |
| |
|
|
|
| unsigned long long cert_serial, int cert_serial_autoinc, |
unsigned long long cert_serial, int cert_serial_autoinc, |
| int argc, char **argv) |
int argc, char **argv) |
| { |
{ |
| int r, i, fd, found, agent_fd = -1; |
int r, i, found, agent_fd = -1; |
| u_int n; |
u_int n; |
| struct sshkey *ca, *public; |
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; |
struct ssh_identitylist *agent_ids; |
| size_t j; |
size_t j; |
| |
struct notifier_ctx *notifier = NULL; |
| |
|
| #ifdef ENABLE_PKCS11 |
#ifdef ENABLE_PKCS11 |
| pkcs11_init(1); |
pkcs11_init(1); |
|
|
| * agent. |
* agent. |
| */ |
*/ |
| if ((r = sshkey_load_public(tmp, &ca, NULL)) != 0) |
if ((r = sshkey_load_public(tmp, &ca, NULL)) != 0) |
| fatal("Cannot load CA public key %s: %s", |
fatal_r(r, "Cannot load CA public key %s", tmp); |
| tmp, ssh_err(r)); |
|
| if ((r = ssh_get_authentication_socket(&agent_fd)) != 0) |
if ((r = ssh_get_authentication_socket(&agent_fd)) != 0) |
| fatal("Cannot use public key for CA signature: %s", |
fatal_r(r, "Cannot use public key for CA signature"); |
| ssh_err(r)); |
|
| if ((r = ssh_fetch_identitylist(agent_fd, &agent_ids)) != 0) |
if ((r = ssh_fetch_identitylist(agent_fd, &agent_ids)) != 0) |
| fatal("Retrieve agent key list: %s", ssh_err(r)); |
fatal_r(r, "Retrieve agent key list"); |
| found = 0; |
found = 0; |
| for (j = 0; j < agent_ids->nkeys; j++) { |
for (j = 0; j < agent_ids->nkeys; j++) { |
| if (sshkey_equal(ca, agent_ids->keys[j])) { |
if (sshkey_equal(ca, agent_ids->keys[j])) { |
|
|
| } else { |
} else { |
| /* CA key is assumed to be a private key on the filesystem */ |
/* CA key is assumed to be a private key on the filesystem */ |
| ca = load_identity(tmp, NULL); |
ca = load_identity(tmp, NULL); |
| |
if (sshkey_is_sk(ca) && |
| |
(ca->sk_flags & SSH_SK_USER_VERIFICATION_REQD)) { |
| |
if ((pin = read_passphrase("Enter PIN for CA key: ", |
| |
RP_ALLOW_STDIN)) == NULL) |
| |
fatal_f("couldn't read PIN"); |
| |
} |
| } |
} |
| free(tmp); |
free(tmp); |
| |
|
| 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", |
fatal("CA key type %s doesn't match specified %s", |
| sshkey_ssh_name(ca), key_type_name); |
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++) { |
for (i = 0; i < argc; i++) { |
| /* Split list of principals */ |
/* Split list of principals */ |
| n = 0; |
n = 0; |
|
|
| |
|
| tmp = tilde_expand_filename(argv[i], pw->pw_uid); |
tmp = tilde_expand_filename(argv[i], pw->pw_uid); |
| if ((r = sshkey_load_public(tmp, &public, &comment)) != 0) |
if ((r = sshkey_load_public(tmp, &public, &comment)) != 0) |
| fatal("%s: unable to open \"%s\": %s", |
fatal_r(r, "load pubkey \"%s\"", tmp); |
| __func__, tmp, ssh_err(r)); |
if (sshkey_is_cert(public)) |
| if (public->type != KEY_RSA && public->type != KEY_DSA && |
fatal_f("key \"%s\" type %s cannot be certified", |
| public->type != KEY_ECDSA && public->type != KEY_ED25519 && |
tmp, sshkey_type(public)); |
| public->type != KEY_XMSS) |
|
| fatal("%s: key \"%s\" type %s cannot be certified", |
|
| __func__, tmp, sshkey_type(public)); |
|
| |
|
| /* Prepare certificate to sign */ |
/* Prepare certificate to sign */ |
| if ((r = sshkey_to_certified(public)) != 0) |
if ((r = sshkey_to_certified(public)) != 0) |
| fatal("Could not upgrade key %s to certificate: %s", |
fatal_r(r, "Could not upgrade key %s to certificate", tmp); |
| tmp, ssh_err(r)); |
|
| public->cert->type = cert_key_type; |
public->cert->type = cert_key_type; |
| public->cert->serial = (u_int64_t)cert_serial; |
public->cert->serial = (u_int64_t)cert_serial; |
| public->cert->key_id = xstrdup(cert_key_id); |
public->cert->key_id = xstrdup(cert_key_id); |
|
|
| OPTIONS_EXTENSIONS); |
OPTIONS_EXTENSIONS); |
| if ((r = sshkey_from_private(ca, |
if ((r = sshkey_from_private(ca, |
| &public->cert->signature_key)) != 0) |
&public->cert->signature_key)) != 0) |
| fatal("sshkey_from_private (ca key): %s", ssh_err(r)); |
fatal_r(r, "sshkey_from_private (ca key)"); |
| |
|
| if (agent_fd != -1 && (ca->flags & SSHKEY_FLAG_EXT) != 0) { |
if (agent_fd != -1 && (ca->flags & SSHKEY_FLAG_EXT) != 0) { |
| if ((r = sshkey_certify_custom(public, ca, |
if ((r = sshkey_certify_custom(public, ca, |
| key_type_name, agent_signer, &agent_fd)) != 0) |
key_type_name, sk_provider, NULL, agent_signer, |
| fatal("Couldn't certify key %s via agent: %s", |
&agent_fd)) != 0) |
| tmp, ssh_err(r)); |
fatal_r(r, "Couldn't certify %s via agent", tmp); |
| } else { |
} else { |
| if ((sshkey_certify(public, ca, key_type_name)) != 0) |
if (sshkey_is_sk(ca) && |
| fatal("Couldn't certify key %s: %s", |
(ca->sk_flags & SSH_SK_USER_PRESENCE_REQD)) { |
| tmp, ssh_err(r)); |
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, "User presence confirmed"); |
| |
if (r != 0) |
| |
fatal_r(r, "Couldn't certify key %s", tmp); |
| } |
} |
| |
|
| if ((cp = strrchr(tmp, '.')) != NULL && strcmp(cp, ".pub") == 0) |
if ((cp = strrchr(tmp, '.')) != NULL && strcmp(cp, ".pub") == 0) |
|
|
| xasprintf(&out, "%s-cert.pub", tmp); |
xasprintf(&out, "%s-cert.pub", tmp); |
| free(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_r(r, "Unable to save public key to %s", |
| strerror(errno)); |
identity_file); |
| 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) { |
if (!quiet) { |
| sshkey_format_cert_validity(public->cert, |
sshkey_format_cert_validity(public->cert, |
|
|
| if (cert_serial_autoinc) |
if (cert_serial_autoinc) |
| cert_serial++; |
cert_serial++; |
| } |
} |
| |
if (pin != NULL) |
| |
freezero(pin, strlen(pin)); |
| |
free(ca_fp); |
| #ifdef ENABLE_PKCS11 |
#ifdef ENABLE_PKCS11 |
| pkcs11_terminate(); |
pkcs11_terminate(); |
| #endif |
#endif |
|
|
| certflags_flags &= ~CERTOPT_USER_RC; |
certflags_flags &= ~CERTOPT_USER_RC; |
| else if (strcasecmp(opt, "permit-user-rc") == 0) |
else if (strcasecmp(opt, "permit-user-rc") == 0) |
| certflags_flags |= CERTOPT_USER_RC; |
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 (strcasecmp(opt, "no-verify-required") == 0) |
| |
certflags_flags &= ~CERTOPT_REQUIRE_VERIFY; |
| |
else if (strcasecmp(opt, "verify-required") == 0) |
| |
certflags_flags |= CERTOPT_REQUIRE_VERIFY; |
| else if (strncasecmp(opt, "force-command=", 14) == 0) { |
else if (strncasecmp(opt, "force-command=", 14) == 0) { |
| val = opt + 14; |
val = opt + 14; |
| if (*val == '\0') |
if (*val == '\0') |
|
|
| fatal("Invalid source-address list"); |
fatal("Invalid source-address list"); |
| certflags_src_addr = xstrdup(val); |
certflags_src_addr = xstrdup(val); |
| } else if (strncasecmp(opt, "extension:", 10) == 0 || |
} else if (strncasecmp(opt, "extension:", 10) == 0 || |
| (iscrit = (strncasecmp(opt, "critical:", 9) == 0))) { |
(iscrit = (strncasecmp(opt, "critical:", 9) == 0))) { |
| val = xstrdup(strchr(opt, ':') + 1); |
val = xstrdup(strchr(opt, ':') + 1); |
| if ((cp = strchr(val, '=')) != NULL) |
if ((cp = strchr(val, '=')) != NULL) |
| *cp++ = '\0'; |
*cp++ = '\0'; |
| cert_userext = xreallocarray(cert_userext, ncert_userext + 1, |
cert_ext_add(val, cp, iscrit); |
| sizeof(*cert_userext)); |
free(val); |
| cert_userext[ncert_userext].key = val; |
|
| cert_userext[ncert_userext].val = cp == NULL ? |
|
| NULL : xstrdup(cp); |
|
| cert_userext[ncert_userext].crit = iscrit; |
|
| ncert_userext++; |
|
| } else |
} else |
| fatal("Unsupported certificate option \"%s\"", opt); |
fatal("Unsupported certificate option \"%s\"", opt); |
| } |
} |
|
|
| static void |
static void |
| show_options(struct sshbuf *optbuf, int in_critical) |
show_options(struct sshbuf *optbuf, int in_critical) |
| { |
{ |
| char *name, *arg; |
char *name, *arg, *hex; |
| struct sshbuf *options, *option = NULL; |
struct sshbuf *options, *option = NULL; |
| int r; |
int r; |
| |
|
| if ((options = sshbuf_fromb(optbuf)) == NULL) |
if ((options = sshbuf_fromb(optbuf)) == NULL) |
| fatal("%s: sshbuf_fromb failed", __func__); |
fatal_f("sshbuf_fromb failed"); |
| while (sshbuf_len(options) != 0) { |
while (sshbuf_len(options) != 0) { |
| sshbuf_free(option); |
sshbuf_free(option); |
| option = NULL; |
option = NULL; |
| if ((r = sshbuf_get_cstring(options, &name, NULL)) != 0 || |
if ((r = sshbuf_get_cstring(options, &name, NULL)) != 0 || |
| (r = sshbuf_froms(options, &option)) != 0) |
(r = sshbuf_froms(options, &option)) != 0) |
| fatal("%s: buffer error: %s", __func__, ssh_err(r)); |
fatal_fr(r, "parse option"); |
| printf(" %s", name); |
printf(" %s", name); |
| if (!in_critical && |
if (!in_critical && |
| (strcmp(name, "permit-X11-forwarding") == 0 || |
(strcmp(name, "permit-X11-forwarding") == 0 || |
| strcmp(name, "permit-agent-forwarding") == 0 || |
strcmp(name, "permit-agent-forwarding") == 0 || |
| strcmp(name, "permit-port-forwarding") == 0 || |
strcmp(name, "permit-port-forwarding") == 0 || |
| strcmp(name, "permit-pty") == 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"); |
printf("\n"); |
| else if (in_critical && |
} else if (in_critical && |
| (strcmp(name, "force-command") == 0 || |
(strcmp(name, "force-command") == 0 || |
| strcmp(name, "source-address") == 0)) { |
strcmp(name, "source-address") == 0)) { |
| if ((r = sshbuf_get_cstring(option, &arg, NULL)) != 0) |
if ((r = sshbuf_get_cstring(option, &arg, NULL)) != 0) |
| fatal("%s: buffer error: %s", |
fatal_fr(r, "parse critical"); |
| __func__, ssh_err(r)); |
|
| printf(" %s\n", arg); |
printf(" %s\n", arg); |
| free(arg); |
free(arg); |
| } else { |
} else if (in_critical && |
| printf(" UNKNOWN OPTION (len %zu)\n", |
strcmp(name, "verify-required") == 0) { |
| sshbuf_len(option)); |
printf("\n"); |
| |
} else if (sshbuf_len(option) > 0) { |
| |
hex = sshbuf_dtob16(option); |
| |
printf(" UNKNOWN OPTION: %s (len %zu)\n", |
| |
hex, sshbuf_len(option)); |
| sshbuf_reset(option); |
sshbuf_reset(option); |
| } |
free(hex); |
| |
} else |
| |
printf(" UNKNOWN FLAG OPTION\n"); |
| free(name); |
free(name); |
| if (sshbuf_len(option) != 0) |
if (sshbuf_len(option) != 0) |
| fatal("Option corrupt: extra data at end"); |
fatal("Option corrupt: extra data at end"); |
|
|
| ca_fp = sshkey_fingerprint(key->cert->signature_key, |
ca_fp = sshkey_fingerprint(key->cert->signature_key, |
| fingerprint_hash, SSH_FP_DEFAULT); |
fingerprint_hash, SSH_FP_DEFAULT); |
| if (key_fp == NULL || ca_fp == NULL) |
if (key_fp == NULL || ca_fp == NULL) |
| fatal("%s: sshkey_fingerprint fail", __func__); |
fatal_f("sshkey_fingerprint fail"); |
| sshkey_format_cert_validity(key->cert, valid, sizeof(valid)); |
sshkey_format_cert_validity(key->cert, valid, sizeof(valid)); |
| |
|
| printf(" Type: %s %s certificate\n", sshkey_ssh_name(key), |
printf(" Type: %s %s certificate\n", sshkey_ssh_name(key), |
|
|
| if ((key = sshkey_new(KEY_UNSPEC)) == NULL) |
if ((key = sshkey_new(KEY_UNSPEC)) == NULL) |
| fatal("sshkey_new"); |
fatal("sshkey_new"); |
| if ((r = sshkey_read(key, &cp)) != 0) { |
if ((r = sshkey_read(key, &cp)) != 0) { |
| error("%s:%lu: invalid key: %s", path, |
error_r(r, "%s:%lu: invalid key", path, lnum); |
| lnum, ssh_err(r)); |
|
| continue; |
continue; |
| } |
} |
| if (!sshkey_is_cert(key)) { |
if (!sshkey_is_cert(key)) { |
|
|
| exit(ok ? 0 : 1); |
exit(ok ? 0 : 1); |
| } |
} |
| |
|
| #ifdef WITH_OPENSSL |
|
| static void |
static void |
| load_krl(const char *path, struct ssh_krl **krlp) |
load_krl(const char *path, struct ssh_krl **krlp) |
| { |
{ |
| struct sshbuf *krlbuf; |
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"); |
fatal_r(r, "Unable to load KRL %s", path); |
| 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 */ |
/* XXX check sigs */ |
| if ((r = ssh_krl_from_blob(krlbuf, krlp, NULL, 0)) != 0 || |
if ((r = ssh_krl_from_blob(krlbuf, krlp, NULL, 0)) != 0 || |
| *krlp == NULL) |
*krlp == NULL) |
| fatal("Invalid KRL file: %s", ssh_err(r)); |
fatal_r(r, "Invalid KRL file %s", path); |
| sshbuf_free(krlbuf); |
sshbuf_free(krlbuf); |
| } |
} |
| |
|
|
|
| tmp[tlen] = '\0'; |
tmp[tlen] = '\0'; |
| } |
} |
| if ((b = sshbuf_new()) == NULL) |
if ((b = sshbuf_new()) == NULL) |
| fatal("%s: sshbuf_new failed", __func__); |
fatal_f("sshbuf_new failed"); |
| if ((r = sshbuf_b64tod(b, tmp)) != 0) |
if ((r = sshbuf_b64tod(b, tmp)) != 0) |
| fatal("%s:%lu: decode hash failed: %s", file, lnum, ssh_err(r)); |
fatal_r(r, "%s:%lu: decode hash failed", file, lnum); |
| free(tmp); |
free(tmp); |
| *lenp = sshbuf_len(b); |
*lenp = sshbuf_len(b); |
| *blobp = xmalloc(*lenp); |
*blobp = xmalloc(*lenp); |
|
|
| } |
} |
| if (ssh_krl_revoke_cert_by_serial_range(krl, |
if (ssh_krl_revoke_cert_by_serial_range(krl, |
| ca, serial, serial2) != 0) { |
ca, serial, serial2) != 0) { |
| fatal("%s: revoke serial failed", |
fatal_f("revoke serial failed"); |
| __func__); |
|
| } |
} |
| } else if (strncasecmp(cp, "id:", 3) == 0) { |
} else if (strncasecmp(cp, "id:", 3) == 0) { |
| if (ca == NULL && !wild_ca) { |
if (ca == NULL && !wild_ca) { |
|
|
| cp += 3; |
cp += 3; |
| cp = cp + strspn(cp, " \t"); |
cp = cp + strspn(cp, " \t"); |
| if (ssh_krl_revoke_cert_by_key_id(krl, ca, cp) != 0) |
if (ssh_krl_revoke_cert_by_key_id(krl, ca, cp) != 0) |
| fatal("%s: revoke key ID failed", __func__); |
fatal_f("revoke key ID failed"); |
| } else if (strncasecmp(cp, "hash:", 5) == 0) { |
} else if (strncasecmp(cp, "hash:", 5) == 0) { |
| cp += 5; |
cp += 5; |
| cp = cp + strspn(cp, " \t"); |
cp = cp + strspn(cp, " \t"); |
| hash_to_blob(cp, &blob, &blen, file, lnum); |
hash_to_blob(cp, &blob, &blen, file, lnum); |
| r = ssh_krl_revoke_key_sha256(krl, blob, blen); |
r = ssh_krl_revoke_key_sha256(krl, blob, blen); |
| |
if (r != 0) |
| |
fatal_fr(r, "revoke key failed"); |
| } else { |
} else { |
| if (strncasecmp(cp, "key:", 4) == 0) { |
if (strncasecmp(cp, "key:", 4) == 0) { |
| cp += 4; |
cp += 4; |
|
|
| if ((key = sshkey_new(KEY_UNSPEC)) == NULL) |
if ((key = sshkey_new(KEY_UNSPEC)) == NULL) |
| fatal("sshkey_new"); |
fatal("sshkey_new"); |
| if ((r = sshkey_read(key, &cp)) != 0) |
if ((r = sshkey_read(key, &cp)) != 0) |
| fatal("%s:%lu: invalid key: %s", |
fatal_r(r, "%s:%lu: invalid key", path, lnum); |
| path, lnum, ssh_err(r)); |
|
| if (was_explicit_key) |
if (was_explicit_key) |
| r = ssh_krl_revoke_key_explicit(krl, key); |
r = ssh_krl_revoke_key_explicit(krl, key); |
| else if (was_sha1) { |
else if (was_sha1) { |
|
|
| } else |
} else |
| r = ssh_krl_revoke_key(krl, key); |
r = ssh_krl_revoke_key(krl, key); |
| if (r != 0) |
if (r != 0) |
| fatal("%s: revoke key failed: %s", |
fatal_fr(r, "revoke key failed"); |
| __func__, ssh_err(r)); |
|
| freezero(blob, blen); |
freezero(blob, blen); |
| blob = NULL; |
blob = NULL; |
| blen = 0; |
blen = 0; |
|
|
| struct ssh_krl *krl; |
struct ssh_krl *krl; |
| struct stat sb; |
struct stat sb; |
| struct sshkey *ca = NULL; |
struct sshkey *ca = NULL; |
| int fd, i, r, wild_ca = 0; |
int i, r, wild_ca = 0; |
| char *tmp; |
char *tmp; |
| struct sshbuf *kbuf; |
struct sshbuf *kbuf; |
| |
|
|
|
| else { |
else { |
| tmp = tilde_expand_filename(ca_key_path, pw->pw_uid); |
tmp = tilde_expand_filename(ca_key_path, pw->pw_uid); |
| if ((r = sshkey_load_public(tmp, &ca, NULL)) != 0) |
if ((r = sshkey_load_public(tmp, &ca, NULL)) != 0) |
| fatal("Cannot load CA public key %s: %s", |
fatal_r(r, "Cannot load CA public key %s", tmp); |
| tmp, ssh_err(r)); |
|
| free(tmp); |
free(tmp); |
| } |
} |
| } |
} |
|
|
| fatal("sshbuf_new failed"); |
fatal("sshbuf_new failed"); |
| if (ssh_krl_to_blob(krl, kbuf, NULL, 0) != 0) |
if (ssh_krl_to_blob(krl, kbuf, NULL, 0) != 0) |
| fatal("Couldn't generate KRL"); |
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, sshbuf_mutable_ptr(kbuf), sshbuf_len(kbuf)) != |
|
| sshbuf_len(kbuf)) |
|
| fatal("write %s: %s", identity_file, strerror(errno)); |
fatal("write %s: %s", identity_file, strerror(errno)); |
| close(fd); |
|
| sshbuf_free(kbuf); |
sshbuf_free(kbuf); |
| ssh_krl_free(krl); |
ssh_krl_free(krl); |
| sshkey_free(ca); |
sshkey_free(ca); |
| } |
} |
| |
|
| static void |
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; |
int i, r, ret = 0; |
| char *comment; |
char *comment; |
|
|
| if (*identity_file == '\0') |
if (*identity_file == '\0') |
| fatal("KRL checking requires an input file"); |
fatal("KRL checking requires an input file"); |
| load_krl(identity_file, &krl); |
load_krl(identity_file, &krl); |
| |
if (print_krl) |
| |
krl_dump(krl, stdout); |
| for (i = 0; i < argc; i++) { |
for (i = 0; i < argc; i++) { |
| if ((r = sshkey_load_public(argv[i], &k, &comment)) != 0) |
if ((r = sshkey_load_public(argv[i], &k, &comment)) != 0) |
| fatal("Cannot load public key %s: %s", |
fatal_r(r, "Cannot load public key %s", argv[i]); |
| argv[i], ssh_err(r)); |
|
| r = ssh_krl_check_key(krl, k); |
r = ssh_krl_check_key(krl, k); |
| printf("%s%s%s%s: %s\n", argv[i], |
printf("%s%s%s%s: %s\n", argv[i], |
| *comment ? " (" : "", comment, *comment ? ")" : "", |
*comment ? " (" : "", comment, *comment ? ")" : "", |
|
|
| ssh_krl_free(krl); |
ssh_krl_free(krl); |
| exit(ret); |
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); |
| |
static const char * const suffixes[] = { "-cert.pub", ".pub", NULL }; |
| |
struct sshkey *ret = NULL, *privkey = NULL; |
| |
int r, waspub = 0; |
| |
struct stat st; |
| |
|
| |
/* |
| |
* 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_f("%s looks like a public key, using private key " |
| |
"path %s instead", keypath, privpath); |
| |
waspub = 1; |
| |
} |
| |
if (waspub && stat(privpath, &st) != 0 && errno == ENOENT) |
| |
fatal("No private key found for public key \"%s\"", keypath); |
| |
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); |
| |
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_fr(r, "sshkey_to_certified"); |
| |
goto done; |
| |
} |
| |
if ((r = sshkey_cert_copy(pubkey, privkey)) != 0) { |
| |
error_fr(r, "sshkey_cert_copy"); |
| |
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, const char *hashalg, 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_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_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, hashalg, sk_provider, pin, |
| |
fd, sig_namespace, &sigbuf, signer, signer_ctx)) != 0) { |
| |
error_r(r, "Signing %s failed", filename); |
| |
goto out; |
| |
} |
| |
if ((r = sshsig_armor(sigbuf, &abuf)) != 0) { |
| |
error_fr(r, "sshsig_armor"); |
| |
goto out; |
| |
} |
| |
if ((asig = sshbuf_dup_string(abuf)) == NULL) { |
| |
error_f("buffer error"); |
| |
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_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++) { |
| |
if (strcmp(argv[i], "-") != 0) |
| |
continue; |
| |
if (i > 0 || argc > 1) |
| |
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_r(r, "Couldn't load public key %s", keypath); |
| |
goto done; |
| |
} |
| |
|
| |
if ((r = ssh_get_authentication_socket(&agent_fd)) != 0) { |
| |
if (require_agent) |
| |
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 { |
| |
if (require_agent) |
| |
fatal("Couldn't find key in agent"); |
| |
debug_r(r, "Couldn't find key in agent"); |
| |
} |
| |
} |
| |
|
| |
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, hashalg, 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, |
| |
hashalg, 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); |
| |
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, |
| |
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_r(r, "Couldn't read signature file"); |
| |
goto done; |
| |
} |
| |
|
| |
if ((r = sshsig_dearmor(abuf, &sigbuf)) != 0) { |
| |
error_fr(r, "sshsig_armor"); |
| |
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_f("sshkey_fingerprint failed"); |
| |
debug("Valid (unverified) signature from key %s", fp); |
| |
if (sig_details != NULL) { |
| |
debug2_f("signature details: counter = %u, flags = 0x%02x", |
| |
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_fr(r, "sshkey_check_revoked"); |
| |
goto done; |
| |
} |
| |
} |
| |
|
| |
if (allowed_keys != NULL && (r = sshsig_check_allowed_keys(allowed_keys, |
| |
sign_key, principal, sig_namespace, verify_time)) != 0) { |
| |
debug3_fr(r, "sshsig_check_allowed_keys"); |
| |
goto done; |
| |
} |
| |
/* success */ |
| |
ret = 0; |
| |
done: |
| |
if (!quiet) { |
| |
if (ret == 0) { |
| |
if ((fp = sshkey_fingerprint(sign_key, fingerprint_hash, |
| |
SSH_FP_DEFAULT)) == NULL) |
| |
fatal_f("sshkey_fingerprint failed"); |
| |
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); |
| |
sshkey_sig_details_free(sig_details); |
| |
free(fp); |
| |
return ret; |
| |
} |
| |
|
| |
static int |
| |
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_r(r, "Couldn't read signature file"); |
| |
goto done; |
| |
} |
| |
if ((r = sshsig_dearmor(abuf, &sigbuf)) != 0) { |
| |
error_fr(r, "sshsig_armor"); |
| |
goto done; |
| |
} |
| |
if ((r = sshsig_get_pubkey(sigbuf, &sign_key)) != 0) { |
| |
error_fr(r, "sshsig_get_pubkey"); |
| |
goto done; |
| |
} |
| |
if ((r = sshsig_find_principals(allowed_keys, sign_key, |
| |
verify_time, &principals)) != 0) { |
| |
if (r != SSH_ERR_KEY_NOT_FOUND) |
| |
error_fr(r, "sshsig_find_principal"); |
| |
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 int |
| |
sig_match_principals(const char *allowed_keys, char *principal, |
| |
char * const *opts, size_t nopts) |
| |
{ |
| |
int r; |
| |
char **principals = NULL; |
| |
size_t i, nprincipals = 0; |
| |
|
| |
if ((r = sig_process_opts(opts, nopts, NULL, NULL, NULL)) != 0) |
| |
return r; /* error already logged */ |
| |
|
| |
if ((r = sshsig_match_principals(allowed_keys, principal, |
| |
&principals, &nprincipals)) != 0) { |
| |
debug_f("match: %s", ssh_err(r)); |
| |
fprintf(stderr, "No principal matched.\n"); |
| |
return r; |
| |
} |
| |
for (i = 0; i < nprincipals; i++) { |
| |
printf("%s\n", principals[i]); |
| |
free(principals[i]); |
| |
} |
| |
free(principals); |
| |
|
| |
return 0; |
| |
} |
| |
|
| static void |
static void |
| |
do_moduli_gen(const char *out_file, char **opts, size_t nopts) |
| |
{ |
| |
#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 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 sshsk_resident_key **srks; |
| |
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"); |
| |
|
| |
pin = read_passphrase("Enter PIN for authenticator: ", RP_ALLOW_STDIN); |
| |
if (!quiet) { |
| |
printf("You may need to touch your authenticator " |
| |
"to authorize key download.\n"); |
| |
} |
| |
if ((r = sshsk_load_resident(skprovider, device, pin, 0, |
| |
&srks, &nsrks)) != 0) { |
| |
if (pin != NULL) |
| |
freezero(pin, strlen(pin)); |
| |
error_r(r, "Unable to load resident keys"); |
| |
return -1; |
| |
} |
| |
if (nsrks == 0) |
| |
logit("No keys to download"); |
| |
if (pin != NULL) |
| |
freezero(pin, strlen(pin)); |
| |
|
| |
for (i = 0; i < nsrks; i++) { |
| |
key = srks[i]->key; |
| |
if (key->type != KEY_ECDSA_SK && key->type != KEY_ED25519_SK) { |
| |
error("Unsupported key type %s (%d)", |
| |
sshkey_type(key), key->type); |
| |
continue; |
| |
} |
| |
if ((fp = sshkey_fingerprint(key, fingerprint_hash, |
| |
SSH_FP_DEFAULT)) == NULL) |
| |
fatal_f("sshkey_fingerprint failed"); |
| |
debug_f("key %zu: %s %s %s (flags 0x%02x)", i, |
| |
sshkey_type(key), fp, key->sk_application, key->sk_flags); |
| |
ext = sk_suffix(key->sk_application, |
| |
srks[i]->user_id, srks[i]->user_id_len); |
| |
xasprintf(&path, "id_%s_rk%s%s", |
| |
key->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(key, path, pass, |
| |
key->sk_application, private_key_format, |
| |
openssh_format_cipher, rounds)) != 0) { |
| |
error_r(r, "Saving key \"%s\" failed", path); |
| |
free(path); |
| |
break; |
| |
} |
| |
if (!quiet) { |
| |
printf("Saved %s key%s%s to %s\n", sshkey_type(key), |
| |
*ext != '\0' ? " " : "", |
| |
*ext != '\0' ? key->sk_application : "", |
| |
path); |
| |
} |
| |
|
| |
/* Save public key too */ |
| |
xasprintf(&pubpath, "%s.pub", path); |
| |
free(path); |
| |
if ((r = sshkey_save_public(key, pubpath, |
| |
key->sk_application)) != 0) { |
| |
error_r(r, "Saving public key \"%s\" failed", pubpath); |
| |
free(pubpath); |
| |
break; |
| |
} |
| |
free(pubpath); |
| |
} |
| |
|
| |
if (i >= nsrks) |
| |
ret = 0; /* success */ |
| |
if (pass != NULL) |
| |
freezero(pass, strlen(pass)); |
| |
sshsk_free_resident_keys(srks, nsrks); |
| |
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 void |
| usage(void) |
usage(void) |
| { |
{ |
| fprintf(stderr, |
fprintf(stderr, |
| "usage: ssh-keygen [-q] [-b bits] [-t dsa | ecdsa | ed25519 | rsa] [-m format]\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] [-m format]\n" |
" [-t dsa | ecdsa | ecdsa-sk | ed25519 | ed25519-sk | rsa]\n" |
| " [-f keyfile]\n" |
" [-w provider] [-Z cipher]\n" |
| " ssh-keygen -i [-m key_format] [-f input_keyfile]\n" |
" ssh-keygen -p [-a rounds] [-f keyfile] [-m format] [-N new_passphrase]\n" |
| " ssh-keygen -e [-m key_format] [-f input_keyfile]\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 -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 -l [-v] [-E fingerprint_hash] [-f input_keyfile]\n" |
| " ssh-keygen -B [-f input_keyfile]\n"); |
" ssh-keygen -B [-f input_keyfile]\n"); |
| #ifdef ENABLE_PKCS11 |
#ifdef ENABLE_PKCS11 |
|
|
| " ssh-keygen -D pkcs11\n"); |
" ssh-keygen -D pkcs11\n"); |
| #endif |
#endif |
| fprintf(stderr, |
fprintf(stderr, |
| " ssh-keygen -F hostname [-f known_hosts_file] [-l]\n" |
" ssh-keygen -F hostname [-lv] [-f known_hosts_file]\n" |
| " ssh-keygen -H [-f known_hosts_file]\n" |
" ssh-keygen -H [-f known_hosts_file]\n" |
| |
" ssh-keygen -K [-a rounds] [-w provider]\n" |
| " ssh-keygen -R hostname [-f known_hosts_file]\n" |
" ssh-keygen -R hostname [-f known_hosts_file]\n" |
| " ssh-keygen -r hostname [-f input_keyfile] [-g]\n" |
" ssh-keygen -r hostname [-g] [-f input_keyfile]\n" |
| #ifdef WITH_OPENSSL |
#ifdef WITH_OPENSSL |
| " ssh-keygen -G output_file [-v] [-b bits] [-M memory] [-S start_point]\n" |
" ssh-keygen -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 |
#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 -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" |
" ssh-keygen -k -f krl_file [-u] [-s ca_public] [-z version_number]\n" |
| " file ...\n" |
" file ...\n" |
| " ssh-keygen -Q -f krl_file file ...\n"); |
" ssh-keygen -Q [-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 [-O option] ...\n" |
| |
" ssh-keygen -Y verify -f allowed_signers_file -I signer_identity\n" |
| |
" -n namespace -s signature_file [-r krl_file] [-O option]\n"); |
| exit(1); |
exit(1); |
| } |
} |
| |
|
|
|
| int |
int |
| main(int argc, char **argv) |
main(int argc, char **argv) |
| { |
{ |
| char dotsshdir[PATH_MAX], comment[1024], *passphrase1, *passphrase2; |
char comment[1024], *passphrase; |
| char *rr_hostname = NULL, *ep, *fp, *ra; |
char *rr_hostname = NULL, *ep, *fp, *ra; |
| struct sshkey *private, *public; |
struct sshkey *private, *public; |
| struct passwd *pw; |
struct passwd *pw; |
| struct stat st; |
int r, opt, type; |
| int r, opt, type, fd; |
|
| int change_passphrase = 0, change_comment = 0, show_cert = 0; |
int change_passphrase = 0, change_comment = 0, show_cert = 0; |
| int find_host = 0, delete_host = 0, hash_hosts = 0; |
int find_host = 0, delete_host = 0, hash_hosts = 0; |
| int gen_all_hostkeys = 0, gen_krl = 0, update_krl = 0, check_krl = 0; |
int gen_all_hostkeys = 0, gen_krl = 0, update_krl = 0, check_krl = 0; |
| int prefer_agent = 0, convert_to = 0, convert_from = 0; |
int prefer_agent = 0, convert_to = 0, convert_from = 0; |
| int print_public = 0, print_generic = 0, cert_serial_autoinc = 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; |
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; |
| |
char *sk_attestation_path = NULL; |
| |
struct sshbuf *challenge = NULL, *attest = NULL; |
| |
size_t i, nopts = 0; |
| u_int32_t bits = 0; |
u_int32_t bits = 0; |
| FILE *f; |
uint8_t sk_flags = SSH_SK_USER_PRESENCE_REQD; |
| const char *errstr; |
const char *errstr; |
| int log_level = SYSLOG_LEVEL_INFO; |
int log_level = SYSLOG_LEVEL_INFO; |
| #ifdef WITH_OPENSSL |
char *sign_op = NULL; |
| /* 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 int optind; |
| extern char *optarg; |
extern char *optarg; |
|
|
| /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */ |
/* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */ |
| sanitise_stdfd(); |
sanitise_stdfd(); |
| |
|
| |
#ifdef WITH_OPENSSL |
| OpenSSL_add_all_algorithms(); |
OpenSSL_add_all_algorithms(); |
| |
#endif |
| log_init(argv[0], SYSLOG_LEVEL_INFO, SYSLOG_FACILITY_USER, 1); |
log_init(argv[0], SYSLOG_LEVEL_INFO, SYSLOG_FACILITY_USER, 1); |
| |
|
| setlocale(LC_CTYPE, ""); |
setlocale(LC_CTYPE, ""); |
|
|
| pw = getpwuid(getuid()); |
pw = getpwuid(getuid()); |
| if (!pw) |
if (!pw) |
| fatal("No user exists for uid %lu", (u_long)getuid()); |
fatal("No user exists for uid %lu", (u_long)getuid()); |
| |
pw = pwcopy(pw); |
| if (gethostname(hostname, sizeof(hostname)) == -1) |
if (gethostname(hostname, sizeof(hostname)) == -1) |
| fatal("gethostname: %s", strerror(errno)); |
fatal("gethostname: %s", strerror(errno)); |
| |
|
| /* 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) { |
switch (opt) { |
| case 'A': |
case 'A': |
| gen_all_hostkeys = 1; |
gen_all_hostkeys = 1; |
|
|
| case 'g': |
case 'g': |
| print_generic = 1; |
print_generic = 1; |
| break; |
break; |
| |
case 'K': |
| |
download_sk = 1; |
| |
break; |
| case 'P': |
case 'P': |
| identity_passphrase = optarg; |
identity_passphrase = optarg; |
| break; |
break; |
|
|
| check_krl = 1; |
check_krl = 1; |
| break; |
break; |
| case 'O': |
case 'O': |
| add_cert_option(optarg); |
opts = xrecallocarray(opts, nopts, nopts + 1, |
| |
sizeof(*opts)); |
| |
opts[nopts++] = xstrdup(optarg); |
| break; |
break; |
| case 'Z': |
case 'Z': |
| openssh_format_cipher = optarg; |
openssh_format_cipher = optarg; |
| |
if (cipher_by_name(openssh_format_cipher) == NULL) |
| |
fatal("Invalid OpenSSH-format cipher '%s'", |
| |
openssh_format_cipher); |
| break; |
break; |
| case 'C': |
case 'C': |
| identity_comment = optarg; |
identity_comment = optarg; |
|
|
| quiet = 1; |
quiet = 1; |
| break; |
break; |
| case 'e': |
case 'e': |
| case 'x': |
|
| /* export key */ |
/* export key */ |
| convert_to = 1; |
convert_to = 1; |
| break; |
break; |
|
|
| case 'V': |
case 'V': |
| parse_cert_times(optarg); |
parse_cert_times(optarg); |
| break; |
break; |
| |
case 'Y': |
| |
sign_op = optarg; |
| |
break; |
| |
case 'w': |
| |
sk_provider = optarg; |
| |
break; |
| case 'z': |
case 'z': |
| errno = 0; |
errno = 0; |
| if (*optarg == '+') { |
if (*optarg == '+') { |
|
|
| (errno == ERANGE && cert_serial == ULLONG_MAX)) |
(errno == ERANGE && cert_serial == ULLONG_MAX)) |
| fatal("Invalid serial number \"%s\"", optarg); |
fatal("Invalid serial number \"%s\"", optarg); |
| break; |
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': |
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; |
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 '?': |
case '?': |
| default: |
default: |
| usage(); |
usage(); |
| } |
} |
| } |
} |
| |
|
| |
if (sk_provider == NULL) |
| |
sk_provider = "internal"; |
| |
|
| /* reinit */ |
/* reinit */ |
| log_init(argv[0], log_level, SYSLOG_FACILITY_USER, 1); |
log_init(argv[0], log_level, SYSLOG_FACILITY_USER, 1); |
| |
|
| argv += optind; |
argv += optind; |
| argc -= 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, |
| |
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: " |
| |
"missing namespace"); |
| |
exit(1); |
| |
} |
| |
if (!have_identity) { |
| |
error("Too few arguments for sign: " |
| |
"missing key"); |
| |
exit(1); |
| |
} |
| |
return sig_sign(identity_file, cert_principals, |
| |
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, 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: " |
| |
"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 identity"); |
| |
exit(1); |
| |
} |
| |
return sig_verify(ca_key_path, cert_principals, |
| |
cert_key_id, identity_file, rr_hostname, |
| |
opts, nopts); |
| |
} |
| |
error("Unsupported operation for -Y: \"%s\"", sign_op); |
| |
usage(); |
| |
/* NOTREACHED */ |
| |
} |
| |
|
| if (ca_key_path != NULL) { |
if (ca_key_path != NULL) { |
| if (argc < 1 && !gen_krl) { |
if (argc < 1 && !gen_krl) { |
| error("Too few arguments."); |
error("Too few arguments."); |
| usage(); |
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."); |
error("Too many arguments."); |
| usage(); |
usage(); |
| } |
} |
|
|
| error("Cannot use -l with -H or -R."); |
error("Cannot use -l with -H or -R."); |
| usage(); |
usage(); |
| } |
} |
| #ifdef WITH_OPENSSL |
|
| if (gen_krl) { |
if (gen_krl) { |
| do_gen_krl(pw, update_krl, ca_key_path, |
do_gen_krl(pw, update_krl, ca_key_path, |
| cert_serial, identity_comment, argc, argv); |
cert_serial, identity_comment, argc, argv); |
| return (0); |
return (0); |
| } |
} |
| if (check_krl) { |
if (check_krl) { |
| do_check_krl(pw, argc, argv); |
do_check_krl(pw, print_fingerprint, argc, argv); |
| return (0); |
return (0); |
| } |
} |
| #endif |
|
| if (ca_key_path != NULL) { |
if (ca_key_path != NULL) { |
| if (cert_key_id == NULL) |
if (cert_key_id == NULL) |
| fatal("Must specify key id (-I) when certifying"); |
fatal("Must specify key id (-I) when certifying"); |
| |
for (i = 0; i < nopts; i++) |
| |
add_cert_option(opts[i]); |
| do_ca_sign(pw, ca_key_path, prefer_agent, |
do_ca_sign(pw, ca_key_path, prefer_agent, |
| cert_serial, cert_serial_autoinc, argc, argv); |
cert_serial, cert_serial_autoinc, argc, argv); |
| } |
} |
|
|
| } |
} |
| if (pkcs11provider != NULL) |
if (pkcs11provider != NULL) |
| do_download(pw); |
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) |
if (print_fingerprint || print_bubblebabble) |
| do_fingerprint(pw); |
do_fingerprint(pw); |
| if (change_passphrase) |
if (change_passphrase) |
|
|
| do_convert_to(pw); |
do_convert_to(pw); |
| if (convert_from) |
if (convert_from) |
| do_convert_from(pw); |
do_convert_from(pw); |
| #endif |
#else /* WITH_OPENSSL */ |
| |
if (convert_to || convert_from) |
| |
fatal("key conversion disabled at compile time"); |
| |
#endif /* WITH_OPENSSL */ |
| if (print_public) |
if (print_public) |
| do_print_public(pw); |
do_print_public(pw); |
| if (rr_hostname != NULL) { |
if (rr_hostname != NULL) { |
|
|
| } |
} |
| } |
} |
| |
|
| #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) { |
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) { |
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) { |
if (gen_all_hostkeys) { |
| do_gen_all_hostkeys(pw); |
do_gen_all_hostkeys(pw); |
|
|
| if (!quiet) |
if (!quiet) |
| printf("Generating public/private %s key pair.\n", |
printf("Generating public/private %s key pair.\n", |
| key_type_name); |
key_type_name); |
| if ((r = sshkey_generate(type, bits, &private)) != 0) |
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_r(r, "Unable to load FIDO " |
| |
"enrollment challenge \"%s\"", |
| |
opts[i] + 10); |
| |
} |
| |
} else if (strncasecmp(opts[i], |
| |
"write-attestation=", 18) == 0) { |
| |
sk_attestation_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"); |
| |
} |
| |
if ((attest = sshbuf_new()) == NULL) |
| |
fatal("sshbuf_new failed"); |
| |
if ((sk_flags & |
| |
(SSH_SK_USER_VERIFICATION_REQD|SSH_SK_RESIDENT_KEY))) { |
| |
passphrase = read_passphrase("Enter PIN for " |
| |
"authenticator: ", RP_ALLOW_STDIN); |
| |
} else { |
| |
passphrase = NULL; |
| |
} |
| |
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_r(r, "Key enrollment failed"); |
| |
else if (passphrase != NULL) { |
| |
error("PIN incorrect"); |
| |
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) |
if ((r = sshkey_from_private(private, &public)) != 0) |
| fatal("sshkey_from_private failed: %s\n", ssh_err(r)); |
fatal_r(r, "sshkey_from_private"); |
| |
|
| if (!have_identity) |
if (!have_identity) |
| ask_filename(pw, "Enter file in which to save the key"); |
ask_filename(pw, "Enter file in which to save the key"); |
| |
|
| /* Create ~/.ssh directory if it doesn't already exist. */ |
/* 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) == -1) { |
|
| if (errno != ENOENT) { |
|
| error("Could not stat %s: %s", dotsshdir, |
|
| strerror(errno)); |
|
| } else if (mkdir(dotsshdir, 0700) == -1) { |
|
| 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 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) { |
if (identity_comment) { |
| strlcpy(comment, identity_comment, sizeof(comment)); |
strlcpy(comment, identity_comment, sizeof(comment)); |
| } else { |
} else { |
|
|
| } |
} |
| |
|
| /* Save the key with the given passphrase and comment. */ |
/* Save the key with the given passphrase and comment. */ |
| if ((r = sshkey_save_private(private, identity_file, passphrase1, |
if ((r = sshkey_save_private(private, identity_file, passphrase, |
| comment, private_key_format, openssh_format_cipher, rounds)) != 0) { |
comment, private_key_format, openssh_format_cipher, rounds)) != 0) { |
| error("Saving key \"%s\" failed: %s", |
error_r(r, "Saving key \"%s\" failed", identity_file); |
| identity_file, ssh_err(r)); |
freezero(passphrase, strlen(passphrase)); |
| explicit_bzero(passphrase1, strlen(passphrase1)); |
|
| free(passphrase1); |
|
| exit(1); |
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); |
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)); |
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", |
fatal_r(r, "Unable to save public key to %s", identity_file); |
| 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) { |
if (!quiet) { |
| fp = sshkey_fingerprint(public, fingerprint_hash, |
fp = sshkey_fingerprint(public, fingerprint_hash, |
|
|
| SSH_FP_RANDOMART); |
SSH_FP_RANDOMART); |
| if (fp == NULL || ra == NULL) |
if (fp == NULL || ra == NULL) |
| fatal("sshkey_fingerprint failed"); |
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); |
identity_file); |
| printf("The key fingerprint is:\n"); |
printf("The key fingerprint is:\n"); |
| printf("%s %s\n", fp, comment); |
printf("%s %s\n", fp, comment); |
|
|
| free(fp); |
free(fp); |
| } |
} |
| |
|
| |
if (sk_attestation_path != NULL) |
| |
save_attestation(attest, sk_attestation_path); |
| |
|
| |
sshbuf_free(attest); |
| sshkey_free(public); |
sshkey_free(public); |
| |
|
| exit(0); |
exit(0); |
| } |
} |
![[BACK]](/icons/back.gif){kind=icon}
Return to ssh-keygen.c CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [local] / src / usr.bin / ssh