Mercurial > dropbear
diff 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 |
line wrap: on
line diff
--- a/common-algo.c Thu Dec 03 21:40:31 2015 +0800 +++ b/common-algo.c Fri Dec 11 22:12:12 2015 +0800 @@ -249,7 +249,8 @@ }; static const struct dropbear_kex kex_dh_group1 = {DROPBEAR_KEX_NORMAL_DH, dh_p_1, DH_P_1_LEN, NULL, &sha1_desc }; -static const struct dropbear_kex kex_dh_group14 = {DROPBEAR_KEX_NORMAL_DH, dh_p_14, DH_P_14_LEN, NULL, &sha1_desc }; +static const struct dropbear_kex kex_dh_group14_sha1 = {DROPBEAR_KEX_NORMAL_DH, dh_p_14, DH_P_14_LEN, NULL, &sha1_desc }; +static const struct dropbear_kex kex_dh_group14_sha256 = {DROPBEAR_KEX_NORMAL_DH, dh_p_14, DH_P_14_LEN, NULL, &sha256_desc }; /* These can't be const since dropbear_ecc_fill_dp() fills out ecc_curve at runtime */ @@ -285,7 +286,8 @@ {"ecdh-sha2-nistp256", 0, &kex_ecdh_nistp256, 1, NULL}, #endif #endif - {"diffie-hellman-group14-sha1", 0, &kex_dh_group14, 1, NULL}, + {"diffie-hellman-group14-sha256", 0, &kex_dh_group14_sha256, 1, NULL}, + {"diffie-hellman-group14-sha1", 0, &kex_dh_group14_sha1, 1, NULL}, {"diffie-hellman-group1-sha1", 0, &kex_dh_group1, 1, NULL}, #ifdef USE_KEXGUESS2 {KEXGUESS2_ALGO_NAME, KEXGUESS2_ALGO_ID, NULL, 1, NULL},