Attachment 1381 Details for Bug 1390 – fixed patch

[patch] fixed patch

parse-rekey.patch (text/plain), 1.54 KB, created by Jan Pechanec on 2007-11-13 09:53:18 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Pechanec

Created: 2007-11-13 09:53:18 AEDT

Size: 1.54 KB

patch

obsolete

>--- openssh-4.7p1/readconf.c	Mon Oct 22 20:02:09 2007
>+++ tmp/openssh-4.7p1/readconf.c	Fri Nov  9 17:52:45 2007
>@@ -498,7 +498,6 @@
> 		goto parse_int;
> 
> 	case oRekeyLimit:
>-		intptr = &options->rekey_limit;
> 		arg = strdelim(&s);
> 		if (!arg || *arg == '\0')
> 			fatal("%.200s line %d: Missing argument.", filename, linenum);
>@@ -526,14 +525,14 @@
> 		}
> 		val64 *= scale;
> 		/* detect integer wrap and too-large limits */
>-		if ((val64 / scale) != orig || val64 > INT_MAX)
>+		if ((val64 / scale) != orig || val64 > UINT_MAX)
> 			fatal("%.200s line %d: RekeyLimit too large",
> 			    filename, linenum);
> 		if (val64 < 16)
> 			fatal("%.200s line %d: RekeyLimit too small",
> 			    filename, linenum);
>-		if (*activep && *intptr == -1)
>-			*intptr = (int)val64;
>+		if (*activep && options->rekey_limit == -1)
>+			options->rekey_limit = (u_int32_t)val64;
> 		break;
> 
> 	case oIdentityFile:
>--- openssh-4.7p1/readconf.h	Sat Aug  5 04:39:40 2006
>+++ tmp/openssh-4.7p1/readconf.h	Mon Nov 12 23:37:55 2007
>@@ -100,7 +100,7 @@
> 	int	clear_forwardings;
> 
> 	int	enable_ssh_keysign;
>-	int	rekey_limit;
>+	int64_t rekey_limit;
> 	int	no_host_authentication_for_localhost;
> 	int	identities_only;
> 	int	server_alive_interval;
>--- openssh-4.7p1/sshconnect2.c	Sun May 20 07:11:33 2007
>+++ tmp/openssh-4.7p1/sshconnect2.c	Mon Nov 12 23:38:19 2007
>@@ -130,7 +130,7 @@
> 		    options.hostkeyalgorithms;
> 
> 	if (options.rekey_limit)
>-		packet_set_rekey_limit(options.rekey_limit);
>+		packet_set_rekey_limit((u_int32_t)options.rekey_limit);
> 
> 	/* start key exchange */
> 	kex = kex_setup(myproposal);

Flags:

dtucker: ok+

Actions: View | Diff

Attachments on bug 1390: 1380 | 1381