Develop and Download Open Source Software

Browse Subversion Repository

Diff of /branches/ssh_chacha20poly1305/ttssh2/ttxssh/ssh.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 7022 by doda, Thu Jan 11 13:26:48 2018 UTC revision 7023 by doda, Fri Jan 12 03:49:46 2018 UTC
# Line 4973  static BOOL handle_SSH2_kexinit(PTInstVa Line 4973  static BOOL handle_SSH2_kexinit(PTInstVa
4973          logprintf(LOG_LEVEL_VERBOSE, "server proposal: encryption algorithm client to server: %s", buf);          logprintf(LOG_LEVEL_VERBOSE, "server proposal: encryption algorithm client to server: %s", buf);
4974    
4975          pvar->ciphers[MODE_OUT] = choose_SSH2_cipher_algorithm(buf, myproposal[PROPOSAL_ENC_ALGS_CTOS]);          pvar->ciphers[MODE_OUT] = choose_SSH2_cipher_algorithm(buf, myproposal[PROPOSAL_ENC_ALGS_CTOS]);
4976          if (pvar->ciphers[MODE_OUT] == SSH_CIPHER_NONE) {          if (pvar->ciphers[MODE_OUT] == NULL) {
4977                  strncpy_s(tmp, sizeof(tmp), "unknown Encrypt algorithm(client to server): ", _TRUNCATE);                  strncpy_s(tmp, sizeof(tmp), "unknown Encrypt algorithm(client to server): ", _TRUNCATE);
4978                  strncat_s(tmp, sizeof(tmp), buf, _TRUNCATE);                  strncat_s(tmp, sizeof(tmp), buf, _TRUNCATE);
4979                  msg = tmp;                  msg = tmp;
# Line 4997  static BOOL handle_SSH2_kexinit(PTInstVa Line 4997  static BOOL handle_SSH2_kexinit(PTInstVa
4997          logprintf(LOG_LEVEL_VERBOSE, "server proposal: encryption algorithm server to client: %s", buf);          logprintf(LOG_LEVEL_VERBOSE, "server proposal: encryption algorithm server to client: %s", buf);
4998    
4999          pvar->ciphers[MODE_IN] = choose_SSH2_cipher_algorithm(buf, myproposal[PROPOSAL_ENC_ALGS_STOC]);          pvar->ciphers[MODE_IN] = choose_SSH2_cipher_algorithm(buf, myproposal[PROPOSAL_ENC_ALGS_STOC]);
5000          if (pvar->ciphers[MODE_IN] == SSH_CIPHER_NONE) {          if (pvar->ciphers[MODE_IN] == NULL) {
5001                  strncpy_s(tmp, sizeof(tmp), "unknown Encrypt algorithm(server to client): ", _TRUNCATE);                  strncpy_s(tmp, sizeof(tmp), "unknown Encrypt algorithm(server to client): ", _TRUNCATE);
5002                  strncat_s(tmp, sizeof(tmp), buf, _TRUNCATE);                  strncat_s(tmp, sizeof(tmp), buf, _TRUNCATE);
5003                  msg = tmp;                  msg = tmp;

Legend:
Removed from v.7022  
changed lines
  Added in v.7023

Back to OSDN">Back to OSDN
ViewVC Help
Powered by ViewVC 1.1.26