a68f18cd9b
- Bring in upstream patches post 7.7 to fix various issues [2]: b81b2d120e9c8a83489e241620843687758925ad - Fix tunnel forwarding broken in 7.7p1 341727df910e12e26ef161508ed76d91c40a61eb - don't kill ssh-agent's listening socket entriely if we fail to accept a connection 85fe48fd49f2e81fa30902841b362cfbb7f1933b - don't free the %C expansion, it's used later for LocalCommand 868afa68469de50d8a43e5daf867d7c624a34d20 - Disable SSH2_MSG_DEBUG messages for Twisted Conch clients f5baa36ba79a6e8c534fb4e0a00f2614ccc42ea6 - Omit 3des-cbc if OpenSSL built without DES PR: 227758 [1] Submitted by: IWAMOTO Kouichi <sue@iwmt.org> [1] PR: 227551 [2] Reported by: rozhuk.im@gmail.com [2] Obtained from: upstream mirror https://github.com/openssh/openssh-portable [2]
36 lines
1.2 KiB
Text
36 lines
1.2 KiB
Text
From 868afa68469de50d8a43e5daf867d7c624a34d20 Mon Sep 17 00:00:00 2001
|
|
From: "djm@openbsd.org" <djm@openbsd.org>
|
|
Date: Mon, 16 Apr 2018 22:50:44 +0000
|
|
Subject: [PATCH] upstream: Disable SSH2_MSG_DEBUG messages for Twisted Conch
|
|
clients
|
|
|
|
without version numbers since they choke on them under some circumstances.
|
|
https://twistedmatrix.com/trac/ticket/9422 via Colin Watson
|
|
|
|
Newer Conch versions have a version number in their ident string and
|
|
handle debug messages okay. https://twistedmatrix.com/trac/ticket/9424
|
|
|
|
OpenBSD-Commit-ID: 6cf7be262af0419c58ddae11324d9c0dc1577539
|
|
---
|
|
compat.c | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git compat.c compat.c
|
|
index 861e9e21f..1c0e08732 100644
|
|
--- compat.c
|
|
+++ compat.c
|
|
@@ -1,4 +1,4 @@
|
|
-/* $OpenBSD: compat.c,v 1.106 2018/02/16 04:43:11 dtucker Exp $ */
|
|
+/* $OpenBSD: compat.c,v 1.107 2018/04/16 22:50:44 djm Exp $ */
|
|
/*
|
|
* Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved.
|
|
*
|
|
@@ -128,6 +128,8 @@ compat_datafellows(const char *version)
|
|
SSH_OLD_DHGEX },
|
|
{ "ConfD-*",
|
|
SSH_BUG_UTF8TTYMODE },
|
|
+ { "Twisted_*", 0 },
|
|
+ { "Twisted*", SSH_BUG_DEBUG },
|
|
{ NULL, 0 }
|
|
};
|
|
|