Mercurial > dropbear
diff sysoptions.h @ 1256:506f7681d0f8 coverity
merge up to date
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Tue, 15 Mar 2016 22:45:43 +0800 |
| parents | 739b3909c499 |
| children | 309e1c4a8768 |
line wrap: on
line diff
--- a/sysoptions.h Tue Dec 15 22:24:34 2015 +0800 +++ b/sysoptions.h Tue Mar 15 22:45:43 2016 +0800 @@ -4,7 +4,7 @@ *******************************************************************/ #ifndef DROPBEAR_VERSION -#define DROPBEAR_VERSION "2015.71" +#define DROPBEAR_VERSION "2016.72" #endif #define LOCAL_IDENT "SSH-2.0-dropbear_" DROPBEAR_VERSION @@ -113,20 +113,25 @@ #define RSA_BLINDING /* hashes which will be linked and registered */ -#if defined(DROPBEAR_SHA2_256_HMAC) || defined(DROPBEAR_ECC_256) || defined(DROPBEAR_CURVE25519) +#if defined(DROPBEAR_SHA2_256_HMAC) || defined(DROPBEAR_ECC_256) || defined(DROPBEAR_CURVE25519) || DROPBEAR_DH_GROUP14 #define DROPBEAR_SHA256 #endif #if defined(DROPBEAR_ECC_384) #define DROPBEAR_SHA384 #endif /* LTC SHA384 depends on SHA512 */ -#if defined(DROPBEAR_SHA2_512_HMAC) || defined(DROPBEAR_ECC_521) || defined(DROPBEAR_ECC_384) +#if defined(DROPBEAR_SHA2_512_HMAC) || defined(DROPBEAR_ECC_521) || defined(DROPBEAR_ECC_384) || DROPBEAR_DH_GROUP16 #define DROPBEAR_SHA512 #endif #if defined(DROPBEAR_MD5_HMAC) #define DROPBEAR_MD5 #endif +/* These are disabled in Dropbear 2016.73 by default since the spec + draft-ietf-curdle-ssh-kex-sha2-02 is under development. */ +#define DROPBEAR_DH_GROUP14_256 0 +#define DROPBEAR_DH_GROUP16 0 + /* roughly 2x 521 bits */ #define MAX_ECC_SIZE 140