summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMatt Johnston <matt@ucc.asn.au>2015-12-11 22:12:12 +0800
committerMatt Johnston <matt@ucc.asn.au>2015-12-11 22:12:12 +0800
commit87d2c9c05ce03bd8dd549218f4a67b6569a34fa5 (patch)
treeee6514cdad7b7a2127b386cbfd55b92b51cb6074
parentdf999ed1e1449a6af37cc595516332cfc14891b6 (diff)
diffie-hellman-group14-sha256
-rw-r--r--common-algo.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/common-algo.c b/common-algo.c
index 002ae66..51907d0 100644
--- a/common-algo.c
+++ b/common-algo.c
@@ -249,7 +249,8 @@ algo_type sshhostkey[] = {
};
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 @@ algo_type sshkex[] = {
{"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},