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 3169 by doda, Sat Nov 22 06:46:43 2008 UTC revision 3170 by maya, Sat Nov 22 10:05:33 2008 UTC
# Line 3944  void SSH2_update_cipher_myproposal(PTIns Line 3944  void SSH2_update_cipher_myproposal(PTIns
3944                  else if (cipher == SSH2_CIPHER_ARCFOUR256) {                  else if (cipher == SSH2_CIPHER_ARCFOUR256) {
3945                          strncat_s(buf, sizeof(buf), "arcfour256,", _TRUNCATE);                          strncat_s(buf, sizeof(buf), "arcfour256,", _TRUNCATE);
3946                  }                  }
3947                    else if (cipher == SSH2_CIPHER_CAST128_CBC) {
3948                            strncat_s(buf, sizeof(buf), "cast128-cbc,", _TRUNCATE);
3949                    }
3950          }          }
3951          if (buf[0] != '\0') {          if (buf[0] != '\0') {
3952                  len = strlen(buf);                  len = strlen(buf);
# Line 4066  static SSHCipher choose_SSH2_cipher_algo Line 4069  static SSHCipher choose_SSH2_cipher_algo
4069                  cipher = SSH2_CIPHER_ARCFOUR256;                  cipher = SSH2_CIPHER_ARCFOUR256;
4070          } else if (strstr(ptr, "arcfour")) {          } else if (strstr(ptr, "arcfour")) {
4071                  cipher = SSH2_CIPHER_ARCFOUR;                  cipher = SSH2_CIPHER_ARCFOUR;
4072            } else if (strstr(ptr, "cast128-cbc")) {
4073                    cipher = SSH2_CIPHER_CAST128_CBC;
4074          }          }
4075    
4076          return (cipher);          return (cipher);
# Line 6406  static BOOL handle_SSH2_newkeys(PTInstVa Line 6411  static BOOL handle_SSH2_newkeys(PTInstVa
6411                                 | 1 << SSH2_CIPHER_ARCFOUR                                 | 1 << SSH2_CIPHER_ARCFOUR
6412                                 | 1 << SSH2_CIPHER_ARCFOUR128                                 | 1 << SSH2_CIPHER_ARCFOUR128
6413                                 | 1 << SSH2_CIPHER_ARCFOUR256                                 | 1 << SSH2_CIPHER_ARCFOUR256
6414                                   | 1 << SSH2_CIPHER_CAST128_CBC
6415          );          );
6416          int type = (1 << SSH_AUTH_PASSWORD) | (1 << SSH_AUTH_RSA) |          int type = (1 << SSH_AUTH_PASSWORD) | (1 << SSH_AUTH_RSA) |
6417                     (1 << SSH_AUTH_TIS) | (1 << SSH_AUTH_PAGEANT);                     (1 << SSH_AUTH_TIS) | (1 << SSH_AUTH_PAGEANT);

Legend:
Removed from v.3169  
changed lines
  Added in v.3170

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