Attachment 1087 Details for Bug 1157 – Make ssh-keygen accept CR, LF or CRLF in keys take 5, with feedback from djm

[patch] Make ssh-keygen accept CR, LF or CRLF in keys take 5, with feedback from djm

openssh-keygen-newline.patch (text/plain), 2.54 KB, created by Darren Tucker on 2006-02-27 23:23:26 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2006-02-27 23:23:26 AEDT

Size: 2.54 KB

patch

obsolete

>Index: ssh-keygen.c
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/ssh-keygen.c,v
>retrieving revision 1.141
>diff -u -p -r1.141 ssh-keygen.c
>--- ssh-keygen.c	29 Nov 2005 02:10:25 -0000	1.141
>+++ ssh-keygen.c	27 Feb 2006 12:05:40 -0000
>@@ -302,13 +302,42 @@ do_convert_private_ssh2_from_blob(u_char
> 	return key;
> }
> 
>+static int
>+get_line(FILE *fp, char *line, size_t len)
>+{
>+	int c;
>+	size_t pos = 0;
>+
>+	line[0] = '\0';
>+	while ((c = fgetc(fp)) != EOF) {
>+		if (pos >= len - 1) {
>+			fprintf(stderr, "input line too long.\n");
>+			exit(1);
>+		}
>+		switch(c) {
>+		case '\r':
>+			c = fgetc(fp);
>+			if (c != EOF && c != '\n' && ungetc(c, fp) == EOF) {
>+				fprintf(stderr, "unget: %s\n", strerror(errno));
>+				exit(1);
>+			}
>+			return pos;
>+		case '\n':
>+			return pos;
>+		}
>+		line[pos++] = c;
>+		line[pos] = '\0';
>+	}
>+	return pos;
>+}
>+
> static void
> do_convert_from_ssh2(struct passwd *pw)
> {
> 	Key *k;
> 	int blen;
> 	u_int len;
>-	char line[1024], *p;
>+	char line[1024];
> 	u_char blob[8096];
> 	char encoded[8096];
> 	struct stat st;
>@@ -327,12 +356,8 @@ do_convert_from_ssh2(struct passwd *pw)
> 		exit(1);
> 	}
> 	encoded[0] = '\0';
>-	while (fgets(line, sizeof(line), fp)) {
>-		if (!(p = strchr(line, '\n'))) {
>-			fprintf(stderr, "input line too long.\n");
>-			exit(1);
>-		}
>-		if (p > line && p[-1] == '\\')
>+	while ((blen = get_line(fp, line, sizeof(line))) != -1) {
>+		if (line[blen - 1] == '\\')
> 			escaped++;
> 		if (strncmp(line, "----", 4) == 0 ||
> 		    strstr(line, ": ") != NULL) {
>@@ -349,7 +374,6 @@ do_convert_from_ssh2(struct passwd *pw)
> 			/* fprintf(stderr, "escaped: %s", line); */
> 			continue;
> 		}
>-		*p = '\0';
> 		strlcat(encoded, line, sizeof(encoded));
> 	}
> 	len = strlen(encoded);
>Index: regress/Makefile
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/regress/Makefile,v
>retrieving revision 1.23
>diff -u -p -r1.23 Makefile
>--- regress/Makefile	7 Mar 2005 07:35:34 -0000	1.23
>+++ regress/Makefile	27 Feb 2006 12:17:32 -0000
>@@ -56,6 +56,10 @@ CLEANFILES=	t2.out t6.out1 t6.out2 t7.ou
> 
> t1:
> 	ssh-keygen -if ${.CURDIR}/rsa_ssh2.prv | diff - ${.CURDIR}/rsa_openssh.prv
>+	sed 's/$$/\r/g' ${.CURDIR}/rsa_ssh2.prv > ${OBJ}/rsa_ssh2_crnl.prv
>+	ssh-keygen -if ${OBJ}/rsa_ssh2_crnl.prv | diff - ${.CURDIR}/rsa_openssh.prv
>+	tr '\n' '\r' <${.CURDIR}/rsa_ssh2.prv > ${OBJ}/rsa_ssh2_cr.prv
>+	ssh-keygen -if ${OBJ}/rsa_ssh2_cr.prv | diff - ${.CURDIR}/rsa_openssh.prv
> 
> t2:
> 	cat ${.CURDIR}/rsa_openssh.prv > $(OBJ)/t2.out

Flags:

djm: ok+

Actions: View | Diff

Attachments on bug 1157: 1067 | 1068 | 1069 | 1070 | 1074 | 1078 | 1086 | 1087 | 1091