- dtucker@cvs.openbsd.org 2004/12/06 11:41:03

     [auth-rsa.c auth2-pubkey.c authfile.c misc.c misc.h ssh.h sshd.8]
     Discard over-length authorized_keys entries rather than complaining when
     they don't decode.  bz #884, with & ok djm@

1 files changed, 24 insertions, 1 deletions

diff --git a/misc.c b/misc.c
index 8cb411ccc..d0cc53823 100644
--- a/misc.c
+++ b/misc.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: misc.c,v 1.25 2004/08/11 21:43:05 avsm Exp $");
+RCSID("$OpenBSD: misc.c,v 1.26 2004/12/06 11:41:03 dtucker Exp $");
 
 #include "misc.h"
 #include "log.h"
@@ -332,3 +332,26 @@ addargs(arglist *args, char *fmt, ...)
         args->list[args->num++] = xstrdup(buf);
         args->list[args->num] = NULL;
 }
+
+/*
+ * Read an entire line from a public key file into a static buffer, discarding
+ * lines that exceed the buffer size.  Returns 0 on success, -1 on failure.
+ */
+int
+read_keyfile_line(FILE *f, const char *filename, char *buf, size_t bufsz,
+   int *lineno)
+{
+        while (fgets(buf, bufsz, f) != NULL) {
+                (*lineno)++;
+                if (buf[strlen(buf) - 1] == '\n' || feof(f)) {
+                        return 0;
+                } else {
+                        debug("%s: %s line %d exceeds size limit", __func__,
+                            filename, lineno);
+                        /* discard remainder of line */
+                        while(fgetc(f) != '\n' && !feof(f))
+                                ;       /* nothing */
+                }
+        }
+        return -1;
+}