Mercurial > dropbear
diff 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 |
line wrap: on
line diff
--- a/common-algo.c Mon Oct 21 22:57:21 2013 +0800 +++ b/common-algo.c Fri Nov 01 00:14:48 2013 +0800 @@ -246,14 +246,14 @@ algo_type sshkex[] = { #ifdef DROPBEAR_ECDH -#ifdef DROPBEAR_ECC_256 - {"ecdh-sha2-nistp256", 0, &kex_ecdh_nistp256, 1, NULL}, +#ifdef DROPBEAR_ECC_521 + {"ecdh-sha2-nistp521", 0, &kex_ecdh_nistp521, 1, NULL}, #endif #ifdef DROPBEAR_ECC_384 {"ecdh-sha2-nistp384", 0, &kex_ecdh_nistp384, 1, NULL}, #endif -#ifdef DROPBEAR_ECC_521 - {"ecdh-sha2-nistp521", 0, &kex_ecdh_nistp521, 1, NULL}, +#ifdef DROPBEAR_ECC_256 + {"ecdh-sha2-nistp256", 0, &kex_ecdh_nistp256, 1, NULL}, #endif #endif {"diffie-hellman-group1-sha1", 0, &kex_dh_group1, 1, NULL},