tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2010/06/23 02:59:02 

[ssh-keygen.c]
     fix printing of extensions in v01 certificates that I broke in r1.190
This commit is contained in:
Damien Miller 2010-06-26 09:48:02 +10:00
parent 1b2b61e6f8
commit d834d35834
2 changed files with 49 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -50,6 +50,9 @@
[session.c] [session.c]
include the user name on "subsystem request for ..." log messages; include the user name on "subsystem request for ..." log messages;
bz#1571; ok dtucker@ bz#1571; ok dtucker@
- djm@cvs.openbsd.org 2010/06/23 02:59:02
[ssh-keygen.c]
fix printing of extensions in v01 certificates that I broke in r1.190
20100622 20100622
- (djm) [loginrec.c] crank LINFO_NAMESIZE (username length) to 512 - (djm) [loginrec.c] crank LINFO_NAMESIZE (username length) to 512

96
ssh-keygen.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-keygen.c,v 1.191 2010/06/22 04:32:06 djm Exp $ */ /* $OpenBSD: ssh-keygen.c,v 1.192 2010/06/23 02:59:02 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -1409,15 +1409,55 @@ add_cert_option(char *opt)
fatal("Unsupported certificate option \"%s\"", opt); fatal("Unsupported certificate option \"%s\"", opt);
} }
static void
show_options(const Buffer *optbuf, int v00, int in_critical)
{
u_char *name, *data;
u_int dlen;
Buffer options, option;
buffer_init(&options);
buffer_append(&options, buffer_ptr(optbuf), buffer_len(optbuf));
buffer_init(&option);
while (buffer_len(&options) != 0) {
name = buffer_get_string(&options, NULL);
data = buffer_get_string_ptr(&options, &dlen);
buffer_append(&option, data, dlen);
printf(" %s", name);
if ((v00 || !in_critical) &&
(strcmp(name, "permit-X11-forwarding") == 0 ||
strcmp(name, "permit-agent-forwarding") == 0 ||
strcmp(name, "permit-port-forwarding") == 0 ||
strcmp(name, "permit-pty") == 0 ||
strcmp(name, "permit-user-rc") == 0))
printf("\n");
else if ((v00 || in_critical) &&
(strcmp(name, "force-command") == 0 ||
strcmp(name, "source-address") == 0)) {
data = buffer_get_string(&option, NULL);
printf(" %s\n", data);
xfree(data);
} else {
printf(" UNKNOWN OPTION (len %u)\n",
buffer_len(&option));
buffer_clear(&option);
}
xfree(name);
if (buffer_len(&option) != 0)
fatal("Option corrupt: extra data at end");
}
buffer_free(&option);
buffer_free(&options);
}
static void static void
do_show_cert(struct passwd *pw) do_show_cert(struct passwd *pw)
{ {
Key *key; Key *key;
struct stat st; struct stat st;
char *key_fp, *ca_fp; char *key_fp, *ca_fp;
Buffer options, option; u_int i, v00;
u_char *name, *data;
u_int i, dlen, v00;
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");
@ -1458,38 +1498,7 @@ do_show_cert(struct passwd *pw)
printf("(none)\n"); printf("(none)\n");
else { else {
printf("\n"); printf("\n");
buffer_init(&options); show_options(&key->cert->critical, v00, 1);
buffer_append(&options,
buffer_ptr(&key->cert->critical),
buffer_len(&key->cert->critical));
buffer_init(&option);
while (buffer_len(&options) != 0) {
name = buffer_get_string(&options, NULL);
data = buffer_get_string_ptr(&options, &dlen);
buffer_append(&option, data, dlen);
printf(" %s", name);
if (strcmp(name, "permit-X11-forwarding") == 0 ||
strcmp(name, "permit-agent-forwarding") == 0 ||
strcmp(name, "permit-port-forwarding") == 0 ||
strcmp(name, "permit-pty") == 0 ||
strcmp(name, "permit-user-rc") == 0)
printf("\n");
else if (strcmp(name, "force-command") == 0 ||
strcmp(name, "source-address") == 0) {
data = buffer_get_string(&option, NULL);
printf(" %s\n", data);
xfree(data);
} else {
printf(" UNKNOWN OPTION (len %u)\n",
buffer_len(&option));
buffer_clear(&option);
}
xfree(name);
if (buffer_len(&option) != 0)
fatal("Option corrupt: extra data at end");
}
buffer_free(&option);
buffer_free(&options);
} }
if (!v00) { if (!v00) {
printf(" Extensions: "); printf(" Extensions: ");
@ -1497,20 +1506,7 @@ do_show_cert(struct passwd *pw)
printf("(none)\n"); printf("(none)\n");
else { else {
printf("\n"); printf("\n");
buffer_init(&options); show_options(&key->cert->extensions, v00, 0);
buffer_append(&options,
buffer_ptr(&key->cert->extensions),
buffer_len(&key->cert->extensions));
buffer_init(&option);
while (buffer_len(&options) != 0) {
name = buffer_get_string(&options, NULL);
(void)buffer_get_string_ptr(&options, &dlen);
printf(" %s UNKNOWN OPTION "
"(len %u)\n", name, dlen);
xfree(name);
}
buffer_free(&option);
buffer_free(&options);
} }
} }
exit(0); exit(0);