[10944] SSH2 の Rekey 時に SSH_MSG_NEWKEYS が送信されない問題を修正 (ttssh2-commit) - Tera Term

Revision: 10944
          https://osdn.net/projects/ttssh2/scm/svn/commits/10944
Author:   nmaya
Date:     2023-09-23 08:42:56 +0900 (Sat, 23 Sep 2023)
Log Message:
-----------
SSH2 の Rekey 時に SSH_MSG_NEWKEYS が送信されない問題を修正

ticket: #36109
issue: https://github.com/TeraTermProject/osdn-download/issues/8
MFT: r10943

Revision Links:
--------------
    https://osdn.net/projects/ttssh2/scm/svn/commits/10943

Ticket Links:
------------
    https://osdn.net/projects/ttssh2/tracker/detail/36109

Modified Paths:
--------------
    branches/4-stable/ttssh2/ttxssh/ssh.c

-------------- next part --------------
Modified: branches/4-stable/ttssh2/ttxssh/ssh.c
===================================================================

--- branches/4-stable/ttssh2/ttxssh/ssh.c	2023-09-20 21:21:39 UTC (rev 10943)
+++ branches/4-stable/ttssh2/ttxssh/ssh.c	2023-09-22 23:42:56 UTC (rev 10944)
@@ -3004,13 +3004,13 @@
 			// \x94F\x8F؃_\x83C\x83A\x83\x8D\x83O\x82͎\xC0\x8E\xBF\x8Eg\x82\xA6\x82Ȃ\xA2\x82̂ŁA\x82\xB1\x82̃^\x83C\x83~\x83\x93\x83O\x82Ŗ\xE2\x91\xE8\x82Ȃ\xA2\x81B
 			AUTH_advance_to_next_cred(pvar);
 		}
-		else { // SSH2
-			// SSH2_MSG_NEWKEYS \x82\xAA\x96\xA2\x91\x97\x90M\x82Ȃ\xE7\x82Α\x97\x82\xE9
-			if ((pvar->kex_status & KEX_FLAG_NEWKEYS_SENT) == 0) {
-				ssh2_send_newkeys(pvar);
-			}
+	}
+
+	if (SSHv2(pvar)) {
+		// SSH2_MSG_NEWKEYS \x82\xAA\x96\xA2\x91\x97\x90M\x82Ȃ\xE7\x82Α\x97\x82\xE9
+		if ((pvar->kex_status & KEX_FLAG_NEWKEYS_SENT) == 0) {
+			ssh2_send_newkeys(pvar);
 		}
-
 	}
 }
 


Tera Term

[ttssh2-commit] [10944] SSH2 の Rekey 時に SSH_MSG_NEWKEYS が送信されない問題を修正