diff options
| author | Matt Johnston <matt@ucc.asn.au> | 2016-05-02 23:48:16 +0200 |
|---|---|---|
| committer | Matt Johnston <matt@ucc.asn.au> | 2016-05-02 23:48:16 +0200 |
| commit | d6daad29fcfc20295473bf7e6a96f3016282e9e6 (patch) | |
| tree | 5ac3e533fca2a1141509e16de6f73e2905e45e23 /common-algo.c | |
| parent | 4664ce2c35e69ff79949eff178be1720bf288ddc (diff) | |
options for disabling "normal" DH
Diffstat (limited to 'common-algo.c')
| -rw-r--r-- | common-algo.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/common-algo.c b/common-algo.c index 10d60c9..eb0b1e1 100644 --- a/common-algo.c +++ b/common-algo.c @@ -251,11 +251,11 @@ algo_type sshhostkey[] = { #if DROPBEAR_DH_GROUP1 static const struct dropbear_kex kex_dh_group1 = {DROPBEAR_KEX_NORMAL_DH, dh_p_1, DH_P_1_LEN, NULL, &sha1_desc }; #endif -#if DROPBEAR_DH_GROUP14 +#if DROPBEAR_DH_GROUP14_SHA1 static const struct dropbear_kex kex_dh_group14_sha1 = {DROPBEAR_KEX_NORMAL_DH, dh_p_14, DH_P_14_LEN, NULL, &sha1_desc }; -#if DROPBEAR_DH_GROUP14_256 -static const struct dropbear_kex kex_dh_group14_sha256 = {DROPBEAR_KEX_NORMAL_DH, dh_p_14, DH_P_14_LEN, NULL, &sha256_desc }; #endif +#if DROPBEAR_DH_GROUP14_SHA256 +static const struct dropbear_kex kex_dh_group14_sha256 = {DROPBEAR_KEX_NORMAL_DH, dh_p_14, DH_P_14_LEN, NULL, &sha256_desc }; #endif #if DROPBEAR_DH_GROUP16 static const struct dropbear_kex kex_dh_group16_sha512 = {DROPBEAR_KEX_NORMAL_DH, dh_p_16, DH_P_16_LEN, NULL, &sha512_desc }; @@ -295,12 +295,12 @@ algo_type sshkex[] = { {"ecdh-sha2-nistp256", 0, &kex_ecdh_nistp256, 1, NULL}, #endif #endif -#if DROPBEAR_DH_GROUP14 -#if DROPBEAR_DH_GROUP14_256 - {"diffie-hellman-group14-sha256", 0, &kex_dh_group14_sha256, 1, NULL}, -#endif +#if DROPBEAR_DH_GROUP14_SHA1 {"diffie-hellman-group14-sha1", 0, &kex_dh_group14_sha1, 1, NULL}, #endif +#if DROPBEAR_DH_GROUP14_SHA256 + {"diffie-hellman-group14-sha256", 0, &kex_dh_group14_sha256, 1, NULL}, +#endif #if DROPBEAR_DH_GROUP1 {"diffie-hellman-group1-sha1", 0, &kex_dh_group1, 1, NULL}, #endif @@ -349,6 +349,7 @@ void buf_put_algolist(buffer * buf, algo_type localalgos[]) { } } buf_putstring(buf, (const char*)algolist->data, algolist->len); + TRACE(("algolist add '%*s'", algolist->len, algolist->data)) buf_free(algolist); } |