comparison session.h @ 854:ccc76acaf4c7

merge ecc again
author Matt Johnston <matt@ucc.asn.au>
date Thu, 14 Nov 2013 20:45:46 +0800
parents 6c69e7df3621
children c19acba28590
comparison
equal deleted inserted replaced
845:774ad9b112ef 854:ccc76acaf4c7
242 struct clientsession { 242 struct clientsession {
243 243
244 // XXX - move these to kexstate? 244 // XXX - move these to kexstate?
245 struct kex_dh_param *dh_param; 245 struct kex_dh_param *dh_param;
246 struct kex_ecdh_param *ecdh_param; 246 struct kex_ecdh_param *ecdh_param;
247 struct kex_curve25519_param *curve25519_param;
247 const struct dropbear_kex *param_kex_algo; /* KEX algorithm corresponding to current dh_e and dh_x */ 248 const struct dropbear_kex *param_kex_algo; /* KEX algorithm corresponding to current dh_e and dh_x */
248 249
249 cli_kex_state kex_state; /* Used for progressing KEX */ 250 cli_kex_state kex_state; /* Used for progressing KEX */
250 cli_state state; /* Used to progress auth/channelsession etc */ 251 cli_state state; /* Used to progress auth/channelsession etc */
251 unsigned donefirstkex : 1; /* Set when we set sentnewkeys, never reset */ 252 unsigned donefirstkex : 1; /* Set when we set sentnewkeys, never reset */