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 3036 by maya, Tue Oct 16 15:28:14 2007 UTC revision 3039 by maya, Wed Oct 17 04:03:41 2007 UTC
# Line 3379  void SSH2_update_cipher_myproposal(PTIns Line 3379  void SSH2_update_cipher_myproposal(PTIns
3379                  else if (cipher == SSH_CIPHER_3DES_CBC) {                  else if (cipher == SSH_CIPHER_3DES_CBC) {
3380                          strncat_s(buf, sizeof(buf), "3des-cbc,", _TRUNCATE);                          strncat_s(buf, sizeof(buf), "3des-cbc,", _TRUNCATE);
3381                  }                  }
3382                    else if (cipher == SSH_CIPHER_AES192) {
3383                            strncat_s(buf, sizeof(buf), "aes192-cbc,", _TRUNCATE);
3384                    }
3385                  else if (cipher == SSH_CIPHER_AES256) {                  else if (cipher == SSH_CIPHER_AES256) {
3386                          strncat_s(buf, sizeof(buf), "aes256-cbc,", _TRUNCATE);                          strncat_s(buf, sizeof(buf), "aes256-cbc,", _TRUNCATE);
3387                  }                  }
# Line 3484  static SSHCipher choose_SSH2_cipher_algo Line 3487  static SSHCipher choose_SSH2_cipher_algo
3487                  cipher = SSH_CIPHER_3DES_CBC;                  cipher = SSH_CIPHER_3DES_CBC;
3488          } else if (strstr(ptr, "aes128-cbc")) {          } else if (strstr(ptr, "aes128-cbc")) {
3489                  cipher = SSH_CIPHER_AES128;                  cipher = SSH_CIPHER_AES128;
3490            } else if (strstr(ptr, "aes192-cbc")) {
3491                    cipher = SSH_CIPHER_AES192;
3492          } else if (strstr(ptr, "aes256-cbc")) {          } else if (strstr(ptr, "aes256-cbc")) {
3493                  cipher = SSH_CIPHER_AES256;                  cipher = SSH_CIPHER_AES256;
3494  #ifdef SSH2_BLOWFISH  #ifdef SSH2_BLOWFISH
# Line 5670  static void do_SSH2_dispatch_setup_for_t Line 5675  static void do_SSH2_dispatch_setup_for_t
5675  static BOOL handle_SSH2_newkeys(PTInstVar pvar)  static BOOL handle_SSH2_newkeys(PTInstVar pvar)
5676  {  {
5677          int supported_ciphers = (1 << SSH_CIPHER_3DES_CBC | 1 << SSH_CIPHER_AES128          int supported_ciphers = (1 << SSH_CIPHER_3DES_CBC | 1 << SSH_CIPHER_AES128
5678                                 | 1 << SSH_CIPHER_AES256                                 | 1 << SSH_CIPHER_AES192   | 1 << SSH_CIPHER_AES256
5679  #ifdef SSH2_BLOWFISH  #ifdef SSH2_BLOWFISH
5680                                 | 1 << SSH_CIPHER_BLOWFISH                                 | 1 << SSH_CIPHER_BLOWFISH
5681  #endif  #endif

Legend:
Removed from v.3036  
changed lines
  Added in v.3039

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