• R/O
  • SSH
  • HTTPS

ttssh2: Commit


Commit MetaInfo

Revision7022 (tree)
Time2018-01-11 22:26:48
Authordoda

Log Message

r7020 の作業ミスで r7017 での修正が消えてしまったので、再度適用。

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

Change Summary

Incremental Difference

--- trunk/ttssh2/ttxssh/ssh.c (revision 7021)
+++ trunk/ttssh2/ttxssh/ssh.c (revision 7022)
@@ -4973,7 +4973,7 @@
49734973 logprintf(LOG_LEVEL_VERBOSE, "server proposal: encryption algorithm client to server: %s", buf);
49744974
49754975 pvar->ciphers[MODE_OUT] = choose_SSH2_cipher_algorithm(buf, myproposal[PROPOSAL_ENC_ALGS_CTOS]);
4976- if (pvar->ciphers[MODE_OUT]->id == SSH_CIPHER_NONE) {
4976+ if (pvar->ciphers[MODE_OUT] == SSH_CIPHER_NONE) {
49774977 strncpy_s(tmp, sizeof(tmp), "unknown Encrypt algorithm(client to server): ", _TRUNCATE);
49784978 strncat_s(tmp, sizeof(tmp), buf, _TRUNCATE);
49794979 msg = tmp;
@@ -4997,7 +4997,7 @@
49974997 logprintf(LOG_LEVEL_VERBOSE, "server proposal: encryption algorithm server to client: %s", buf);
49984998
49994999 pvar->ciphers[MODE_IN] = choose_SSH2_cipher_algorithm(buf, myproposal[PROPOSAL_ENC_ALGS_STOC]);
5000- if (pvar->ciphers[MODE_IN]->id == SSH_CIPHER_NONE) {
5000+ if (pvar->ciphers[MODE_IN] == SSH_CIPHER_NONE) {
50015001 strncpy_s(tmp, sizeof(tmp), "unknown Encrypt algorithm(server to client): ", _TRUNCATE);
50025002 strncat_s(tmp, sizeof(tmp), buf, _TRUNCATE);
50035003 msg = tmp;
Show on old repository browser