| 1 |
vapier 15/04/28 04:39:35 |
| 2 |
|
| 3 |
Added: openssh-6.8_p1-teraterm.patch |
| 4 |
openssh-6.8_p1-teraterm-hpn-glue.patch |
| 5 |
Log: |
| 6 |
Add fix from upstream for old TeraTerm clients #547944 by William Hubbs. Pull in some upstream hpn updates. |
| 7 |
|
| 8 |
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key D2E96200) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 net-misc/openssh/files/openssh-6.8_p1-teraterm.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openssh/files/openssh-6.8_p1-teraterm.patch?rev=1.1&view=markup |
| 14 |
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 |
| 15 |
|
| 16 |
Index: openssh-6.8_p1-teraterm.patch |
| 17 |
=================================================================== |
| 18 |
https://bugs.gentoo.org/547944 |
| 19 |
|
| 20 |
From d8f391caef62378463a0e6b36f940170dadfe605 Mon Sep 17 00:00:00 2001 |
| 21 |
From: "dtucker@×××××××.org" <dtucker@×××××××.org> |
| 22 |
Date: Fri, 10 Apr 2015 05:16:50 +0000 |
| 23 |
Subject: [PATCH] upstream commit |
| 24 |
|
| 25 |
Don't send hostkey advertisments |
| 26 |
(hostkeys-00@×××××××.com) to current versions of Tera Term as they can't |
| 27 |
handle them. Newer versions should be OK. Patch from Bryan Drewery and |
| 28 |
IWAMOTO Kouichi, ok djm@ |
| 29 |
--- |
| 30 |
compat.c | 13 ++++++++++++- |
| 31 |
compat.h | 3 ++- |
| 32 |
sshd.c | 6 +++++- |
| 33 |
3 files changed, 19 insertions(+), 3 deletions(-) |
| 34 |
|
| 35 |
diff --git a/compat.c b/compat.c |
| 36 |
index 2498168..0934de9 100644 |
| 37 |
--- a/compat.c |
| 38 |
+++ b/compat.c |
| 39 |
@@ -167,6 +167,17 @@ compat_datafellows(const char *version) |
| 40 |
SSH_BUG_SCANNER }, |
| 41 |
{ "Probe-*", |
| 42 |
SSH_BUG_PROBE }, |
| 43 |
+ { "TeraTerm SSH*," |
| 44 |
+ "TTSSH/1.5.*," |
| 45 |
+ "TTSSH/2.1*," |
| 46 |
+ "TTSSH/2.2*," |
| 47 |
+ "TTSSH/2.3*," |
| 48 |
+ "TTSSH/2.4*," |
| 49 |
+ "TTSSH/2.5*," |
| 50 |
+ "TTSSH/2.6*," |
| 51 |
+ "TTSSH/2.70*," |
| 52 |
+ "TTSSH/2.71*," |
| 53 |
+ "TTSSH/2.72*", SSH_BUG_HOSTKEYS }, |
| 54 |
{ NULL, 0 } |
| 55 |
}; |
| 56 |
|
| 57 |
diff --git a/compat.h b/compat.h |
| 58 |
index af2f007..83507f0 100644 |
| 59 |
--- a/compat.h |
| 60 |
+++ b/compat.h |
| 61 |
@@ -60,6 +60,7 @@ |
| 62 |
#define SSH_NEW_OPENSSH 0x04000000 |
| 63 |
#define SSH_BUG_DYNAMIC_RPORT 0x08000000 |
| 64 |
#define SSH_BUG_CURVE25519PAD 0x10000000 |
| 65 |
+#define SSH_BUG_HOSTKEYS 0x20000000 |
| 66 |
|
| 67 |
void enable_compat13(void); |
| 68 |
void enable_compat20(void); |
| 69 |
diff --git a/sshd.c b/sshd.c |
| 70 |
index 6aa17fa..60b0cd4 100644 |
| 71 |
--- a/sshd.c |
| 72 |
+++ b/sshd.c |
| 73 |
@@ -928,6 +928,10 @@ notify_hostkeys(struct ssh *ssh) |
| 74 |
int i, nkeys, r; |
| 75 |
char *fp; |
| 76 |
|
| 77 |
+ /* Some clients cannot cope with the hostkeys message, skip those. */ |
| 78 |
+ if (datafellows & SSH_BUG_HOSTKEYS) |
| 79 |
+ return; |
| 80 |
+ |
| 81 |
if ((buf = sshbuf_new()) == NULL) |
| 82 |
fatal("%s: sshbuf_new", __func__); |
| 83 |
for (i = nkeys = 0; i < options.num_host_key_files; i++) { |
| 84 |
-- |
| 85 |
2.3.6 |
| 86 |
|
| 87 |
|
| 88 |
|
| 89 |
|
| 90 |
1.1 net-misc/openssh/files/openssh-6.8_p1-teraterm-hpn-glue.patch |
| 91 |
|
| 92 |
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 |
| 93 |
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 |
| 94 |
|
| 95 |
Index: openssh-6.8_p1-teraterm-hpn-glue.patch |
| 96 |
=================================================================== |
| 97 |
--- a/0005-support-dynamically-sized-receive-buffers.patch |
| 98 |
+++ b/0005-support-dynamically-sized-receive-buffers.patch |
| 99 |
@@ -411,10 +411,10 @@ index af2f007..41b782b 100644 |
| 100 |
--- a/compat.h |
| 101 |
+++ b/compat.h |
| 102 |
@@ -60,6 +60,7 @@ |
| 103 |
- #define SSH_NEW_OPENSSH 0x04000000 |
| 104 |
#define SSH_BUG_DYNAMIC_RPORT 0x08000000 |
| 105 |
#define SSH_BUG_CURVE25519PAD 0x10000000 |
| 106 |
-+#define SSH_BUG_LARGEWINDOW 0x20000000 |
| 107 |
+ #define SSH_BUG_HOSTKEYS 0x20000000 |
| 108 |
++#define SSH_BUG_LARGEWINDOW 0x40000000 |
| 109 |
|
| 110 |
void enable_compat13(void); |
| 111 |
void enable_compat20(void); |
Archives