tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-26 07:15:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

- markus@cvs.openbsd.org 2010/11/29 18:57:04

Browse Source 
[authfile.c]
     correctly load comment for encrypted rsa1 keys;
     report/fix Joachim Schipper; ok djm@
This commit is contained in:
Damien Miller 2010-12-01 12:03:39 +11:00
parent 87dc0a4188
commit 03c0e533de
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -34,6 +34,10 @@
Pass through ssh command-line flags and options when doing remote-remote Pass through ssh command-line flags and options when doing remote-remote
transfers, e.g. to enable agent forwarding which is particularly useful transfers, e.g. to enable agent forwarding which is particularly useful
in this case; bz#1837 ok dtucker@ in this case; bz#1837 ok dtucker@
- markus@cvs.openbsd.org 2010/11/29 18:57:04
[authfile.c]
correctly load comment for encrypted rsa1 keys;
report/fix Joachim Schipper; ok djm@
20101124 20101124
- (dtucker) [platform.c session.c] Move the getluid call out of session.c and - (dtucker) [platform.c session.c] Move the getluid call out of session.c and

5
authfile.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: authfile.c,v 1.86 2010/11/21 10:57:07 djm Exp $ */ /* $OpenBSD: authfile.c,v 1.87 2010/11/29 18:57:04 markus Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -710,8 +710,9 @@ key_load_private(const char *filename, const char *passphrase,
*commentp = xstrdup(filename); *commentp = xstrdup(filename);
} else { } else {
key_free(pub); key_free(pub);
/* key_parse_public_rsa1() has already loaded the comment */
prv = key_parse_private_type(&buffer, KEY_RSA1, passphrase, prv = key_parse_private_type(&buffer, KEY_RSA1, passphrase,
commentp); NULL);
} }
buffer_free(&buffer); buffer_free(&buffer);
return prv; return prv;