Commit: 6ddf06c4a61f2b582adc912a164ddb46adfb17d6 - Tera_Term_Testing (git)

Tera Termの個人的な作業用リポジトリ

Commit MetaInfo

• Revision: 6ddf06c4a61f2b582adc912a164ddb46adfb17d6 (tree)
• Time: 2018-01-12 12:49:46
• Author: IWAMOTO Kouichi <sue@iwmt...>
• Commiter: IWAMOTO Kouichi

Log Message

r7022 での再適用をミスっていたので修正 orz

git-svn-id: svn+ssh://svn.osdn.net/svnroot/ttssh2/trunk@7023 f5f01b69-1e22-0410-acbf-894ab4bd6246

Change Summary

• modified: ttssh2/ttxssh/ssh.c

Incremental Difference

--- a/ttssh2/ttxssh/ssh.c
+++ b/ttssh2/ttxssh/ssh.c
@@ -4973,7 +4973,7 @@ static BOOL handle_SSH2_kexinit(PTInstVar pvar)
 	logprintf(LOG_LEVEL_VERBOSE, "server proposal: encryption algorithm client to server: %s", buf);
 
 	pvar->ciphers[MODE_OUT] = choose_SSH2_cipher_algorithm(buf, myproposal[PROPOSAL_ENC_ALGS_CTOS]);
-	if (pvar->ciphers[MODE_OUT] == SSH_CIPHER_NONE) {
+	if (pvar->ciphers[MODE_OUT] == NULL) {
 		strncpy_s(tmp, sizeof(tmp), "unknown Encrypt algorithm(client to server): ", _TRUNCATE);
 		strncat_s(tmp, sizeof(tmp), buf, _TRUNCATE);
 		msg = tmp;
@@ -4997,7 +4997,7 @@ static BOOL handle_SSH2_kexinit(PTInstVar pvar)
 	logprintf(LOG_LEVEL_VERBOSE, "server proposal: encryption algorithm server to client: %s", buf);
 
 	pvar->ciphers[MODE_IN] = choose_SSH2_cipher_algorithm(buf, myproposal[PROPOSAL_ENC_ALGS_STOC]);
-	if (pvar->ciphers[MODE_IN] == SSH_CIPHER_NONE) {
+	if (pvar->ciphers[MODE_IN] == NULL) {
 		strncpy_s(tmp, sizeof(tmp), "unknown Encrypt algorithm(server to client): ", _TRUNCATE);
 		strncat_s(tmp, sizeof(tmp), buf, _TRUNCATE);
 		msg = tmp;