summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ssh-keygen.c7
2 files changed, 7 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 1c090460c..897eb13c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,9 @@
29 [sshd_config.5] 29 [sshd_config.5]
30 do not use lists for SYNOPSIS; 30 do not use lists for SYNOPSIS;
31 from eric s. raymond via brad 31 from eric s. raymond via brad
32 - stevesk@cvs.openbsd.org 2007/01/03 00:53:38
33 [ssh-keygen.c]
34 remove small dead code; arnaud.lacombe.1@ulaval.ca via Coverity scan
32 35
3320061205 3620061205
34 - (djm) [auth.c] Fix NULL pointer dereference in fakepw(). Crash would 37 - (djm) [auth.c] Fix NULL pointer dereference in fakepw(). Crash would
@@ -2649,4 +2652,4 @@
2649 OpenServer 6 and add osr5bigcrypt support so when someone migrates 2652 OpenServer 6 and add osr5bigcrypt support so when someone migrates
2650 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 2653 passwords between UnixWare and OpenServer they will still work. OK dtucker@
2651 2654
2652$Id: ChangeLog,v 1.4598 2007/01/05 05:29:30 djm Exp $ 2655$Id: ChangeLog,v 1.4599 2007/01/05 05:29:55 djm Exp $
diff --git a/ssh-keygen.c b/ssh-keygen.c
index dfa1166c2..f43b12493 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-keygen.c,v 1.156 2006/11/14 19:41:04 deraadt Exp $ */ 1/* $OpenBSD: ssh-keygen.c,v 1.157 2007/01/03 00:53:38 stevesk 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
@@ -346,9 +346,8 @@ get_line(FILE *fp, char *line, size_t len)
346 line[pos++] = c; 346 line[pos++] = c;
347 line[pos] = '\0'; 347 line[pos] = '\0';
348 } 348 }
349 if (c == EOF) 349 /* We reached EOF */
350 return -1; 350 return -1;
351 return pos;
352} 351}
353 352
354static void 353static void