From 6c7439f963c04ddeedbb858c5f96647eea3c9360 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Fri, 5 Jan 2007 16:29:55 +1100 Subject: [PATCH] - stevesk@cvs.openbsd.org 2007/01/03 00:53:38 [ssh-keygen.c] remove small dead code; arnaud.lacombe.1@ulaval.ca via Coverity scan --- ChangeLog | 5 ++++- ssh-keygen.c | 7 +++---- 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 @@ [sshd_config.5] do not use lists for SYNOPSIS; from eric s. raymond via brad + - stevesk@cvs.openbsd.org 2007/01/03 00:53:38 + [ssh-keygen.c] + remove small dead code; arnaud.lacombe.1@ulaval.ca via Coverity scan 20061205 - (djm) [auth.c] Fix NULL pointer dereference in fakepw(). Crash would @@ -2649,4 +2652,4 @@ OpenServer 6 and add osr5bigcrypt support so when someone migrates passwords between UnixWare and OpenServer they will still work. OK dtucker@ -$Id: ChangeLog,v 1.4598 2007/01/05 05:29:30 djm Exp $ +$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 @@ -/* $OpenBSD: ssh-keygen.c,v 1.156 2006/11/14 19:41:04 deraadt Exp $ */ +/* $OpenBSD: ssh-keygen.c,v 1.157 2007/01/03 00:53:38 stevesk Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1994 Tatu Ylonen , Espoo, Finland @@ -346,9 +346,8 @@ get_line(FILE *fp, char *line, size_t len) line[pos++] = c; line[pos] = '\0'; } - if (c == EOF) - return -1; - return pos; + /* We reached EOF */ + return -1; } static void