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 3167 by maya, Thu Nov 20 07:49:52 2008 UTC revision 3168 by doda, Fri Nov 21 18:54:22 2008 UTC
# Line 3920  void SSH2_update_cipher_myproposal(PTIns Line 3920  void SSH2_update_cipher_myproposal(PTIns
3920                  else if (cipher == SSH2_CIPHER_AES256_CTR) {                  else if (cipher == SSH2_CIPHER_AES256_CTR) {
3921                          strncat_s(buf, sizeof(buf), "aes256-ctr,", _TRUNCATE);                          strncat_s(buf, sizeof(buf), "aes256-ctr,", _TRUNCATE);
3922                  }                  }
3923                    else if (cipher == SSH2_CIPHER_ARCFOUR) {
3924                            strncat_s(buf, sizeof(buf), "arcfour,", _TRUNCATE);
3925                    }
3926          }          }
3927          if (buf[0] != '\0') {          if (buf[0] != '\0') {
3928                  len = strlen(buf);                  len = strlen(buf);
# Line 4036  static SSHCipher choose_SSH2_cipher_algo Line 4039  static SSHCipher choose_SSH2_cipher_algo
4039                  cipher = SSH2_CIPHER_AES192_CTR;                  cipher = SSH2_CIPHER_AES192_CTR;
4040          } else if (strstr(ptr, "aes256-ctr")) {          } else if (strstr(ptr, "aes256-ctr")) {
4041                  cipher = SSH2_CIPHER_AES256_CTR;                  cipher = SSH2_CIPHER_AES256_CTR;
4042            } else if (strstr(ptr, "arcfour")) {
4043                    cipher = SSH2_CIPHER_ARCFOUR;
4044          }          }
4045    
4046          return (cipher);          return (cipher);
# Line 6373  static BOOL handle_SSH2_newkeys(PTInstVa Line 6378  static BOOL handle_SSH2_newkeys(PTInstVa
6378                                 | 1 << SSH2_CIPHER_AES128_CTR                                 | 1 << SSH2_CIPHER_AES128_CTR
6379                                 | 1 << SSH2_CIPHER_AES192_CTR                                 | 1 << SSH2_CIPHER_AES192_CTR
6380                                 | 1 << SSH2_CIPHER_AES256_CTR                                 | 1 << SSH2_CIPHER_AES256_CTR
6381                                   | 1 << SSH2_CIPHER_ARCFOUR
6382          );          );
6383          int type = (1 << SSH_AUTH_PASSWORD) | (1 << SSH_AUTH_RSA) |          int type = (1 << SSH_AUTH_PASSWORD) | (1 << SSH_AUTH_RSA) |
6384                     (1 << SSH_AUTH_TIS) | (1 << SSH_AUTH_PAGEANT);                     (1 << SSH_AUTH_TIS) | (1 << SSH_AUTH_PAGEANT);

Legend:
Removed from v.3167  
changed lines
  Added in v.3168

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