version 1.275, 2015/07/03 03:43:18 |
version 1.288, 2016/02/15 09:47:49 |
|
|
fatal("key bits exceeds maximum %d", maxbits); |
fatal("key bits exceeds maximum %d", maxbits); |
if (type == KEY_DSA && *bitsp != 1024) |
if (type == KEY_DSA && *bitsp != 1024) |
fatal("DSA keys must be 1024 bits"); |
fatal("DSA keys must be 1024 bits"); |
else if (type != KEY_ECDSA && type != KEY_ED25519 && *bitsp < 768) |
else if (type != KEY_ECDSA && type != KEY_ED25519 && *bitsp < 1024) |
fatal("Key must at least be 768 bits"); |
fatal("Key must at least be 1024 bits"); |
else if (type == KEY_ECDSA && sshkey_ecdsa_bits_to_nid(*bitsp) == -1) |
else if (type == KEY_ECDSA && sshkey_ecdsa_bits_to_nid(*bitsp) == -1) |
fatal("Invalid ECDSA key length - valid lengths are " |
fatal("Invalid ECDSA key length - valid lengths are " |
"256, 384 or 521 bits"); |
"256, 384 or 521 bits"); |
|
|
sshbuf_free(b); |
sshbuf_free(b); |
|
|
/* try the key */ |
/* try the key */ |
if (sshkey_sign(key, &sig, &slen, data, sizeof(data), 0) != 0 || |
if (sshkey_sign(key, &sig, &slen, data, sizeof(data), NULL, 0) != 0 || |
sshkey_verify(key, sig, slen, data, sizeof(data), 0) != 0) { |
sshkey_verify(key, sig, slen, data, sizeof(data), 0) != 0) { |
sshkey_free(key); |
sshkey_free(key); |
free(sig); |
free(sig); |
|
|
#endif /* ENABLE_PKCS11 */ |
#endif /* ENABLE_PKCS11 */ |
} |
} |
|
|
|
static struct sshkey * |
|
try_read_key(char **cpp) |
|
{ |
|
struct sshkey *ret; |
|
int r; |
|
|
|
if ((ret = sshkey_new(KEY_RSA1)) == NULL) |
|
fatal("sshkey_new failed"); |
|
/* Try RSA1 */ |
|
if ((r = sshkey_read(ret, cpp)) == 0) |
|
return ret; |
|
/* Try modern */ |
|
sshkey_free(ret); |
|
if ((ret = sshkey_new(KEY_UNSPEC)) == NULL) |
|
fatal("sshkey_new failed"); |
|
if ((r = sshkey_read(ret, cpp)) == 0) |
|
return ret; |
|
/* Not a key */ |
|
sshkey_free(ret); |
|
return NULL; |
|
} |
|
|
static void |
static void |
do_fingerprint(struct passwd *pw) |
fingerprint_one_key(const struct sshkey *public, const char *comment) |
{ |
{ |
FILE *f; |
char *fp = NULL, *ra = NULL; |
struct sshkey *public; |
|
char *comment = NULL, *cp, *ep, line[16*1024], *fp, *ra; |
|
int r, i, skip = 0, num = 0, invalid = 1; |
|
enum sshkey_fp_rep rep; |
enum sshkey_fp_rep rep; |
int fptype; |
int fptype; |
struct stat st; |
|
|
|
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; |
if (!have_identity) |
fp = sshkey_fingerprint(public, fptype, rep); |
ask_filename(pw, "Enter file in which the key is"); |
ra = sshkey_fingerprint(public, fingerprint_hash, SSH_FP_RANDOMART); |
|
if (fp == NULL || ra == NULL) |
|
fatal("%s: sshkey_fingerprint failed", __func__); |
|
printf("%u %s %s (%s)\n", sshkey_size(public), fp, |
|
comment ? comment : "no comment", sshkey_type(public)); |
|
if (log_level >= SYSLOG_LEVEL_VERBOSE) |
|
printf("%s\n", ra); |
|
free(ra); |
|
free(fp); |
|
} |
|
|
|
static void |
|
fingerprint_private(const char *path) |
|
{ |
|
struct stat st; |
|
char *comment = NULL; |
|
struct sshkey *public = NULL; |
|
int r; |
|
|
if (stat(identity_file, &st) < 0) |
if (stat(identity_file, &st) < 0) |
fatal("%s: %s", identity_file, strerror(errno)); |
fatal("%s: %s", path, strerror(errno)); |
if ((r = sshkey_load_public(identity_file, &public, &comment)) != 0) |
if ((r = sshkey_load_public(path, &public, &comment)) != 0) { |
debug2("Error loading public key \"%s\": %s", |
debug("load public \"%s\": %s", path, ssh_err(r)); |
identity_file, ssh_err(r)); |
if ((r = sshkey_load_private(path, NULL, |
else { |
&public, &comment)) != 0) { |
fp = sshkey_fingerprint(public, fptype, rep); |
debug("load private \"%s\": %s", path, ssh_err(r)); |
ra = sshkey_fingerprint(public, fingerprint_hash, |
fatal("%s is not a key file.", path); |
SSH_FP_RANDOMART); |
} |
if (fp == NULL || ra == NULL) |
|
fatal("%s: sshkey_fingerprint fail", __func__); |
|
printf("%u %s %s (%s)\n", sshkey_size(public), fp, comment, |
|
sshkey_type(public)); |
|
if (log_level >= SYSLOG_LEVEL_VERBOSE) |
|
printf("%s\n", ra); |
|
sshkey_free(public); |
|
free(comment); |
|
free(ra); |
|
free(fp); |
|
exit(0); |
|
} |
} |
if (comment) { |
|
free(comment); |
|
comment = NULL; |
|
} |
|
|
|
if ((f = fopen(identity_file, "r")) == NULL) |
fingerprint_one_key(public, comment); |
fatal("%s: %s: %s", __progname, identity_file, strerror(errno)); |
sshkey_free(public); |
|
free(comment); |
|
} |
|
|
while (fgets(line, sizeof(line), f)) { |
static void |
if ((cp = strchr(line, '\n')) == NULL) { |
do_fingerprint(struct passwd *pw) |
error("line %d too long: %.40s...", |
{ |
num + 1, line); |
FILE *f; |
skip = 1; |
struct sshkey *public = NULL; |
|
char *comment = NULL, *cp, *ep, line[SSH_MAX_PUBKEY_BYTES]; |
|
int i, invalid = 1; |
|
const char *path; |
|
long int lnum = 0; |
|
|
|
if (!have_identity) |
|
ask_filename(pw, "Enter file in which the key is"); |
|
path = identity_file; |
|
|
|
if (strcmp(identity_file, "-") == 0) { |
|
f = stdin; |
|
path = "(stdin)"; |
|
} else if ((f = fopen(path, "r")) == NULL) |
|
fatal("%s: %s: %s", __progname, path, strerror(errno)); |
|
|
|
while (read_keyfile_line(f, path, line, sizeof(line), &lnum) == 0) { |
|
cp = line; |
|
cp[strcspn(cp, "\n")] = '\0'; |
|
/* Trim leading space and comments */ |
|
cp = line + strspn(line, " \t"); |
|
if (*cp == '#' || *cp == '\0') |
continue; |
continue; |
|
|
|
/* |
|
* Input may be plain keys, private keys, authorized_keys |
|
* or known_hosts. |
|
*/ |
|
|
|
/* |
|
* Try private keys first. Assume a key is private if |
|
* "SSH PRIVATE KEY" appears on the first line and we're |
|
* not reading from stdin (XXX support private keys on stdin). |
|
*/ |
|
if (lnum == 1 && strcmp(identity_file, "-") != 0 && |
|
strstr(cp, "PRIVATE KEY") != NULL) { |
|
fclose(f); |
|
fingerprint_private(path); |
|
exit(0); |
} |
} |
num++; |
|
if (skip) { |
/* |
skip = 0; |
* If it's not a private key, then this must be prepared to |
|
* accept a public key prefixed with a hostname or options. |
|
* Try a bare key first, otherwise skip the leading stuff. |
|
*/ |
|
if ((public = try_read_key(&cp)) == NULL) { |
|
i = strtol(cp, &ep, 10); |
|
if (i == 0 || ep == NULL || |
|
(*ep != ' ' && *ep != '\t')) { |
|
int quoted = 0; |
|
|
|
comment = cp; |
|
for (; *cp && (quoted || (*cp != ' ' && |
|
*cp != '\t')); cp++) { |
|
if (*cp == '\\' && cp[1] == '"') |
|
cp++; /* Skip both */ |
|
else if (*cp == '"') |
|
quoted = !quoted; |
|
} |
|
if (!*cp) |
|
continue; |
|
*cp++ = '\0'; |
|
} |
|
} |
|
/* Retry after parsing leading hostname/key options */ |
|
if (public == NULL && (public = try_read_key(&cp)) == NULL) { |
|
debug("%s:%ld: not a public key", path, lnum); |
continue; |
continue; |
} |
} |
*cp = '\0'; |
|
|
|
/* Skip leading whitespace, empty and comment lines. */ |
/* Find trailing comment, if any */ |
for (cp = line; *cp == ' ' || *cp == '\t'; cp++) |
for (; *cp == ' ' || *cp == '\t'; cp++) |
; |
; |
if (!*cp || *cp == '\n' || *cp == '#') |
if (*cp != '\0' && *cp != '#') |
continue; |
|
i = strtol(cp, &ep, 10); |
|
if (i == 0 || ep == NULL || (*ep != ' ' && *ep != '\t')) { |
|
int quoted = 0; |
|
comment = cp; |
comment = cp; |
for (; *cp && (quoted || (*cp != ' ' && |
|
*cp != '\t')); cp++) { |
fingerprint_one_key(public, comment); |
if (*cp == '\\' && cp[1] == '"') |
|
cp++; /* Skip both */ |
|
else if (*cp == '"') |
|
quoted = !quoted; |
|
} |
|
if (!*cp) |
|
continue; |
|
*cp++ = '\0'; |
|
} |
|
ep = cp; |
|
if ((public = sshkey_new(KEY_RSA1)) == NULL) |
|
fatal("sshkey_new failed"); |
|
if ((r = sshkey_read(public, &cp)) != 0) { |
|
cp = ep; |
|
sshkey_free(public); |
|
if ((public = sshkey_new(KEY_UNSPEC)) == NULL) |
|
fatal("sshkey_new failed"); |
|
if ((r = sshkey_read(public, &cp)) != 0) { |
|
sshkey_free(public); |
|
continue; |
|
} |
|
} |
|
comment = *cp ? cp : comment; |
|
fp = sshkey_fingerprint(public, fptype, rep); |
|
ra = sshkey_fingerprint(public, fingerprint_hash, |
|
SSH_FP_RANDOMART); |
|
if (fp == NULL || ra == NULL) |
|
fatal("%s: sshkey_fingerprint fail", __func__); |
|
printf("%u %s %s (%s)\n", sshkey_size(public), fp, |
|
comment ? comment : "no comment", sshkey_type(public)); |
|
if (log_level >= SYSLOG_LEVEL_VERBOSE) |
|
printf("%s\n", ra); |
|
free(ra); |
|
free(fp); |
|
sshkey_free(public); |
sshkey_free(public); |
invalid = 0; |
invalid = 0; /* One good key in the file is sufficient */ |
} |
} |
fclose(f); |
fclose(f); |
|
|
if (invalid) |
if (invalid) |
fatal("%s is not a public key file.", identity_file); |
fatal("%s is not a public key file.", path); |
exit(0); |
exit(0); |
} |
} |
|
|
|
|
foreach_options |= print_fingerprint ? HKF_WANT_PARSE_KEY : 0; |
foreach_options |= print_fingerprint ? HKF_WANT_PARSE_KEY : 0; |
if ((r = hostkeys_foreach(identity_file, |
if ((r = hostkeys_foreach(identity_file, |
hash_hosts ? known_hosts_hash : known_hosts_find_delete, &ctx, |
hash_hosts ? known_hosts_hash : known_hosts_find_delete, &ctx, |
name, NULL, foreach_options)) != 0) |
name, NULL, foreach_options)) != 0) { |
|
if (inplace) |
|
unlink(tmp); |
fatal("%s: hostkeys_foreach failed: %s", __func__, ssh_err(r)); |
fatal("%s: hostkeys_foreach failed: %s", __func__, ssh_err(r)); |
|
} |
|
|
if (inplace) |
if (inplace) |
fclose(ctx.out); |
fclose(ctx.out); |
|
|
exit(1); |
exit(1); |
} else if (delete_host && !ctx.found_key) { |
} else if (delete_host && !ctx.found_key) { |
logit("Host %s not found in %s", name, identity_file); |
logit("Host %s not found in %s", name, identity_file); |
unlink(tmp); |
if (inplace) |
|
unlink(tmp); |
} else if (inplace) { |
} else if (inplace) { |
/* Backup existing file */ |
/* Backup existing file */ |
if (unlink(old) == -1 && errno != ENOENT) |
if (unlink(old) == -1 && errno != ENOENT) |
|
|
identity_file, ssh_err(r)); |
identity_file, ssh_err(r)); |
} |
} |
} |
} |
/* XXX what about new-format keys? */ |
|
if (private->type != KEY_RSA1) { |
if (private->type != KEY_RSA1 && private->type != KEY_ED25519 && |
error("Comments are only supported for RSA1 keys."); |
!use_new_format) { |
|
error("Comments are only supported for RSA1 or keys stored in " |
|
"the new format (-o)."); |
explicit_bzero(passphrase, strlen(passphrase)); |
explicit_bzero(passphrase, strlen(passphrase)); |
sshkey_free(private); |
sshkey_free(private); |
exit(1); |
exit(1); |
|
|
exit(0); |
exit(0); |
} |
} |
|
|
static const char * |
|
fmt_validity(u_int64_t valid_from, u_int64_t valid_to) |
|
{ |
|
char from[32], to[32]; |
|
static char ret[64]; |
|
time_t tt; |
|
struct tm *tm; |
|
|
|
*from = *to = '\0'; |
|
if (valid_from == 0 && valid_to == 0xffffffffffffffffULL) |
|
return "forever"; |
|
|
|
if (valid_from != 0) { |
|
/* XXX revisit INT_MAX in 2038 :) */ |
|
tt = valid_from > INT_MAX ? INT_MAX : valid_from; |
|
tm = localtime(&tt); |
|
strftime(from, sizeof(from), "%Y-%m-%dT%H:%M:%S", tm); |
|
} |
|
if (valid_to != 0xffffffffffffffffULL) { |
|
/* XXX revisit INT_MAX in 2038 :) */ |
|
tt = valid_to > INT_MAX ? INT_MAX : valid_to; |
|
tm = localtime(&tt); |
|
strftime(to, sizeof(to), "%Y-%m-%dT%H:%M:%S", tm); |
|
} |
|
|
|
if (valid_from == 0) { |
|
snprintf(ret, sizeof(ret), "before %s", to); |
|
return ret; |
|
} |
|
if (valid_to == 0xffffffffffffffffULL) { |
|
snprintf(ret, sizeof(ret), "after %s", from); |
|
return ret; |
|
} |
|
|
|
snprintf(ret, sizeof(ret), "from %s to %s", from, to); |
|
return ret; |
|
} |
|
|
|
static void |
static void |
add_flag_option(struct sshbuf *c, const char *name) |
add_flag_option(struct sshbuf *c, const char *name) |
{ |
{ |
|
|
int r, i, fd; |
int r, i, fd; |
u_int n; |
u_int n; |
struct sshkey *ca, *public; |
struct sshkey *ca, *public; |
char *otmp, *tmp, *cp, *out, *comment, **plist = NULL; |
char valid[64], *otmp, *tmp, *cp, *out, *comment, **plist = NULL; |
FILE *f; |
FILE *f; |
|
|
#ifdef ENABLE_PKCS11 |
#ifdef ENABLE_PKCS11 |
|
|
fclose(f); |
fclose(f); |
|
|
if (!quiet) { |
if (!quiet) { |
|
sshkey_format_cert_validity(public->cert, |
|
valid, sizeof(valid)); |
logit("Signed %s key %s: id \"%s\" serial %llu%s%s " |
logit("Signed %s key %s: id \"%s\" serial %llu%s%s " |
"valid %s", sshkey_cert_type(public), |
"valid %s", sshkey_cert_type(public), |
out, public->cert->key_id, |
out, public->cert->key_id, |
(unsigned long long)public->cert->serial, |
(unsigned long long)public->cert->serial, |
cert_principals != NULL ? " for " : "", |
cert_principals != NULL ? " for " : "", |
cert_principals != NULL ? cert_principals : "", |
cert_principals != NULL ? cert_principals : "", |
fmt_validity(cert_valid_from, cert_valid_to)); |
valid); |
} |
} |
|
|
sshkey_free(public); |
sshkey_free(public); |
|
|
char buf[32], *fmt; |
char buf[32], *fmt; |
|
|
/* |
/* |
* POSIX strptime says "The application shall ensure that there |
* POSIX strptime says "The application shall ensure that there |
* is white-space or other non-alphanumeric characters between |
* is white-space or other non-alphanumeric characters between |
* any two conversion specifications" so arrange things this way. |
* any two conversion specifications" so arrange things this way. |
*/ |
*/ |
|
|
} |
} |
|
|
static void |
static void |
do_show_cert(struct passwd *pw) |
print_cert(struct sshkey *key) |
{ |
{ |
struct sshkey *key; |
char valid[64], *key_fp, *ca_fp; |
struct stat st; |
|
char *key_fp, *ca_fp; |
|
u_int i; |
u_int i; |
int r; |
|
|
|
if (!have_identity) |
|
ask_filename(pw, "Enter file in which the key is"); |
|
if (stat(identity_file, &st) < 0) |
|
fatal("%s: %s: %s", __progname, identity_file, strerror(errno)); |
|
if ((r = sshkey_load_public(identity_file, &key, NULL)) != 0) |
|
fatal("Cannot load public key \"%s\": %s", |
|
identity_file, ssh_err(r)); |
|
if (!sshkey_is_cert(key)) |
|
fatal("%s is not a certificate", identity_file); |
|
|
|
key_fp = sshkey_fingerprint(key, fingerprint_hash, SSH_FP_DEFAULT); |
key_fp = sshkey_fingerprint(key, fingerprint_hash, SSH_FP_DEFAULT); |
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("%s: sshkey_fingerprint fail", __func__); |
|
sshkey_format_cert_validity(key->cert, valid, sizeof(valid)); |
|
|
printf("%s:\n", identity_file); |
|
printf(" Type: %s %s certificate\n", sshkey_ssh_name(key), |
printf(" Type: %s %s certificate\n", sshkey_ssh_name(key), |
sshkey_cert_type(key)); |
sshkey_cert_type(key)); |
printf(" Public key: %s %s\n", sshkey_type(key), key_fp); |
printf(" Public key: %s %s\n", sshkey_type(key), key_fp); |
|
|
sshkey_type(key->cert->signature_key), ca_fp); |
sshkey_type(key->cert->signature_key), ca_fp); |
printf(" Key ID: \"%s\"\n", key->cert->key_id); |
printf(" Key ID: \"%s\"\n", key->cert->key_id); |
printf(" Serial: %llu\n", (unsigned long long)key->cert->serial); |
printf(" Serial: %llu\n", (unsigned long long)key->cert->serial); |
printf(" Valid: %s\n", |
printf(" Valid: %s\n", valid); |
fmt_validity(key->cert->valid_after, key->cert->valid_before)); |
|
printf(" Principals: "); |
printf(" Principals: "); |
if (key->cert->nprincipals == 0) |
if (key->cert->nprincipals == 0) |
printf("(none)\n"); |
printf("(none)\n"); |
|
|
printf("\n"); |
printf("\n"); |
show_options(key->cert->extensions, 0); |
show_options(key->cert->extensions, 0); |
} |
} |
exit(0); |
|
} |
} |
|
|
|
static void |
|
do_show_cert(struct passwd *pw) |
|
{ |
|
struct sshkey *key = NULL; |
|
struct stat st; |
|
int r, is_stdin = 0, ok = 0; |
|
FILE *f; |
|
char *cp, line[SSH_MAX_PUBKEY_BYTES]; |
|
const char *path; |
|
long int lnum = 0; |
|
|
|
if (!have_identity) |
|
ask_filename(pw, "Enter file in which the key is"); |
|
if (strcmp(identity_file, "-") != 0 && stat(identity_file, &st) < 0) |
|
fatal("%s: %s: %s", __progname, identity_file, strerror(errno)); |
|
|
|
path = identity_file; |
|
if (strcmp(path, "-") == 0) { |
|
f = stdin; |
|
path = "(stdin)"; |
|
is_stdin = 1; |
|
} else if ((f = fopen(identity_file, "r")) == NULL) |
|
fatal("fopen %s: %s", identity_file, strerror(errno)); |
|
|
|
while (read_keyfile_line(f, path, line, sizeof(line), &lnum) == 0) { |
|
sshkey_free(key); |
|
key = NULL; |
|
/* Trim leading space and comments */ |
|
cp = line + strspn(line, " \t"); |
|
if (*cp == '#' || *cp == '\0') |
|
continue; |
|
if ((key = sshkey_new(KEY_UNSPEC)) == NULL) |
|
fatal("key_new"); |
|
if ((r = sshkey_read(key, &cp)) != 0) { |
|
error("%s:%lu: invalid key: %s", path, |
|
lnum, ssh_err(r)); |
|
continue; |
|
} |
|
if (!sshkey_is_cert(key)) { |
|
error("%s:%lu is not a certificate", path, lnum); |
|
continue; |
|
} |
|
ok = 1; |
|
if (!is_stdin && lnum == 1) |
|
printf("%s:\n", path); |
|
else |
|
printf("%s:%lu:\n", path, lnum); |
|
print_cert(key); |
|
} |
|
sshkey_free(key); |
|
fclose(f); |
|
exit(ok ? 0 : 1); |
|
} |
|
|
#ifdef WITH_OPENSSL |
#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) |
|
|
close(fd); |
close(fd); |
sshbuf_free(kbuf); |
sshbuf_free(kbuf); |
ssh_krl_free(krl); |
ssh_krl_free(krl); |
if (ca != NULL) |
sshkey_free(ca); |
sshkey_free(ca); |
|
} |
} |
|
|
static void |
static void |
|
|
extern int optind; |
extern int optind; |
extern char *optarg; |
extern char *optarg; |
|
|
|
ssh_malloc_init(); /* must be called before any mallocs */ |
/* 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(); |
|
|