[Ttssh2-commit] [7023] r7022 での再適用をミスっていたので修正 orz

scmno****@osdn***** scmno****@osdn*****
2018年 1月 12日 (金) 12:49:46 JST


Revision: 7023
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7023
Author:   doda
Date:     2018-01-12 12:49:46 +0900 (Fri, 12 Jan 2018)
Log Message:
-----------
r7022 での再適用をミスっていたので修正 orz

Revision Links:
--------------
    http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7022

Modified Paths:
--------------
    trunk/ttssh2/ttxssh/ssh.c

-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/ssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ssh.c	2018-01-11 13:26:48 UTC (rev 7022)
+++ trunk/ttssh2/ttxssh/ssh.c	2018-01-12 03:49:46 UTC (rev 7023)
@@ -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] == 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 @@
 	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;



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