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 4321 by maya, Sat Feb 19 07:41:41 2011 UTC revision 4367 by yutakapon, Sat Mar 5 14:52:45 2011 UTC
# Line 198  enum channel_type { Line 198  enum channel_type {
198  #define SSH2_OPEN_RESOURCE_SHORTAGE              4  #define SSH2_OPEN_RESOURCE_SHORTAGE              4
199    
200  enum ssh_keytype {  enum ssh_keytype {
201            KEY_NONE,
202          KEY_RSA1,          KEY_RSA1,
203          KEY_RSA,          KEY_RSA,
204          KEY_DSA,          KEY_DSA,
# Line 205  enum ssh_keytype { Line 206  enum ssh_keytype {
206          KEY_ECDSA384,          KEY_ECDSA384,
207          KEY_ECDSA521,          KEY_ECDSA521,
208          KEY_UNSPEC,          KEY_UNSPEC,
209            KEY_MAX = KEY_UNSPEC,
210    };
211    
212    typedef struct ssh2_host_key {
213            enum ssh_keytype type;
214            char *name;
215    } ssh2_host_key_t;
216    
217    static ssh2_host_key_t ssh2_host_key[] = {
218            {KEY_NONE, "none"},
219            {KEY_RSA1, "ssh-rsa1"},  // for SSH1 only
220            {KEY_RSA, "ssh-rsa"},
221            {KEY_DSA, "ssh-dss"},
222            {KEY_ECDSA256, "ecdsa-sha2-nistp256"},
223            {KEY_ECDSA384, "ecdsa-sha2-nistp384"},
224            {KEY_ECDSA521, "ecdsa-sha2-nistp521"},
225            {KEY_UNSPEC, "ssh-unknown"},
226  };  };
227    
228  #define KEX_DEFAULT_KEX     "ecdh-sha2-nistp256," \  #define KEX_DEFAULT_KEX     "ecdh-sha2-nistp256," \
# Line 314  static ssh2_cipher_t ssh2_ciphers[] = { Line 332  static ssh2_cipher_t ssh2_ciphers[] = {
332    
333  // 下記のインデックスは ssh2_kex_algorithms[] と合わせること。  // 下記のインデックスは ssh2_kex_algorithms[] と合わせること。
334  enum kex_algorithm {  enum kex_algorithm {
335            KEX_DH_NONE,       /* disabled line */
336          KEX_DH_GRP1_SHA1,          KEX_DH_GRP1_SHA1,
337          KEX_DH_GRP14_SHA1,          KEX_DH_GRP14_SHA1,
338          KEX_DH_GEX_SHA1,          KEX_DH_GEX_SHA1,
# Line 322  enum kex_algorithm { Line 341  enum kex_algorithm {
341          KEX_ECDH_SHA2_384,          KEX_ECDH_SHA2_384,
342          KEX_ECDH_SHA2_521,          KEX_ECDH_SHA2_521,
343          KEX_DH_UNKNOWN,          KEX_DH_UNKNOWN,
344            KEX_DH_MAX = KEX_DH_UNKNOWN,
345  };  };
346    
347  typedef struct ssh2_kex_algorithm {  typedef struct ssh2_kex_algorithm {
# Line 331  typedef struct ssh2_kex_algorithm { Line 351  typedef struct ssh2_kex_algorithm {
351  } ssh2_kex_algorithm_t;  } ssh2_kex_algorithm_t;
352    
353  static ssh2_kex_algorithm_t ssh2_kex_algorithms[] = {  static ssh2_kex_algorithm_t ssh2_kex_algorithms[] = {
354            {KEX_DH_NONE      , "none",                                 NULL},
355          {KEX_DH_GRP1_SHA1,  "diffie-hellman-group1-sha1",           EVP_sha1},          {KEX_DH_GRP1_SHA1,  "diffie-hellman-group1-sha1",           EVP_sha1},
356          {KEX_DH_GRP14_SHA1, "diffie-hellman-group14-sha1",          EVP_sha1},          {KEX_DH_GRP14_SHA1, "diffie-hellman-group14-sha1",          EVP_sha1},
357          {KEX_DH_GEX_SHA1,   "diffie-hellman-group-exchange-sha1",   EVP_sha1},          {KEX_DH_GEX_SHA1,   "diffie-hellman-group-exchange-sha1",   EVP_sha1},
# Line 344  static ssh2_kex_algorithm_t ssh2_kex_alg Line 365  static ssh2_kex_algorithm_t ssh2_kex_alg
365    
366  // 下記のインデックスは ssh2_macs[] と合わせること。  // 下記のインデックスは ssh2_macs[] と合わせること。
367  enum hmac_type {  enum hmac_type {
368            HMAC_NONE,
369          HMAC_SHA1,          HMAC_SHA1,
370          HMAC_MD5,          HMAC_MD5,
371          HMAC_UNKNOWN          HMAC_UNKNOWN,
372            HMAC_MAX = HMAC_UNKNOWN,
373  };  };
374    
375  typedef struct ssh2_mac {  typedef struct ssh2_mac {
# Line 357  typedef struct ssh2_mac { Line 380  typedef struct ssh2_mac {
380  } ssh2_mac_t;  } ssh2_mac_t;
381    
382  static ssh2_mac_t ssh2_macs[] = {  static ssh2_mac_t ssh2_macs[] = {
383            {HMAC_NONE,    "none",      NULL,     0},
384          {HMAC_SHA1,    "hmac-sha1", EVP_sha1, 0},          {HMAC_SHA1,    "hmac-sha1", EVP_sha1, 0},
385          {HMAC_MD5,     "hmac-md5",  EVP_md5,  0},          {HMAC_MD5,     "hmac-md5",  EVP_md5,  0},
386          {HMAC_UNKNOWN, NULL,        NULL,     0},          {HMAC_UNKNOWN, NULL,        NULL,     0},
# Line 368  enum compression_type { Line 392  enum compression_type {
392          COMP_NONE,          COMP_NONE,
393          COMP_ZLIB,          COMP_ZLIB,
394          COMP_DELAYED,          COMP_DELAYED,
395          COMP_UNKNOWN          COMP_UNKNOWN,
396            COMP_MAX = COMP_UNKNOWN,
397  };  };
398    
399  typedef struct ssh_comp {  typedef struct ssh_comp {
# Line 594  BOOL handle_SSH2_userauth_inforeq(PTInst Line 619  BOOL handle_SSH2_userauth_inforeq(PTInst
619  BOOL handle_SSH2_userauth_passwd_changereq(PTInstVar pvar);  BOOL handle_SSH2_userauth_passwd_changereq(PTInstVar pvar);
620  void SSH2_update_compression_myproposal(PTInstVar pvar);  void SSH2_update_compression_myproposal(PTInstVar pvar);
621  void SSH2_update_cipher_myproposal(PTInstVar pvar);  void SSH2_update_cipher_myproposal(PTInstVar pvar);
622    void SSH2_update_kex_myproposal(PTInstVar pvar);
623    void SSH2_update_host_key_myproposal(PTInstVar pvar);
624    void SSH2_update_hmac_myproposal(PTInstVar pvar);
625  int SSH_notify_break_signal(PTInstVar pvar);  int SSH_notify_break_signal(PTInstVar pvar);
626    
627  #endif  #endif
Legend:
Removed from v.4321  
changed lines
  Added in v.4367
Back to OSDN">Back to OSDN
 ViewVC Help
Powered by ViewVC 1.1.26  
About OSDN
Find Software
Develop Software
Help