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

OSDN > Find 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

|  Revision Log



|  Patch














revision 3161 by maya,
Wed Nov 19 06:40:12 2008 UTC




revision 3168 by doda,
Fri Nov 21 18:54:22 2008 UTC






#

Line 81 
 typedef enum {


Line 81 
 typedef enum {












81
         SSH_CIPHER_TSS, SSH_CIPHER_RC4, SSH_CIPHER_BLOWFISH,
         SSH_CIPHER_TSS, SSH_CIPHER_RC4, SSH_CIPHER_BLOWFISH,

















82
         // for SSH2
         // for SSH2

















83
         SSH2_CIPHER_3DES_CBC, SSH2_CIPHER_AES128_CBC,
         SSH2_CIPHER_3DES_CBC, SSH2_CIPHER_AES128_CBC,















84


         SSH2_CIPHER_AES192_CBC,SSH2_CIPHER_AES256_CBC,


         SSH2_CIPHER_AES192_CBC, SSH2_CIPHER_AES256_CBC,















85
         SSH2_CIPHER_BLOWFISH_CBC, SSH2_CIPHER_AES128_CTR,
         SSH2_CIPHER_BLOWFISH_CBC, SSH2_CIPHER_AES128_CTR,

















86
         SSH2_CIPHER_AES192_CTR, SSH2_CIPHER_AES256_CTR,
         SSH2_CIPHER_AES192_CTR, SSH2_CIPHER_AES256_CTR,












87
 
         SSH2_CIPHER_ARCFOUR,












88
 } SSHCipher;
 } SSHCipher;

















89
 
 















90


 #define SSH_CIPHER_MAX SSH2_CIPHER_AES256_CTR


 #define SSH_CIPHER_MAX SSH2_CIPHER_ARCFOUR















91
 
 

















