Develop and Download Open Source Software

Tera Term

Browse Subversion Repository

/[ttssh2]/branches/ssh_chacha20poly1305/ttssh2/ttxssh/ssh.c

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

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

revision 3157 by maya, Mon Nov 17 08:45:12 2008 UTC revision 3159 by maya, Tue Nov 18 06:24:09 2008 UTC
# Line 3877  void SSH2_update_cipher_myproposal(PTIns Line 3877  void SSH2_update_cipher_myproposal(PTIns
3877                  else if (cipher == SSH2_CIPHER_BLOWFISH_CBC) {                  else if (cipher == SSH2_CIPHER_BLOWFISH_CBC) {
3878                          strncat_s(buf, sizeof(buf), "blowfish-cbc,", _TRUNCATE);                          strncat_s(buf, sizeof(buf), "blowfish-cbc,", _TRUNCATE);
3879                  }                  }
3880                    else if (cipher == SSH2_CIPHER_AES128_CTR) {
3881                            strncat_s(buf, sizeof(buf), "aes128-ctr,", _TRUNCATE);
3882                    }
3883                    else if (cipher == SSH2_CIPHER_AES192_CTR) {
3884                            strncat_s(buf, sizeof(buf), "aes192-ctr,", _TRUNCATE);
3885                    }
3886                    else if (cipher == SSH2_CIPHER_AES256_CTR) {
3887                            strncat_s(buf, sizeof(buf), "aes256-ctr,", _TRUNCATE);
3888                    }
3889          }          }
3890          if (buf[0] != '\0') {          if (buf[0] != '\0') {
3891                  len = strlen(buf);                  len = strlen(buf);
# Line 3987  static SSHCipher choose_SSH2_cipher_algo Line 3996  static SSHCipher choose_SSH2_cipher_algo
3996                  cipher = SSH2_CIPHER_AES256_CBC;                  cipher = SSH2_CIPHER_AES256_CBC;
3997          } else if (strstr(ptr, "blowfish-cbc")) {          } else if (strstr(ptr, "blowfish-cbc")) {
3998                  cipher = SSH2_CIPHER_BLOWFISH_CBC;                  cipher = SSH2_CIPHER_BLOWFISH_CBC;
3999            } else if (strstr(ptr, "aes128-ctr")) {
4000                    cipher = SSH2_CIPHER_AES128_CTR;
4001            } else if (strstr(ptr, "aes192-ctr")) {
4002                    cipher = SSH2_CIPHER_AES192_CTR;
4003            } else if (strstr(ptr, "aes256-ctr")) {
4004                    cipher = SSH2_CIPHER_AES256_CTR;
4005          }          }
4006    
4007          return (cipher);          return (cipher);
# Line 6316  static void do_SSH2_dispatch_setup_for_t Line 6331  static void do_SSH2_dispatch_setup_for_t
6331    
6332  static BOOL handle_SSH2_newkeys(PTInstVar pvar)  static BOOL handle_SSH2_newkeys(PTInstVar pvar)
6333  {  {
6334          int supported_ciphers = (1 << SSH2_CIPHER_3DES_CBC     | 1 << SSH2_CIPHER_AES128_CBC          int supported_ciphers = (1 << SSH2_CIPHER_3DES_CBC
6335                                 | 1 << SSH2_CIPHER_AES192_CBC   | 1 << SSH2_CIPHER_AES256_CBC                                 | 1 << SSH2_CIPHER_AES128_CBC
6336                                   | 1 << SSH2_CIPHER_AES192_CBC
6337                                   | 1 << SSH2_CIPHER_AES256_CBC
6338                                 | 1 << SSH2_CIPHER_BLOWFISH_CBC                                 | 1 << SSH2_CIPHER_BLOWFISH_CBC
6339                  );                                 | 1 << SSH2_CIPHER_AES128_CTR
6340                                   | 1 << SSH2_CIPHER_AES192_CTR
6341                                   | 1 << SSH2_CIPHER_AES256_CTR
6342            );
6343          int type = (1 << SSH_AUTH_PASSWORD) | (1 << SSH_AUTH_RSA) |          int type = (1 << SSH_AUTH_PASSWORD) | (1 << SSH_AUTH_RSA) |
6344                     (1 << SSH_AUTH_TIS) | (1 << SSH_AUTH_PAGEANT);                     (1 << SSH_AUTH_TIS) | (1 << SSH_AUTH_PAGEANT);
6345    
Legend:
Removed from v.3157  
changed lines
  Added in v.3159
Back to OSDN">Back to OSDN
 ViewVC Help
Powered by ViewVC 1.1.26  
About OSDN
Find Software
Develop Software
Help