Develop and Download Open Source Software

Browse Subversion Repository

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

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

revision 4314 by maya, Wed Feb 16 15:55:41 2011 UTC revision 4321 by maya, Sat Feb 19 07:41:41 2011 UTC
# Line 201  enum ssh_keytype { Line 201  enum ssh_keytype {
201          KEY_RSA1,          KEY_RSA1,
202          KEY_RSA,          KEY_RSA,
203          KEY_DSA,          KEY_DSA,
204            KEY_ECDSA256,
205            KEY_ECDSA384,
206            KEY_ECDSA521,
207          KEY_UNSPEC,          KEY_UNSPEC,
208  };  };
209    
# Line 211  enum ssh_keytype { Line 214  enum ssh_keytype {
214                              "diffie-hellman-group-exchange-sha1," \                              "diffie-hellman-group-exchange-sha1," \
215                              "diffie-hellman-group14-sha1," \                              "diffie-hellman-group14-sha1," \
216                              "diffie-hellman-group1-sha1"                              "diffie-hellman-group1-sha1"
217  #define KEX_DEFAULT_PK_ALG  "ssh-rsa,ssh-dss"  #define KEX_DEFAULT_PK_ALG  "ecdsa-sha2-nistp256," \
218                                "ecdsa-sha2-nistp384," \
219                                "ecdsa-sha2-nistp521," \
220                                "ssh-rsa,ssh-dss"
221  // use the setting of pvar.CipherOrder.  // use the setting of pvar.CipherOrder.
222  #define KEX_DEFAULT_ENCRYPT ""  #define KEX_DEFAULT_ENCRYPT ""
223  #define KEX_DEFAULT_MAC     "hmac-sha1,hmac-md5"  #define KEX_DEFAULT_MAC     "hmac-sha1,hmac-md5"
# Line 423  typedef struct Key { Line 429  typedef struct Key {
429          RSA *rsa;          RSA *rsa;
430          // SSH2 DSA          // SSH2 DSA
431          DSA *dsa;          DSA *dsa;
432            // SSH2 ECDSA
433            EC_KEY *ecdsa;
434          // SSH1 RSA          // SSH1 RSA
435          int bits;          int bits;
436          unsigned char *exp;          unsigned char *exp;

Legend:
Removed from v.4314  
changed lines
  Added in v.4321

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