92
 typedef enum {
 typedef enum {

















93
         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 221 
 enum hmac_type {


Line 222 
 enum hmac_type {












222
                             "diffie-hellman-group14-sha1," \
                             "diffie-hellman-group14-sha1," \

















223
                             "diffie-hellman-group1-sha1"
                             "diffie-hellman-group1-sha1"

















224
 #define KEX_DEFAULT_PK_ALG  "ssh-rsa,ssh-dss"
 #define KEX_DEFAULT_PK_ALG  "ssh-rsa,ssh-dss"















225


 #define KEX_DEFAULT_ENCRYPT "aes256-ctr,aes256-cbc,aes192-ctr,aes192-cbc,aes128-ctr,aes128-cbc,3des-cbc,blowfish-cbc"


 #define KEX_DEFAULT_ENCRYPT "aes256-ctr,aes256-cbc,aes192-ctr,aes192-cbc,aes128-ctr,aes128-cbc,3des-cbc,blowfish-cbc,arcfour"















226
 #define KEX_DEFAULT_MAC     "hmac-sha1,hmac-md5"
 #define KEX_DEFAULT_MAC     "hmac-sha1,hmac-md5"

















227
 // support of "Compression delayed" (2006.6.23 maya)
 // support of "Compression delayed" (2006.6.23 maya)

















228
 #define KEX_DEFAULT_COMP        "none,zlib@openssh.com,zlib"
 #define KEX_DEFAULT_COMP        "none,zlib@openssh.com,zlib"











#

Line 298 
 static ssh2_cipher_t ssh2_ciphers[] = {


Line 299 
 static ssh2_cipher_t ssh2_ciphers[] = {












299
         {SSH2_CIPHER_AES128_CTR,   "aes128-ctr",   16, 16, evp_aes_128_ctr},
         {SSH2_CIPHER_AES128_CTR,   "aes128-ctr",   16, 16, evp_aes_128_ctr},

















300
         {SSH2_CIPHER_AES192_CTR,   "aes192-ctr",   16, 24, evp_aes_128_ctr},
         {SSH2_CIPHER_AES192_CTR,   "aes192-ctr",   16, 24, evp_aes_128_ctr},

















301
         {SSH2_CIPHER_AES256_CTR,   "aes256-ctr",   16, 32, evp_aes_128_ctr},
         {SSH2_CIPHER_AES256_CTR,   "aes256-ctr",   16, 32, evp_aes_128_ctr},












302
 
         {SSH2_CIPHER_ARCFOUR,      "arcfour",       8, 16, EVP_rc4},












303
         {SSH_CIPHER_NONE, NULL, 0, 0, NULL},
         {SSH_CIPHER_NONE, NULL, 0, 0, NULL},

















304
 };
 };

















305
 
 





























Legend:



Removed from v.3161
 


changed lines


 
Added in v.3168













Back to OSDN">Back to OSDN
ViewVC Help


Powered by ViewVC 1.1.26
 /[ttssh2]/branches/ssh_chacha20poly1305/ttssh2/ttxssh/ssh.h
-revision 3161 by maya,
Wed Nov 19 06:40:12 2008 UTC
+revision 3168 by doda,
Fri Nov 21 18:54:22 2008 UTC
 Line 81 
 typedef enum {
          SSH_CIPHER_TSS, SSH_CIPHER_RC4, SSH_CIPHER_BLOWFISH,
          // for SSH2
          SSH2_CIPHER_3DES_CBC, SSH2_CIPHER_AES128_CBC,
-         SSH2_CIPHER_AES192_CBC,SSH2_CIPHER_AES256_CBC,
+         SSH2_CIPHER_AES192_CBC, SSH2_CIPHER_AES256_CBC,
          SSH2_CIPHER_BLOWFISH_CBC, SSH2_CIPHER_AES128_CTR,
          SSH2_CIPHER_AES192_CTR, SSH2_CIPHER_AES256_CTR,
+         SSH2_CIPHER_ARCFOUR,
  } SSHCipher;
- #define SSH_CIPHER_MAX SSH2_CIPHER_AES256_CTR
+ #define SSH_CIPHER_MAX SSH2_CIPHER_ARCFOUR
  typedef enum {
          SSH_AUTH_NONE, SSH_AUTH_RHOSTS, SSH_AUTH_RSA, SSH_AUTH_PASSWORD,
-Line 221 
 enum hmac_type {
+Line 222 
 enum hmac_type {
                              "diffie-hellman-group14-sha1," \
                              "diffie-hellman-group1-sha1"
  #define KEX_DEFAULT_PK_ALG  "ssh-rsa,ssh-dss"
- #define KEX_DEFAULT_ENCRYPT "aes256-ctr,aes256-cbc,aes192-ctr,aes192-cbc,aes128-ctr,aes128-cbc,3des-cbc,blowfish-cbc"
+ #define KEX_DEFAULT_ENCRYPT "aes256-ctr,aes256-cbc,aes192-ctr,aes192-cbc,aes128-ctr,aes128-cbc,3des-cbc,blowfish-cbc,arcfour"
  #define KEX_DEFAULT_MAC     "hmac-sha1,hmac-md5"
  // support of "Compression delayed" (2006.6.23 maya)
  #define KEX_DEFAULT_COMP        "none,zlib@openssh.com,zlib"
-Line 298 
 static ssh2_cipher_t ssh2_ciphers[] = {
+Line 299 
 static ssh2_cipher_t ssh2_ciphers[] = {
          {SSH2_CIPHER_AES128_CTR,   "aes128-ctr",   16, 16, evp_aes_128_ctr},
          {SSH2_CIPHER_AES192_CTR,   "aes192-ctr",   16, 24, evp_aes_128_ctr},
          {SSH2_CIPHER_AES256_CTR,   "aes256-ctr",   16, 32, evp_aes_128_ctr},
+         {SSH2_CIPHER_ARCFOUR,      "arcfour",       8, 16, EVP_rc4},
          {SSH_CIPHER_NONE, NULL, 0, 0, NULL},
  };
 Legend:



Removed from v.3161
 


changed lines


 
Added in v.3168
 Legend:



Removed from v.3161
 


changed lines


 
Added in v.3168
-Removed from v.3161
+Added in v.3168
-Back to OSDN">Back to OSDN
+ViewVC Help
 Powered by ViewVC 1.1.26

Develop and Download Open Source Software

Tera Term

Browse Subversion Repository