From e5f95410a844741ba2faca371cd4199f9d908f7e Mon Sep 17 00:00:00 2001 From: d30002704 Date: Wed, 28 Jul 2021 10:05:04 +0800 Subject: [PATCH 1/3] fix wrong variable using --- src/twisted/conch/ssh/transport.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/twisted/conch/ssh/transport.py b/src/twisted/conch/ssh/transport.py index 266b1f6d83f..e5cd9263b68 100644 --- a/src/twisted/conch/ssh/transport.py +++ b/src/twisted/conch/ssh/transport.py @@ -849,7 +849,7 @@ def ssh_KEXINIT(self, packet): ) = (s.split(b",") for s in strings) # These are the server directions outs = [encSC, macSC, compSC] - ins = [encCS, macSC, compCS] + ins = [encCS, macCS, compCS] if self.isClient: outs, ins = ins, outs # Switch directions server = ( From 8376848a2d87fc51e9c2411c090c8bc1064d9c59 Mon Sep 17 00:00:00 2001 From: d30002704 Date: Thu, 29 Jul 2021 16:51:10 +0800 Subject: [PATCH 2/3] add newsfragment --- src/twisted/newsfragments/10241.bugfix | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 src/twisted/newsfragments/10241.bugfix diff --git a/src/twisted/newsfragments/10241.bugfix b/src/twisted/newsfragments/10241.bugfix new file mode 100644 index 00000000000..a1288093e72 --- /dev/null +++ b/src/twisted/newsfragments/10241.bugfix @@ -0,0 +1,2 @@ +Fix the use of incorrect variable in the SSHServerTransport.ssh_KEXINIT. +macSC--> should be (macCS) From 624e79df282d30ba6387037ed613febf7a82a6b4 Mon Sep 17 00:00:00 2001 From: d00624431 Date: Thu, 2 Dec 2021 10:28:10 +0800 Subject: [PATCH 3/3] update newsfragment --- src/twisted/newsfragments/10241.bugfix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/twisted/newsfragments/10241.bugfix b/src/twisted/newsfragments/10241.bugfix index a1288093e72..ce57c544137 100644 --- a/src/twisted/newsfragments/10241.bugfix +++ b/src/twisted/newsfragments/10241.bugfix @@ -1,2 +1,2 @@ -Fix the use of incorrect variable in the SSHServerTransport.ssh_KEXINIT. -macSC--> should be (macCS) +SSHTransportBase.ssh_KEXINIT now uses the remote peer preferred MAC list for negotiation. In previous versions it was only using the local preferred MAC list. +