Attachment 1576 Details for Bug 1531 – Only send no-more-sessions and eow extension messages to OpenSSH servers.

[patch] Only send no-more-sessions and eow extension messages to OpenSSH servers.

no-more-sessions.patch (text/plain), 4.52 KB, created by Darren Tucker on 2008-10-17 11:00:22 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2008-10-17 11:00:22 AEDT

Size: 4.52 KB

patch

obsolete

>revision 1.78
>date: 2008/09/11 14:22:37;  author: markus;  state: Exp;  lines: +3 -2
>only send eow and no-more-sessions requests to openssh 5 and newer;
>fixes interop problems with broken ssh v2 implementations; ok djm@
>=============================================================================
>
>Index: compat.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/compat.c,v
>retrieving revision 1.77
>retrieving revision 1.78
>diff -u -p -u -r1.77 -r1.78
>--- compat.c	12 Dec 2006 03:58:42 -0000	1.77
>+++ compat.c	11 Sep 2008 14:22:37 -0000	1.78
>@@ -1,4 +1,4 @@
>-/* $OpenBSD: compat.c,v 1.77 2006/12/12 03:58:42 djm Exp $ */
>+/* $OpenBSD: compat.c,v 1.78 2008/09/11 14:22:37 markus Exp $ */
> /*
>  * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl.  All rights reserved.
>  *
>@@ -89,7 +89,8 @@ compat_datafellows(const char *version)
> 		  "OpenSSH_3.1*",	SSH_BUG_EXTEOF|SSH_OLD_FORWARD_ADDR},
> 		{ "OpenSSH_3.*",	SSH_OLD_FORWARD_ADDR },
> 		{ "Sun_SSH_1.0*",	SSH_BUG_NOREKEY|SSH_BUG_EXTEOF},
>-		{ "OpenSSH*",		0 },
>+		{ "OpenSSH_4*",		0 },
>+		{ "OpenSSH*",		SSH_NEW_OPENSSH },
> 		{ "*MindTerm*",		0 },
> 		{ "2.1.0*",		SSH_BUG_SIGBLOB|SSH_BUG_HMAC|
> 					SSH_OLD_SESSIONID|SSH_BUG_DEBUG|
>revision 1.61
>date: 2008/09/11 14:22:37;  author: markus;  state: Exp;  lines: +3 -1
>only send eow and no-more-sessions requests to openssh 5 and newer;
>fixes interop problems with broken ssh v2 implementations; ok djm@
>=============================================================================
>
>Index: nchan.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/nchan.c,v
>retrieving revision 1.60
>retrieving revision 1.61
>diff -u -p -u -r1.60 -r1.61
>--- nchan.c	30 Jun 2008 12:16:02 -0000	1.60
>+++ nchan.c	11 Sep 2008 14:22:37 -0000	1.61
>@@ -1,4 +1,4 @@
>-/* $OpenBSD: nchan.c,v 1.60 2008/06/30 12:16:02 djm Exp $ */
>+/* $OpenBSD: nchan.c,v 1.61 2008/09/11 14:22:37 markus Exp $ */
> /*
>  * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl.  All rights reserved.
>  *
>@@ -385,6 +385,8 @@ chan_send_eow2(Channel *c)
> 		    c->self);
> 		return;
> 	}
>+	if (!(datafellows & SSH_NEW_OPENSSH))
>+		return;
> 	packet_start(SSH2_MSG_CHANNEL_REQUEST);
> 	packet_put_int(c->remote_id);
> 	packet_put_cstring("eow@openssh.com");
>revision 1.42
>date: 2008/09/11 14:22:37;  author: markus;  state: Exp;  lines: +2 -1
>only send eow and no-more-sessions requests to openssh 5 and newer;
>fixes interop problems with broken ssh v2 implementations; ok djm@
>=============================================================================
>
>Index: compat.h
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/compat.h,v
>retrieving revision 1.41
>retrieving revision 1.42
>diff -u -p -u -r1.41 -r1.42
>--- compat.h	12 Dec 2006 03:58:42 -0000	1.41
>+++ compat.h	11 Sep 2008 14:22:37 -0000	1.42
>@@ -1,4 +1,4 @@
>-/* $OpenBSD: compat.h,v 1.41 2006/12/12 03:58:42 djm Exp $ */
>+/* $OpenBSD: compat.h,v 1.42 2008/09/11 14:22:37 markus Exp $ */
> 
> /*
>  * Copyright (c) 1999, 2000, 2001 Markus Friedl.  All rights reserved.
>@@ -57,6 +57,7 @@
> #define SSH_BUG_FIRSTKEX	0x00800000
> #define SSH_OLD_FORWARD_ADDR	0x01000000
> #define SSH_BUG_RFWD_ADDR	0x02000000
>+#define SSH_NEW_OPENSSH		0x04000000
> 
> void     enable_compat13(void);
> void     enable_compat20(void);
>revision 1.319
>date: 2008/09/11 14:22:37;  author: markus;  state: Exp;  lines: +3 -2
>only send eow and no-more-sessions requests to openssh 5 and newer;
>fixes interop problems with broken ssh v2 implementations; ok djm@
>=============================================================================
>
>Index: ssh.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/ssh.c,v
>retrieving revision 1.318
>retrieving revision 1.319
>diff -u -p -u -r1.318 -r1.319
>--- ssh.c	2 Jul 2008 13:47:39 -0000	1.318
>+++ ssh.c	11 Sep 2008 14:22:37 -0000	1.319
>@@ -1,4 +1,4 @@
>-/* $OpenBSD: ssh.c,v 1.318 2008/07/02 13:47:39 djm Exp $ */
>+/* $OpenBSD: ssh.c,v 1.319 2008/09/11 14:22:37 markus Exp $ */
> /*
>  * Author: Tatu Ylonen <ylo@cs.hut.fi>
>  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
>@@ -1181,7 +1181,8 @@ ssh_session2(void)
> 		id = ssh_session2_open();
> 
> 	/* If we don't expect to open a new session, then disallow it */
>-	if (options.control_master == SSHCTL_MASTER_NO) {
>+	if (options.control_master == SSHCTL_MASTER_NO &&
>+	    (datafellows & SSH_NEW_OPENSSH)) {
> 		debug("Requesting no-more-sessions@openssh.com");
> 		packet_start(SSH2_MSG_GLOBAL_REQUEST);
> 		packet_put_cstring("no-more-sessions@openssh.com");

Actions: View | Diff

Attachments on bug 1531: 1575 | 1576