Attachment 660 Details for Bug 884 – Allow large keys to work.

[patch] Allow large keys to work.

openbsd-16kbit-keys.patch (text/plain), 1.33 KB, created by Darren Tucker on 2004-06-24 17:16:23 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2004-06-24 17:16:23 AEST

Size: 1.33 KB

patch

obsolete

>Index: auth2-pubkey.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/auth2-pubkey.c,v
>retrieving revision 1.7
>diff -u -p -r1.7 auth2-pubkey.c
>--- auth2-pubkey.c	21 Jun 2004 17:36:31 -0000	1.7
>+++ auth2-pubkey.c	24 Jun 2004 07:15:44 -0000
>@@ -163,7 +163,7 @@ done:
> static int
> user_key_allowed2(struct passwd *pw, Key *key, char *file)
> {
>-	char line[8192];
>+	char line[16384];
> 	int found_key = 0;
> 	FILE *f;
> 	u_long linenum = 0;
>Index: authfile.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/authfile.c,v
>retrieving revision 1.57
>diff -u -p -r1.57 authfile.c
>--- authfile.c	21 Jun 2004 17:36:31 -0000	1.57
>+++ authfile.c	24 Jun 2004 07:15:44 -0000
>@@ -595,12 +595,22 @@ static int
> key_try_load_public(Key *k, const char *filename, char **commentp)
> {
> 	FILE *f;
>-	char line[4096];
>+	char line[16384];
> 	char *cp;
>+	int c, lineno = 0;
> 
> 	f = fopen(filename, "r");
> 	if (f != NULL) {
> 		while (fgets(line, sizeof(line), f)) {
>+			lineno++;
>+			if (line[strlen(line) - 1] != '\n') {
>+				error("Excessively long line in %s line %d",
>+				    filename, lineno);
>+				/* discard remainder of line */
>+				while ((c = fgetc(f) != EOF) && c != '\n')
>+					;	/* nothing */
>+				break;
>+			}
> 			line[sizeof(line)-1] = '\0';
> 			cp = line;
> 			switch (*cp) {

Actions: View | Diff

Attachments on bug 884: 658 | 659 | 660 | 661 | 663 | 733 | 734 | 735