comparison common-algo.c @ 1204:d2f9ef67af15

diffie-hellman-group14-sha256
author Matt Johnston <matt@ucc.asn.au>
date Fri, 11 Dec 2015 22:12:12 +0800
parents 6aeadee3f16b
children 82e2037d34ea
comparison
equal deleted inserted replaced
1203:e49a204effe3 1204:d2f9ef67af15
247 #endif 247 #endif
248 {NULL, 0, NULL, 0, NULL} 248 {NULL, 0, NULL, 0, NULL}
249 }; 249 };
250 250
251 static const struct dropbear_kex kex_dh_group1 = {DROPBEAR_KEX_NORMAL_DH, dh_p_1, DH_P_1_LEN, NULL, &sha1_desc }; 251 static const struct dropbear_kex kex_dh_group1 = {DROPBEAR_KEX_NORMAL_DH, dh_p_1, DH_P_1_LEN, NULL, &sha1_desc };
252 static const struct dropbear_kex kex_dh_group14 = {DROPBEAR_KEX_NORMAL_DH, dh_p_14, DH_P_14_LEN, NULL, &sha1_desc }; 252 static const struct dropbear_kex kex_dh_group14_sha1 = {DROPBEAR_KEX_NORMAL_DH, dh_p_14, DH_P_14_LEN, NULL, &sha1_desc };
253 static const struct dropbear_kex kex_dh_group14_sha256 = {DROPBEAR_KEX_NORMAL_DH, dh_p_14, DH_P_14_LEN, NULL, &sha256_desc };
253 254
254 /* These can't be const since dropbear_ecc_fill_dp() fills out 255 /* These can't be const since dropbear_ecc_fill_dp() fills out
255 ecc_curve at runtime */ 256 ecc_curve at runtime */
256 #ifdef DROPBEAR_ECDH 257 #ifdef DROPBEAR_ECDH
257 #ifdef DROPBEAR_ECC_256 258 #ifdef DROPBEAR_ECC_256
283 #endif 284 #endif
284 #ifdef DROPBEAR_ECC_256 285 #ifdef DROPBEAR_ECC_256
285 {"ecdh-sha2-nistp256", 0, &kex_ecdh_nistp256, 1, NULL}, 286 {"ecdh-sha2-nistp256", 0, &kex_ecdh_nistp256, 1, NULL},
286 #endif 287 #endif
287 #endif 288 #endif
288 {"diffie-hellman-group14-sha1", 0, &kex_dh_group14, 1, NULL}, 289 {"diffie-hellman-group14-sha256", 0, &kex_dh_group14_sha256, 1, NULL},
290 {"diffie-hellman-group14-sha1", 0, &kex_dh_group14_sha1, 1, NULL},
289 {"diffie-hellman-group1-sha1", 0, &kex_dh_group1, 1, NULL}, 291 {"diffie-hellman-group1-sha1", 0, &kex_dh_group1, 1, NULL},
290 #ifdef USE_KEXGUESS2 292 #ifdef USE_KEXGUESS2
291 {KEXGUESS2_ALGO_NAME, KEXGUESS2_ALGO_ID, NULL, 1, NULL}, 293 {KEXGUESS2_ALGO_NAME, KEXGUESS2_ALGO_ID, NULL, 1, NULL},
292 #endif 294 #endif
293 {NULL, 0, NULL, 0, NULL} 295 {NULL, 0, NULL, 0, NULL}