summaryrefslogtreecommitdiffstats
path: root/ssh-keygen.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-03-31 14:13:35 +0200
committerDamien Miller <djm@mindrot.org>2006-03-31 14:13:35 +0200
commite23209f4349343d75c66fd8c71a57942d8827f54 (patch)
tree0ef905f397553fcf50790de241d7abce55f2d31e /ssh-keygen.c
parent - djm@cvs.openbsd.org 2006/03/30 10:41:25 (diff)
downloadopenssh-e23209f4349343d75c66fd8c71a57942d8827f54.tar.xz
openssh-e23209f4349343d75c66fd8c71a57942d8827f54.zip
- dtucker@cvs.openbsd.org 2006/03/30 11:05:17
[ssh-keygen.c] Correctly handle truncated files while converting keys; ok djm@
Diffstat (limited to '')
-rw-r--r--ssh-keygen.c4
1 files changed, 3 insertions, 1 deletions
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;
}