Merge pull request #1644 from cocobear/10241-fix-ssh-key-negotiation

Author: cocobear Reviewer: adiroiban Fixes: ticket:10241 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
twisted · Dec 5, 2021 · dee676b · dee676b
2 parents a8aae68 + defe8b2
commit dee676b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/twisted/conch/ssh/transport.py b/src/twisted/conch/ssh/transport.py
@@ -882,7 +882,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 = (

diff --git a/src/twisted/newsfragments/10241.bugfix b/src/twisted/newsfragments/10241.bugfix
@@ -0,0 +1,2 @@
+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.
+