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

- dtucker@cvs.openbsd.org 2006/03/30 11:05:17

Browse Source 
[ssh-keygen.c]
     Correctly handle truncated files while converting keys; ok djm@
This commit is contained in:
Damien Miller 2006-03-31 23:13:35 +11:00
parent 6b1d53c2b0
commit e23209f434
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -34,6 +34,9 @@
[ssh.c ssh_config.5] [ssh.c ssh_config.5]
add percent escape chars to the IdentityFile option, bz #1159 based add percent escape chars to the IdentityFile option, bz #1159 based
on a patch by imaging AT math.ualberta.ca; feedback and ok dtucker@ on a patch by imaging AT math.ualberta.ca; feedback and ok dtucker@
- dtucker@cvs.openbsd.org 2006/03/30 11:05:17
[ssh-keygen.c]
Correctly handle truncated files while converting keys; ok djm@
20060326 20060326
- OpenBSD CVS Sync - OpenBSD CVS Sync
@ -4483,4 +4486,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.4296 2006/03/31 12:13:21 djm Exp $ $Id: ChangeLog,v 1.4297 2006/03/31 12:13:35 djm Exp $

4
ssh-keygen.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-keygen.c,v 1.142 2006/03/25 18:40:14 deraadt Exp $ */ /* $OpenBSD: ssh-keygen.c,v 1.143 2006/03/30 11:05:17 dtucker 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
@ -331,6 +331,8 @@ get_line(FILE *fp, char *line, size_t len)
line[pos++] = c; line[pos++] = c;
line[pos] = '\0'; line[pos] = '\0';
} }
if (c == EOF)
return -1;
return pos; return pos;
} }