Attachment #1576 for bug #1531

View | Details | Raw Unified | Return to bug 1531
Collapse All | Expand All

Lines 1-4 Link Here

(-)compat.c (-2 / +3 lines)
1	/* $OpenBSD: compat.c,v 1.77 2006/12/12 03:58:42 djm Exp $ */	1	/* $OpenBSD: compat.c,v 1.78 2008/09/11 14:22:37 markus Exp $ */
2	/*	2	/*
3	* Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved.	3	* Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved.
4	*	4	*
Lines 89-95 compat_datafellows(const char *version) Link Here
89	"OpenSSH_3.1*", SSH_BUG_EXTEOF\|SSH_OLD_FORWARD_ADDR},	89	"OpenSSH_3.1*", SSH_BUG_EXTEOF\|SSH_OLD_FORWARD_ADDR},
90	{ "OpenSSH_3.*", SSH_OLD_FORWARD_ADDR },	90	{ "OpenSSH_3.*", SSH_OLD_FORWARD_ADDR },
91	{ "Sun_SSH_1.0*", SSH_BUG_NOREKEY\|SSH_BUG_EXTEOF},	91	{ "Sun_SSH_1.0*", SSH_BUG_NOREKEY\|SSH_BUG_EXTEOF},
92	{ "OpenSSH*", 0 },	92	{ "OpenSSH_4*", 0 },
		93	{ "OpenSSH*", SSH_NEW_OPENSSH },
93	{ "MindTerm", 0 },	94	{ "MindTerm", 0 },
94	{ "2.1.0*", SSH_BUG_SIGBLOB\|SSH_BUG_HMAC\|	95	{ "2.1.0*", SSH_BUG_SIGBLOB\|SSH_BUG_HMAC\|
95	SSH_OLD_SESSIONID\|SSH_BUG_DEBUG\|	96	SSH_OLD_SESSIONID\|SSH_BUG_DEBUG\|

Lines 1-4 Link Here

(-)nchan.c (-1 / +3 lines)
1	/* $OpenBSD: nchan.c,v 1.60 2008/06/30 12:16:02 djm Exp $ */	1	/* $OpenBSD: nchan.c,v 1.61 2008/09/11 14:22:37 markus Exp $ */
2	/*	2	/*
3	* Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved.	3	* Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved.
4	*	4	*
Lines 385-390 chan_send_eow2(Channel *c) Link Here
385	c->self);	385	c->self);
386	return;	386	return;
387	}	387	}
		388	if (!(datafellows & SSH_NEW_OPENSSH))
		389	return;
388	packet_start(SSH2_MSG_CHANNEL_REQUEST);	390	packet_start(SSH2_MSG_CHANNEL_REQUEST);
389	packet_put_int(c->remote_id);	391	packet_put_int(c->remote_id);
390	packet_put_cstring("eow@openssh.com");	392	packet_put_cstring("eow@openssh.com");

Lines 1-4 Link Here

(-)compat.h (-1 / +2 lines)
1	/* $OpenBSD: compat.h,v 1.41 2006/12/12 03:58:42 djm Exp $ */	1	/* $OpenBSD: compat.h,v 1.42 2008/09/11 14:22:37 markus Exp $ */
2		2
3	/*	3	/*
4	* Copyright (c) 1999, 2000, 2001 Markus Friedl. All rights reserved.	4	* Copyright (c) 1999, 2000, 2001 Markus Friedl. All rights reserved.
Lines 57-62 Link Here
57	#define SSH_BUG_FIRSTKEX 0x00800000	57	#define SSH_BUG_FIRSTKEX 0x00800000
58	#define SSH_OLD_FORWARD_ADDR 0x01000000	58	#define SSH_OLD_FORWARD_ADDR 0x01000000
59	#define SSH_BUG_RFWD_ADDR 0x02000000	59	#define SSH_BUG_RFWD_ADDR 0x02000000
		60	#define SSH_NEW_OPENSSH 0x04000000
60		61
61	void enable_compat13(void);	62	void enable_compat13(void);
62	void enable_compat20(void);	63	void enable_compat20(void);

Lines 1-4 Link Here

(-)ssh.c (-2 / +3 lines)
1	/* $OpenBSD: ssh.c,v 1.318 2008/07/02 13:47:39 djm Exp $ */	1	/* $OpenBSD: ssh.c,v 1.319 2008/09/11 14:22:37 markus Exp $ */
2	/*	2	/*
3	* Author: Tatu Ylonen <ylo@cs.hut.fi>	3	* Author: Tatu Ylonen <ylo@cs.hut.fi>
4	* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland	4	* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
Lines 1181-1187 ssh_session2(void) Link Here
1181	id = ssh_session2_open();	1181	id = ssh_session2_open();
1182		1182
1183	/* If we don't expect to open a new session, then disallow it */	1183	/* If we don't expect to open a new session, then disallow it */
1184	if (options.control_master == SSHCTL_MASTER_NO) {	1184	if (options.control_master == SSHCTL_MASTER_NO &&
		1185	(datafellows & SSH_NEW_OPENSSH)) {
1185	debug("Requesting no-more-sessions@openssh.com");	1186	debug("Requesting no-more-sessions@openssh.com");
1186	packet_start(SSH2_MSG_GLOBAL_REQUEST);	1187	packet_start(SSH2_MSG_GLOBAL_REQUEST);
1187	packet_put_cstring("no-more-sessions@openssh.com");	1188	packet_put_cstring("no-more-sessions@openssh.com");

Return to bug 1531