version 1.449, 2022/03/18 02:31:25 |
version 1.453, 2022/05/31 14:05:12 |
|
|
#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_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; |
|
|
cert_ext_add("force-command", certflags_command, 1); |
cert_ext_add("force-command", certflags_command, 1); |
if (certflags_src_addr != NULL) |
if (certflags_src_addr != NULL) |
cert_ext_add("source-address", certflags_src_addr, 1); |
cert_ext_add("source-address", certflags_src_addr, 1); |
|
if ((certflags_flags & CERTOPT_REQUIRE_VERIFY) != 0) |
|
cert_ext_add("verify-required", NULL, 1); |
/* extensions */ |
/* extensions */ |
if ((certflags_flags & CERTOPT_X_FWD) != 0) |
if ((certflags_flags & CERTOPT_X_FWD) != 0) |
cert_ext_add("permit-X11-forwarding", NULL, 0); |
cert_ext_add("permit-X11-forwarding", NULL, 0); |
|
|
certflags_flags &= ~CERTOPT_NO_REQUIRE_USER_PRESENCE; |
certflags_flags &= ~CERTOPT_NO_REQUIRE_USER_PRESENCE; |
else if (strcasecmp(opt, "no-touch-required") == 0) |
else if (strcasecmp(opt, "no-touch-required") == 0) |
certflags_flags |= CERTOPT_NO_REQUIRE_USER_PRESENCE; |
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_fr(r, "parse critical"); |
fatal_fr(r, "parse critical"); |
printf(" %s\n", arg); |
printf(" %s\n", arg); |
free(arg); |
free(arg); |
|
} else if (in_critical && |
|
strcmp(name, "verify-required") == 0) { |
|
printf("\n"); |
} else if (sshbuf_len(option) > 0) { |
} else if (sshbuf_len(option) > 0) { |
hex = sshbuf_dtob16(option); |
hex = sshbuf_dtob16(option); |
printf(" UNKNOWN OPTION: %s (len %zu)\n", |
printf(" UNKNOWN OPTION: %s (len %zu)\n", |
|
|
char *privpath = xstrdup(keypath); |
char *privpath = xstrdup(keypath); |
static const char * const suffixes[] = { "-cert.pub", ".pub", NULL }; |
static const char * const suffixes[] = { "-cert.pub", ".pub", NULL }; |
struct sshkey *ret = NULL, *privkey = NULL; |
struct sshkey *ret = NULL, *privkey = NULL; |
int r; |
int r, waspub = 0; |
|
struct stat st; |
|
|
/* |
/* |
* If passed a public key filename, then try to locate the corresponding |
* If passed a public key filename, then try to locate the corresponding |
|
|
privpath[plen - slen] = '\0'; |
privpath[plen - slen] = '\0'; |
debug_f("%s looks like a public key, using private key " |
debug_f("%s looks like a public key, using private key " |
"path %s instead", keypath, privpath); |
"path %s instead", keypath, privpath); |
|
waspub = 1; |
} |
} |
if ((privkey = load_identity(privpath, NULL)) == NULL) { |
if (waspub && stat(privpath, &st) != 0 && errno == ENOENT) |
error("Couldn't load identity %s", keypath); |
fatal("No private key found for public key \"%s\"", keypath); |
goto done; |
if ((r = sshkey_load_private(privpath, "", &privkey, NULL)) != 0 && |
} |
(r != SSH_ERR_KEY_WRONG_PASSPHRASE)) { |
|
debug_fr(r, "load private key \"%s\"", privpath); |
|
fatal("No private key found for \"%s\"", privpath); |
|
} else if (privkey == NULL) |
|
privkey = load_identity(privpath, NULL); |
|
|
if (!sshkey_equal_public(pubkey, privkey)) { |
if (!sshkey_equal_public(pubkey, privkey)) { |
error("Public key %s doesn't match private %s", |
error("Public key %s doesn't match private %s", |
keypath, privpath); |
keypath, privpath); |
|
|
|
|
|
|
static int |
static int |
sig_sign(const char *keypath, const char *sig_namespace, int argc, char **argv, |
sig_sign(const char *keypath, const char *sig_namespace, int require_agent, |
char * const *opts, size_t nopts) |
int argc, char **argv, char * const *opts, size_t nopts) |
{ |
{ |
int i, fd = -1, r, ret = -1; |
int i, fd = -1, r, ret = -1; |
int agent_fd = -1; |
int agent_fd = -1; |
|
|
goto done; |
goto done; |
} |
} |
|
|
if ((r = ssh_get_authentication_socket(&agent_fd)) != 0) |
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"); |
debug_r(r, "Couldn't get agent socket"); |
else { |
} else { |
if ((r = ssh_agent_has_key(agent_fd, pubkey)) == 0) |
if ((r = ssh_agent_has_key(agent_fd, pubkey)) == 0) |
signer = agent_signer; |
signer = agent_signer; |
else |
else { |
|
if (require_agent) |
|
fatal("Couldn't find key in agent"); |
debug_r(r, "Couldn't find key in agent"); |
debug_r(r, "Couldn't find key in agent"); |
|
} |
} |
} |
|
|
if (signer == NULL) { |
if (signer == NULL) { |
|
|
exit(1); |
exit(1); |
} |
} |
return sig_sign(identity_file, cert_principals, |
return sig_sign(identity_file, cert_principals, |
argc, argv, opts, nopts); |
prefer_agent, argc, argv, opts, nopts); |
} else if (strncmp(sign_op, "check-novalidate", 16) == 0) { |
} else if (strncmp(sign_op, "check-novalidate", 16) == 0) { |
|
/* NB. cert_principals is actually namespace, via -n */ |
if (cert_principals == NULL || |
if (cert_principals == NULL || |
*cert_principals == '\0') { |
*cert_principals == '\0') { |
error("Too few arguments for check-novalidate: " |
error("Too few arguments for check-novalidate: " |