summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ssh-keygen.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 792d4fd68..baae286ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,6 +34,9 @@
34 [ssh.c ssh_config.5] 34 [ssh.c ssh_config.5]
35 add percent escape chars to the IdentityFile option, bz #1159 based 35 add percent escape chars to the IdentityFile option, bz #1159 based
36 on a patch by imaging AT math.ualberta.ca; feedback and ok dtucker@ 36 on a patch by imaging AT math.ualberta.ca; feedback and ok dtucker@
37 - dtucker@cvs.openbsd.org 2006/03/30 11:05:17
38 [ssh-keygen.c]
39 Correctly handle truncated files while converting keys; ok djm@
37 40
3820060326 4120060326
39 - OpenBSD CVS Sync 42 - OpenBSD CVS Sync
@@ -4483,4 +4486,4 @@
4483 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4486 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4484 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4487 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4485 4488
4486$Id: ChangeLog,v 1.4296 2006/03/31 12:13:21 djm Exp $ 4489$Id: ChangeLog,v 1.4297 2006/03/31 12:13:35 djm Exp $
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 25c2cfd84..ef417514a 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-keygen.c,v 1.142 2006/03/25 18:40:14 deraadt Exp $ */ 1/* $OpenBSD: ssh-keygen.c,v 1.143 2006/03/30 11:05:17 dtucker Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -331,6 +331,8 @@ get_line(FILE *fp, char *line, size_t len)
331 line[pos++] = c; 331 line[pos++] = c;
332 line[pos] = '\0'; 332 line[pos] = '\0';
333 } 333 }
334 if (c == EOF)
335 return -1;
334 return pos; 336 return pos;
335} 337}
336 338