Skip to content

Resolve Incompatibility with MobaXterm and Problem with DisableMTAES #161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rapier1 merged 4 commits into from
Sep 17, 2026
Merged

Resolve Incompatibility with MobaXterm and Problem with DisableMTAES #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
57ffc76
Fix DisableMTAES so it's not bypassed on later rekeys.
rapier1 Sep 15, 2026
a0416d4
Resolve incompatibility with MobaXterm.
rapier1 Sep 16, 2026
094f7d8
remove config,h.in and configure
rapier1 Sep 16, 2026
96cc75b
Crank version to 18.11.1
rapier1 Sep 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions cipher-switch.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@ cipher_switch(struct ssh *ssh) {
if (strstr(send, "ctr") || strstr(recv, "ctr")) {
debug("Serial to parallel AES-CTR cipher swap");
/* cipher_reset_multithreaded(); */
/* mark MT active so the promotion in ssh_set_newkeys only
* happens when we deliberately switched here. Without this a
* later rekey would promote to MT even under DisableMTAES. */
ssh->mt_enabled = 1;
ssh_packet_set_authenticated(ssh);
packet_request_rekeying();
}
Expand Down
2 changes: 2 additions & 0 deletions compat.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,8 @@ compat_banner(struct ssh *ssh, const char *version)
SSH_BUG_UTF8TTYMODE },
{ "Twisted_*", 0 },
{ "Twisted*", SSH_BUG_DEBUG },
/* MobaXterm's SFTP engine, see kex_input_newkeys */
{ "SecureBlackbox*", SSH_BUG_STRICT_KEX_REKEY },
{ NULL, 0 }
};

Expand Down
1 change: 1 addition & 0 deletions compat.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
/* #define unused 0x00010000 */
/* #define unused 0x00020000 */
/* #define unused 0x00040000 */
#define SSH_BUG_STRICT_KEX_REKEY 0x00080000 /* peer wants kex-strict on rekeys */
#define SSH_HPNSSH 0x00100000 /* basically a notice that this is HPN aware */
#define SSH_BUG_EXTEOF 0x00200000
#define SSH_BUG_PROBE 0x00400000
Expand Down
Loading
Loading