[Ttssh2-commit] [7017] 暗号方式のネゴシエーションが失敗した時に落ちるのを修正。r7005 でのエンバグ。

scmno****@osdn***** scmno****@osdn*****
2018年 1月 11日 (木) 22:19:52 JST


Revision: 7017
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7017
Author:   doda
Date:     2018-01-11 22:19:52 +0900 (Thu, 11 Jan 2018)
Log Message:
-----------
暗号方式のネゴシエーションが失敗した時に落ちるのを修正。r7005 でのエンバグ。

Revision Links:
--------------
    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-09 14:21:29 UTC (rev 7016)
+++ trunk/ttssh2/ttxssh/ssh.c	2018-01-11 13:19:52 UTC (rev 7017)
@@ -4940,7 +4940,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] == NULL) {
 		strncpy_s(tmp, sizeof(tmp), "unknown Encrypt algorithm(ctos): ", _TRUNCATE);
 		strncat_s(tmp, sizeof(tmp), buf, _TRUNCATE);
 		msg = tmp;
@@ -4960,7 +4960,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] == NULL) {
 		strncpy_s(tmp, sizeof(tmp), "unknown Encrypt algorithm(stoc): ", _TRUNCATE);
 		strncat_s(tmp, sizeof(tmp), buf, _TRUNCATE);
 		msg = tmp;



Ttssh2-commit メーリングリストの案内