comparison common-algo.c @ 842:7f8f8f2b7a35

Merge
author Matt Johnston <matt@ucc.asn.au>
date Fri, 01 Nov 2013 00:14:48 +0800
parents 5128e525c8fa
children 6c69e7df3621
comparison
equal deleted inserted replaced
839:33207ed1174b 842:7f8f8f2b7a35
244 #endif // DROPBEAR_ECDH 244 #endif // DROPBEAR_ECDH
245 245
246 246
247 algo_type sshkex[] = { 247 algo_type sshkex[] = {
248 #ifdef DROPBEAR_ECDH 248 #ifdef DROPBEAR_ECDH
249 #ifdef DROPBEAR_ECC_521
250 {"ecdh-sha2-nistp521", 0, &kex_ecdh_nistp521, 1, NULL},
251 #endif
252 #ifdef DROPBEAR_ECC_384
253 {"ecdh-sha2-nistp384", 0, &kex_ecdh_nistp384, 1, NULL},
254 #endif
249 #ifdef DROPBEAR_ECC_256 255 #ifdef DROPBEAR_ECC_256
250 {"ecdh-sha2-nistp256", 0, &kex_ecdh_nistp256, 1, NULL}, 256 {"ecdh-sha2-nistp256", 0, &kex_ecdh_nistp256, 1, NULL},
251 #endif
252 #ifdef DROPBEAR_ECC_384
253 {"ecdh-sha2-nistp384", 0, &kex_ecdh_nistp384, 1, NULL},
254 #endif
255 #ifdef DROPBEAR_ECC_521
256 {"ecdh-sha2-nistp521", 0, &kex_ecdh_nistp521, 1, NULL},
257 #endif 257 #endif
258 #endif 258 #endif
259 {"diffie-hellman-group1-sha1", 0, &kex_dh_group1, 1, NULL}, 259 {"diffie-hellman-group1-sha1", 0, &kex_dh_group1, 1, NULL},
260 {"diffie-hellman-group14-sha1", 0, &kex_dh_group14, 1, NULL}, 260 {"diffie-hellman-group14-sha1", 0, &kex_dh_group14, 1, NULL},
261 #ifdef USE_KEXGUESS2 261 #ifdef USE_KEXGUESS2