diff options
| author | Matt Johnston <matt@ucc.asn.au> | 2013-10-31 22:49:15 +0800 |
|---|---|---|
| committer | Matt Johnston <matt@ucc.asn.au> | 2013-10-31 22:49:15 +0800 |
| commit | 814ab77538b8023f3ede270fcd14da7368913554 (patch) | |
| tree | 46cd1cbe17aef1b366651da469458e884913256f | |
| parent | 45bd0edae52c07daa2d54ca7f7c0a57d51130791 (diff) | |
Default to some larger key sizes
--HG--
branch : ecc
| -rw-r--r-- | common-algo.c | 8 | ||||
| -rw-r--r-- | dropbearkey.c | 2 | ||||
| -rw-r--r-- | ecdsa.h | 10 |
3 files changed, 10 insertions, 10 deletions
diff --git a/common-algo.c b/common-algo.c index a8d9669..8076358 100644 --- a/common-algo.c +++ b/common-algo.c @@ -246,14 +246,14 @@ static struct dropbear_kex kex_ecdh_nistp521 = {NULL, 0, &ecc_curve_nistp521, &s 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}, diff --git a/dropbearkey.c b/dropbearkey.c index eecfbcc..ba10ea9 100644 --- a/dropbearkey.c +++ b/dropbearkey.c @@ -57,7 +57,7 @@ static void printhelp(char * progname); -#define RSA_DEFAULT_SIZE 1024 +#define RSA_DEFAULT_SIZE 2048 #define DSS_DEFAULT_SIZE 1024 static void buf_writefile(buffer * buf, const char * filename); @@ -7,12 +7,12 @@ #ifdef DROPBEAR_ECDSA -#ifdef DROPBEAR_ECC_256 -#define ECDSA_DEFAULT_SIZE 256 -#elif DROPBEAR_ECC_384 -#define ECDSA_DEFAULT_SIZE 384 -#elif DROPBEAR_ECC_521 +#if defined(DROPBEAR_ECC_521) #define ECDSA_DEFAULT_SIZE 521 +#elif defined(DROPBEAR_ECC_384) +#define ECDSA_DEFAULT_SIZE 384 +#elif defined(DROPBEAR_ECC_256) +#define ECDSA_DEFAULT_SIZE 256 #else #define ECDSA_DEFAULT_SIZE 0 #endif |