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/01/11 10:51:07 

[ssh-keygen.c]
     when converting keys, truncate key comments at 72 chars as per RFC4716;
     bz#1630 reported by tj AT castaglia.org; ok markus@
This commit is contained in:
Darren Tucker 2010-01-12 19:41:57 +11:00
parent d4c86b1325
commit d04758dc4c
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -11,6 +11,10 @@
Do not prompt for a passphrase if we fail to open a keyfile, and log the Do not prompt for a passphrase if we fail to open a keyfile, and log the
reason the open failed to debug. reason the open failed to debug.
bz #1693, found by tj AT castaglia org, ok djm@ bz #1693, found by tj AT castaglia org, ok djm@
- djm@cvs.openbsd.org 2010/01/11 10:51:07
[ssh-keygen.c]
when converting keys, truncate key comments at 72 chars as per RFC4716;
bz#1630 reported by tj AT castaglia.org; ok markus@
20100110 20100110
- (dtucker) [configure.ac misc.c readconf.c servconf.c ssh-keyscan.c] - (dtucker) [configure.ac misc.c readconf.c servconf.c ssh-keyscan.c]

12
ssh-keygen.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-keygen.c,v 1.175 2009/08/27 17:33:49 djm Exp $ */ /* $OpenBSD: ssh-keygen.c,v 1.176 2010/01/11 10:51:07 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
@ -181,6 +181,7 @@ do_convert_to_ssh2(struct passwd *pw)
Key *k; Key *k;
u_int len; u_int len;
u_char *blob; u_char *blob;
char comment[61];
struct stat st; struct stat st;
if (!have_identity) if (!have_identity)
@ -203,11 +204,14 @@ do_convert_to_ssh2(struct passwd *pw)
fprintf(stderr, "key_to_blob failed\n"); fprintf(stderr, "key_to_blob failed\n");
exit(1); exit(1);
} }
fprintf(stdout, "%s\n", SSH_COM_PUBLIC_BEGIN); /* Comment + surrounds must fit into 72 chars (RFC 4716 sec 3.3) */
fprintf(stdout, snprintf(comment, sizeof(comment),
"Comment: \"%u-bit %s, converted from OpenSSH by %s@%s\"\n", "%u-bit %s, converted by %s@%s from OpenSSH",
key_size(k), key_type(k), key_size(k), key_type(k),
pw->pw_name, hostname); pw->pw_name, hostname);
fprintf(stdout, "%s\n", SSH_COM_PUBLIC_BEGIN);
fprintf(stdout, "Comment: \"%s\"\n", comment);
dump_base64(stdout, blob, len); dump_base64(stdout, blob, len);
fprintf(stdout, "%s\n", SSH_COM_PUBLIC_END); fprintf(stdout, "%s\n", SSH_COM_PUBLIC_END);
key_free(k); key_free(k);