Develop and Download Open Source Software

Tera Term

Browse Subversion Repository

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

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

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

revision 3044 by maya, Wed Oct 17 16:40:07 2007 UTC revision 3045 by maya, Thu Oct 18 03:49:39 2007 UTC
# Line 78  typedef enum { Line 78  typedef enum {
78          SSH_CIPHER_NONE, SSH_CIPHER_IDEA, SSH_CIPHER_DES, SSH_CIPHER_3DES,          SSH_CIPHER_NONE, SSH_CIPHER_IDEA, SSH_CIPHER_DES, SSH_CIPHER_3DES,
79          SSH_CIPHER_TSS, SSH_CIPHER_RC4, SSH_CIPHER_BLOWFISH,          SSH_CIPHER_TSS, SSH_CIPHER_RC4, SSH_CIPHER_BLOWFISH,
80          // for SSH2          // for SSH2
81          SSH_CIPHER_3DES_CBC, SSH_CIPHER_AES128,          SSH2_CIPHER_3DES_CBC, SSH2_CIPHER_AES128,
82          SSH_CIPHER_AES192,SSH_CIPHER_AES256,          SSH2_CIPHER_AES192,SSH2_CIPHER_AES256,
83            SSH2_CIPHER_BLOWFISH,
84  } SSHCipher;  } SSHCipher;
85    
86  #define SSH_CIPHER_MAX SSH_CIPHER_AES256  #define SSH_CIPHER_MAX SSH2_CIPHER_BLOWFISH
87    
88  typedef enum {  typedef enum {
89          SSH_AUTH_NONE, SSH_AUTH_RHOSTS, SSH_AUTH_RSA, SSH_AUTH_PASSWORD,          SSH_AUTH_NONE, SSH_AUTH_RHOSTS, SSH_AUTH_RSA, SSH_AUTH_PASSWORD,
# Line 204  enum hmac_type { Line 205  enum hmac_type {
205                              "diffie-hellman-group14-sha1," \                              "diffie-hellman-group14-sha1," \
206                              "diffie-hellman-group1-sha1"                              "diffie-hellman-group1-sha1"
207  #define KEX_DEFAULT_PK_ALG  "ssh-rsa,ssh-dss"  #define KEX_DEFAULT_PK_ALG  "ssh-rsa,ssh-dss"
 #ifdef SSH2_BLOWFISH  
208  #define KEX_DEFAULT_ENCRYPT "aes128-cbc,3des-cbc,blowfish-cbc,aes192-cbc,aes256-cbc"  #define KEX_DEFAULT_ENCRYPT "aes128-cbc,3des-cbc,blowfish-cbc,aes192-cbc,aes256-cbc"
 #else  
 #define KEX_DEFAULT_ENCRYPT "aes128-cbc,3des-cbc,aes192-cbc,aes256-cbc"  
 #endif  
209  #define KEX_DEFAULT_MAC     "hmac-sha1,hmac-md5"  #define KEX_DEFAULT_MAC     "hmac-sha1,hmac-md5"
210  // support of "Compression delayed" (2006.6.23 maya)  // support of "Compression delayed" (2006.6.23 maya)
211  #define KEX_DEFAULT_COMP        "none,zlib@openssh.com,zlib"  #define KEX_DEFAULT_COMP        "none,zlib@openssh.com,zlib"
# Line 277  typedef struct ssh2_cipher { Line 274  typedef struct ssh2_cipher {
274  } ssh2_cipher_t;  } ssh2_cipher_t;
275    
276  static ssh2_cipher_t ssh2_ciphers[] = {  static ssh2_cipher_t ssh2_ciphers[] = {
277          {SSH_CIPHER_3DES_CBC, "3des-cbc",      8, 24, EVP_des_ede3_cbc},          {SSH2_CIPHER_3DES_CBC, "3des-cbc",      8, 24, EVP_des_ede3_cbc},
278          {SSH_CIPHER_AES128,   "aes128-cbc",   16, 16, EVP_aes_128_cbc},          {SSH2_CIPHER_AES128,   "aes128-cbc",   16, 16, EVP_aes_128_cbc},
279          {SSH_CIPHER_AES192,   "aes192-cbc",   16, 24, EVP_aes_192_cbc},          {SSH2_CIPHER_AES192,   "aes192-cbc",   16, 24, EVP_aes_192_cbc},
280          {SSH_CIPHER_AES256,   "aes256-cbc",   16, 32, EVP_aes_256_cbc},          {SSH2_CIPHER_AES256,   "aes256-cbc",   16, 32, EVP_aes_256_cbc},
281  #ifdef SSH2_BLOWFISH          {SSH2_CIPHER_BLOWFISH, "blowfish-cbc",  8, 32, EVP_bf_cbc},
         {SSH_CIPHER_BLOWFISH, "blowfish-cbc",  8, 32, EVP_enc_null}, // func は使用されない  
 #endif  
282          {SSH_CIPHER_NONE, NULL, 0, 0, NULL},          {SSH_CIPHER_NONE, NULL, 0, 0, NULL},
283  };  };
284    
Legend:
Removed from v.3044  
changed lines
  Added in v.3045
Back to OSDN">Back to OSDN
 ViewVC Help
Powered by ViewVC 1.1.26  
About OSDN
Find Software
Develop Software
Help