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 @@
      [ssh.c ssh_config.5]
      add percent escape chars to the IdentityFile option, bz #1159 based
      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
  - OpenBSD CVS Sync
@@ -4483,4 +4486,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (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 $
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 @@
-/* $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>
  * 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] = '\0';
         }
+        if (c == EOF)
+                return -1;
         return pos;
 }