scmno****@osdn*****
scmno****@osdn*****
2018年 1月 11日 (木) 22:26:48 JST
Tera TermRevision: 7022
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7022
Author: doda
Date: 2018-01-11 22:26:48 +0900 (Thu, 11 Jan 2018)
Log Message:
-----------
r7020 の作業ミスで r7017 での修正が消えてしまったので、再度適用。
| 暗号方式のネゴシエーションが失敗した時に落ちるのを修正。r7005 でのエンバグ。
Revision Links:
--------------
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7020
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7017
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7005
Modified Paths:
--------------
trunk/ttssh2/ttxssh/ssh.c
-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/ssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ssh.c 2018-01-11 13:20:07 UTC (rev 7021)
+++ trunk/ttssh2/ttxssh/ssh.c 2018-01-11 13:26:48 UTC (rev 7022)
@@ -4973,7 +4973,7 @@
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]->id == SSH_CIPHER_NONE) {
+ if (pvar->ciphers[MODE_OUT] == SSH_CIPHER_NONE) {
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 @@
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]->id == SSH_CIPHER_NONE) {
+ if (pvar->ciphers[MODE_IN] == SSH_CIPHER_NONE) {
strncpy_s(tmp, sizeof(tmp), "unknown Encrypt algorithm(server to client): ", _TRUNCATE);
strncat_s(tmp, sizeof(tmp), buf, _TRUNCATE);
msg = tmp;