Mercurial > dropbear
changeset 840:5128e525c8fa ecc
Default to some larger key sizes
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Thu, 31 Oct 2013 22:49:15 +0800 |
| parents | 4095b6d7c9fc |
| children | d4ce5269a439 |
| files | common-algo.c dropbearkey.c ecdsa.h |
| diffstat | 3 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/common-algo.c Fri Oct 18 21:38:01 2013 +0800 +++ b/common-algo.c Thu Oct 31 22:49:15 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},
--- a/dropbearkey.c Fri Oct 18 21:38:01 2013 +0800 +++ b/dropbearkey.c Thu Oct 31 22:49:15 2013 +0800 @@ -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);
--- a/ecdsa.h Fri Oct 18 21:38:01 2013 +0800 +++ b/ecdsa.h Thu Oct 31 22:49:15 2013 +0800 @@ -7,12 +7,12 @@ #ifdef DROPBEAR_ECDSA -#ifdef DROPBEAR_ECC_256 +#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 -#elif DROPBEAR_ECC_384 -#define ECDSA_DEFAULT_SIZE 384 -#elif DROPBEAR_ECC_521 -#define ECDSA_DEFAULT_SIZE 521 #else #define ECDSA_DEFAULT_SIZE 0 #endif