vapier 15/04/28 04:39:35
Added: openssh-6.8_p1-teraterm.patch
openssh-6.8_p1-teraterm-hpn-glue.patch
Log:
Add fix from upstream for old TeraTerm clients #547944 by William Hubbs. Pull
in some upstream hpn updates.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key
D2E96200)
Revision Changes Path
1.1 net-misc/openssh/files/openssh-6.8_p1-teraterm.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openssh/files/openssh-6.8_p1-teraterm.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openssh/files/openssh-6.8_p1-teraterm.patch?rev=1.1&content-type=text/plain
Index: openssh-6.8_p1-teraterm.patch
===================================================================
https://bugs.gentoo.org/547944
>From d8f391caef62378463a0e6b36f940170dadfe605 Mon Sep 17 00:00:00 2001
From: "[email protected]" <[email protected]>
Date: Fri, 10 Apr 2015 05:16:50 +0000
Subject: [PATCH] upstream commit
Don't send hostkey advertisments
([email protected]) to current versions of Tera Term as they can't
handle them. Newer versions should be OK. Patch from Bryan Drewery and
IWAMOTO Kouichi, ok djm@
---
compat.c | 13 ++++++++++++-
compat.h | 3 ++-
sshd.c | 6 +++++-
3 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/compat.c b/compat.c
index 2498168..0934de9 100644
--- a/compat.c
+++ b/compat.c
@@ -167,6 +167,17 @@ compat_datafellows(const char *version)
SSH_BUG_SCANNER },
{ "Probe-*",
SSH_BUG_PROBE },
+ { "TeraTerm SSH*,"
+ "TTSSH/1.5.*,"
+ "TTSSH/2.1*,"
+ "TTSSH/2.2*,"
+ "TTSSH/2.3*,"
+ "TTSSH/2.4*,"
+ "TTSSH/2.5*,"
+ "TTSSH/2.6*,"
+ "TTSSH/2.70*,"
+ "TTSSH/2.71*,"
+ "TTSSH/2.72*", SSH_BUG_HOSTKEYS },
{ NULL, 0 }
};
diff --git a/compat.h b/compat.h
index af2f007..83507f0 100644
--- a/compat.h
+++ b/compat.h
@@ -60,6 +60,7 @@
#define SSH_NEW_OPENSSH 0x04000000
#define SSH_BUG_DYNAMIC_RPORT 0x08000000
#define SSH_BUG_CURVE25519PAD 0x10000000
+#define SSH_BUG_HOSTKEYS 0x20000000
void enable_compat13(void);
void enable_compat20(void);
diff --git a/sshd.c b/sshd.c
index 6aa17fa..60b0cd4 100644
--- a/sshd.c
+++ b/sshd.c
@@ -928,6 +928,10 @@ notify_hostkeys(struct ssh *ssh)
int i, nkeys, r;
char *fp;
+ /* Some clients cannot cope with the hostkeys message, skip those. */
+ if (datafellows & SSH_BUG_HOSTKEYS)
+ return;
+
if ((buf = sshbuf_new()) == NULL)
fatal("%s: sshbuf_new", __func__);
for (i = nkeys = 0; i < options.num_host_key_files; i++) {
--
2.3.6
1.1
net-misc/openssh/files/openssh-6.8_p1-teraterm-hpn-glue.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openssh/files/openssh-6.8_p1-teraterm-hpn-glue.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openssh/files/openssh-6.8_p1-teraterm-hpn-glue.patch?rev=1.1&content-type=text/plain
Index: openssh-6.8_p1-teraterm-hpn-glue.patch
===================================================================
--- a/0005-support-dynamically-sized-receive-buffers.patch
+++ b/0005-support-dynamically-sized-receive-buffers.patch
@@ -411,10 +411,10 @@ index af2f007..41b782b 100644
--- a/compat.h
+++ b/compat.h
@@ -60,6 +60,7 @@
- #define SSH_NEW_OPENSSH 0x04000000
#define SSH_BUG_DYNAMIC_RPORT 0x08000000
#define SSH_BUG_CURVE25519PAD 0x10000000
-+#define SSH_BUG_LARGEWINDOW 0x20000000
+ #define SSH_BUG_HOSTKEYS 0x20000000
++#define SSH_BUG_LARGEWINDOW 0x40000000
void enable_compat13(void);
void enable_compat20(void);
