version 1.355, 2019/10/03 17:07:50 |
version 1.374, 2019/12/10 22:37:20 |
|
|
#include <stdio.h> |
#include <stdio.h> |
#include <stdlib.h> |
#include <stdlib.h> |
#include <string.h> |
#include <string.h> |
|
#include <stdarg.h> |
#include <unistd.h> |
#include <unistd.h> |
#include <limits.h> |
#include <limits.h> |
#include <locale.h> |
#include <locale.h> |
|
|
#include "utf8.h" |
#include "utf8.h" |
#include "authfd.h" |
#include "authfd.h" |
#include "sshsig.h" |
#include "sshsig.h" |
|
#include "ssh-sk.h" |
|
#include "sk-api.h" /* XXX for SSH_SK_USER_PRESENCE_REQD; remove */ |
|
|
#ifdef ENABLE_PKCS11 |
#ifdef ENABLE_PKCS11 |
#include "ssh-pkcs11.h" |
#include "ssh-pkcs11.h" |
|
|
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_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; |
|
|
/* 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; |
|
|
|
|
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; |
|
|
error("%s: remaining bytes in key blob %d", __func__, rlen); |
error("%s: remaining bytes in key blob %d", __func__, 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, 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; |
|
|
*k = do_convert_private_ssh2(buf); |
*k = do_convert_private_ssh2(buf); |
else if ((r = sshkey_fromb(buf, k)) != 0) |
else if ((r = sshkey_fromb(buf, k)) != 0) |
fatal("decode blob failed: %s", ssh_err(r)); |
fatal("decode blob failed: %s", ssh_err(r)); |
|
sshbuf_free(buf); |
fclose(fp); |
fclose(fp); |
} |
} |
|
|
|
|
(certflags_flags & CERTOPT_USER_RC) != 0) |
(certflags_flags & CERTOPT_USER_RC) != 0) |
add_flag_option(c, "permit-user-rc"); |
add_flag_option(c, "permit-user-rc"); |
if ((which & OPTIONS_CRITICAL) != 0 && |
if ((which & OPTIONS_CRITICAL) != 0 && |
|
(certflags_flags & CERTOPT_NO_REQUIRE_USER_PRESENCE) != 0) |
|
add_flag_option(c, "no-touch-required"); |
|
if ((which & OPTIONS_CRITICAL) != 0 && |
certflags_src_addr != NULL) |
certflags_src_addr != NULL) |
add_string_option(c, "source-address", certflags_src_addr); |
add_string_option(c, "source-address", certflags_src_addr); |
for (i = 0; i < ncert_userext; i++) { |
for (i = 0; i < ncert_userext; 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, u_int compat, void *ctx) |
{ |
{ |
int *agent_fdp = (int *)ctx; |
int *agent_fdp = (int *)ctx; |
|
|
|
|
int r, i, fd, found, agent_fd = -1; |
int r, i, fd, 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; |
|
char *ca_fp = NULL, **plist = NULL; |
FILE *f; |
FILE *f; |
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); |
|
|
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); |
} |
} |
|
ca_fp = sshkey_fingerprint(ca, fingerprint_hash, SSH_FP_DEFAULT); |
|
|
for (i = 0; i < argc; i++) { |
for (i = 0; i < argc; i++) { |
/* Split list of principals */ |
/* Split list of principals */ |
|
|
if ((r = sshkey_load_public(tmp, &public, &comment)) != 0) |
if ((r = sshkey_load_public(tmp, &public, &comment)) != 0) |
fatal("%s: unable to open \"%s\": %s", |
fatal("%s: unable to open \"%s\": %s", |
__func__, tmp, ssh_err(r)); |
__func__, tmp, ssh_err(r)); |
if (public->type != KEY_RSA && public->type != KEY_DSA && |
if (sshkey_is_cert(public)) |
public->type != KEY_ECDSA && public->type != KEY_ED25519 && |
|
public->type != KEY_XMSS) |
|
fatal("%s: key \"%s\" type %s cannot be certified", |
fatal("%s: key \"%s\" type %s cannot be certified", |
__func__, tmp, sshkey_type(public)); |
__func__, tmp, sshkey_type(public)); |
|
|
|
|
|
|
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, agent_signer, |
|
&agent_fd)) != 0) |
fatal("Couldn't certify key %s via agent: %s", |
fatal("Couldn't certify key %s via agent: %s", |
tmp, ssh_err(r)); |
tmp, ssh_err(r)); |
} else { |
} else { |
if ((sshkey_certify(public, ca, key_type_name)) != 0) |
if (sshkey_is_sk(ca) && |
|
(ca->sk_flags & SSH_SK_USER_PRESENCE_REQD)) { |
|
notifier = notify_start(0, |
|
"Confirm user presence for key %s %s", |
|
sshkey_type(ca), ca_fp); |
|
} |
|
r = sshkey_certify(public, ca, key_type_name, |
|
sk_provider); |
|
notify_complete(notifier); |
|
if (r != 0) |
fatal("Couldn't certify key %s: %s", |
fatal("Couldn't certify key %s: %s", |
tmp, ssh_err(r)); |
tmp, ssh_err(r)); |
} |
} |
|
|
if (cert_serial_autoinc) |
if (cert_serial_autoinc) |
cert_serial++; |
cert_serial++; |
} |
} |
|
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 (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') |
|
|
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) |
|
|
{ |
{ |
struct sshbuf *sigbuf = NULL, *abuf = NULL; |
struct sshbuf *sigbuf = NULL, *abuf = NULL; |
int r = SSH_ERR_INTERNAL_ERROR, wfd = -1, oerrno; |
int r = SSH_ERR_INTERNAL_ERROR, wfd = -1, oerrno; |
char *wfile = NULL; |
char *wfile = NULL, *asig = NULL, *fp = NULL; |
char *asig = NULL; |
|
|
|
if (!quiet) { |
if (!quiet) { |
if (fd == STDIN_FILENO) |
if (fd == STDIN_FILENO) |
|
|
else |
else |
fprintf(stderr, "Signing file %s\n", filename); |
fprintf(stderr, "Signing file %s\n", filename); |
} |
} |
if ((r = sshsig_sign_fd(signkey, NULL, fd, sig_namespace, |
if (signer == NULL && sshkey_is_sk(signkey) && |
|
(signkey->sk_flags & SSH_SK_USER_PRESENCE_REQD)) { |
|
if ((fp = sshkey_fingerprint(signkey, fingerprint_hash, |
|
SSH_FP_DEFAULT)) == NULL) |
|
fatal("%s: sshkey_fingerprint failed", __func__); |
|
fprintf(stderr, "Confirm user presence for key %s %s\n", |
|
sshkey_type(signkey), fp); |
|
free(fp); |
|
} |
|
if ((r = sshsig_sign_fd(signkey, NULL, sk_provider, fd, sig_namespace, |
&sigbuf, signer, signer_ctx)) != 0) { |
&sigbuf, signer, signer_ctx)) != 0) { |
error("Signing %s failed: %s", filename, ssh_err(r)); |
error("Signing %s failed: %s", filename, ssh_err(r)); |
goto out; |
goto out; |
|
|
struct sshbuf *sigbuf = NULL, *abuf = NULL; |
struct sshbuf *sigbuf = NULL, *abuf = NULL; |
struct sshkey *sign_key = NULL; |
struct sshkey *sign_key = NULL; |
char *fp = NULL; |
char *fp = NULL; |
|
struct sshkey_sig_details *sig_details = NULL; |
|
|
|
memset(&sig_details, 0, sizeof(sig_details)); |
if ((abuf = sshbuf_new()) == NULL) |
if ((abuf = sshbuf_new()) == NULL) |
fatal("%s: sshbuf_new() failed", __func__); |
fatal("%s: sshbuf_new() failed", __func__); |
|
|
|
|
return r; |
return r; |
} |
} |
if ((r = sshsig_verify_fd(sigbuf, STDIN_FILENO, sig_namespace, |
if ((r = sshsig_verify_fd(sigbuf, STDIN_FILENO, sig_namespace, |
&sign_key)) != 0) |
&sign_key, &sig_details)) != 0) |
goto done; /* sshsig_verify() prints error */ |
goto done; /* sshsig_verify() prints error */ |
|
|
if ((fp = sshkey_fingerprint(sign_key, fingerprint_hash, |
if ((fp = sshkey_fingerprint(sign_key, fingerprint_hash, |
SSH_FP_DEFAULT)) == NULL) |
SSH_FP_DEFAULT)) == NULL) |
fatal("%s: sshkey_fingerprint failed", __func__); |
fatal("%s: sshkey_fingerprint failed", __func__); |
debug("Valid (unverified) signature from key %s", fp); |
debug("Valid (unverified) signature from key %s", fp); |
|
if (sig_details != NULL) { |
|
debug2("%s: signature details: counter = %u, flags = 0x%02x", |
|
__func__, sig_details->sk_counter, sig_details->sk_flags); |
|
} |
free(fp); |
free(fp); |
fp = NULL; |
fp = NULL; |
|
|
|
|
sshbuf_free(sigbuf); |
sshbuf_free(sigbuf); |
sshbuf_free(abuf); |
sshbuf_free(abuf); |
sshkey_free(sign_key); |
sshkey_free(sign_key); |
|
sshkey_sig_details_free(sig_details); |
free(fp); |
free(fp); |
return ret; |
return ret; |
} |
} |
|
|
{ |
{ |
fprintf(stderr, |
fprintf(stderr, |
"usage: ssh-keygen [-q] [-b bits] [-C comment] [-f output_keyfile] [-m format]\n" |
"usage: ssh-keygen [-q] [-b bits] [-C comment] [-f output_keyfile] [-m format]\n" |
" [-N new_passphrase] [-t dsa | ecdsa | ed25519 | rsa]\n" |
" [-t dsa | ecdsa | ecdsa-sk | ed25519 | ed25519-sk | rsa]\n" |
|
" [-N new_passphrase] [-w provider] [-x flags]\n" |
" ssh-keygen -p [-f keyfile] [-m format] [-N new_passphrase]\n" |
" ssh-keygen -p [-f keyfile] [-m format] [-N new_passphrase]\n" |
" [-P old_passphrase]\n" |
" [-P old_passphrase]\n" |
" ssh-keygen -i [-f input_keyfile] [-m key_format]\n" |
" ssh-keygen -i [-f input_keyfile] [-m key_format]\n" |
|
|
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; |
unsigned long long cert_serial = 0; |
unsigned long long ull, cert_serial = 0; |
char *identity_comment = NULL, *ca_key_path = NULL; |
char *identity_comment = NULL, *ca_key_path = NULL; |
u_int32_t bits = 0; |
u_int32_t bits = 0; |
|
uint8_t sk_flags = SSH_SK_USER_PRESENCE_REQD; |
FILE *f; |
FILE *f; |
const char *errstr; |
const char *errstr; |
int log_level = SYSLOG_LEVEL_INFO; |
int log_level = SYSLOG_LEVEL_INFO; |
|
|
if (gethostname(hostname, sizeof(hostname)) == -1) |
if (gethostname(hostname, sizeof(hostname)) == -1) |
fatal("gethostname: %s", strerror(errno)); |
fatal("gethostname: %s", strerror(errno)); |
|
|
/* Remaining characters: dw */ |
sk_provider = getenv("SSH_SK_PROVIDER"); |
while ((opt = getopt(argc, argv, "ABHLQUXceghiklopquvxy" |
|
|
/* Remaining character: d */ |
|
while ((opt = getopt(argc, argv, "ABHLQUXceghiklopquvy" |
"C:D:E:F:G:I:J:K:M:N:O:P:R:S:T:V:W:Y:Z:" |
"C:D:E:F:G:I:J:K:M:N:O:P:R:S:T:V:W:Y:Z:" |
"a:b:f:g:j:m:n:r:s:t:z:")) != -1) { |
"a:b:f:g:j:m:n:r:s:t:w:x:z:")) != -1) { |
switch (opt) { |
switch (opt) { |
case 'A': |
case 'A': |
gen_all_hostkeys = 1; |
gen_all_hostkeys = 1; |
|
|
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 'Y': |
case 'Y': |
sign_op = optarg; |
sign_op = optarg; |
break; |
break; |
|
case 'w': |
|
sk_provider = optarg; |
|
break; |
|
case 'x': |
|
if (*optarg == '\0') |
|
fatal("Missing security key flags"); |
|
if (strcasecmp(optarg, "no-touch-required") == 0) |
|
sk_flags &= ~SSH_SK_USER_PRESENCE_REQD; |
|
else { |
|
ull = strtoull(optarg, &ep, 0); |
|
if (*ep != '\0') |
|
fatal("Security key flags \"%s\" is " |
|
"not a number", optarg); |
|
if (ull > 0xff) { |
|
fatal("Invalid security key " |
|
"flags 0x%llx", ull); |
|
} |
|
sk_flags = (uint8_t)ull; |
|
} |
|
break; |
case 'z': |
case 'z': |
errno = 0; |
errno = 0; |
if (*optarg == '+') { |
if (*optarg == '+') { |
|
|
} |
} |
} |
} |
|
|
|
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); |
|
|
|
|
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: |
|
if (!quiet) { |
|
printf("You may need to touch your security key " |
|
"to authorize key generation.\n"); |
|
} |
|
fflush(stdout); |
|
if (sshsk_enroll(type, sk_provider, |
|
cert_key_id == NULL ? "ssh:" : cert_key_id, |
|
sk_flags, NULL, &private, NULL) != 0) |
|
exit(1); /* error message already printed */ |
|
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("sshkey_from_private failed: %s\n", ssh_err(r)); |
|
|