diff options
| author | Matt Johnston <matt@ucc.asn.au> | 2013-05-21 12:09:35 +0800 |
|---|---|---|
| committer | Matt Johnston <matt@ucc.asn.au> | 2013-05-21 12:09:35 +0800 |
| commit | 04518e9e801ee57bd6d4caab470da8dc0ec98fd7 (patch) | |
| tree | 5e46adedc7cd70e6f7b0547a200544cbcf80b96b /sysoptions.h | |
| parent | 41f531ceafc86507c82847f44f9c9e126d798c48 (diff) | |
| parent | a57947c513a53e77de0b2eaa67ca6404f444a29f (diff) | |
merge in HEAD
--HG--
branch : ecc
Diffstat (limited to 'sysoptions.h')
| -rw-r--r-- | sysoptions.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/sysoptions.h b/sysoptions.h index d2ef0ab..c36ab8b 100644 --- a/sysoptions.h +++ b/sysoptions.h @@ -4,7 +4,7 @@ *******************************************************************/ #ifndef DROPBEAR_VERSION -#define DROPBEAR_VERSION "2013.56" +#define DROPBEAR_VERSION "2013.58" #endif #define LOCAL_IDENT "SSH-2.0-dropbear_" DROPBEAR_VERSION @@ -23,6 +23,15 @@ #define AUTH_TIMEOUT 300 /* we choose 5 minutes */ #endif +/* A client should try and send an initial key exchange packet guessing + * the algorithm that will match - saves a round trip connecting, has little + * overhead if the guess was "wrong". */ +#define USE_KEX_FIRST_FOLLOWS +/* Use protocol extension to allow "first follows" to succeed more frequently. + * This is currently Dropbear-specific but will gracefully fallback when connecting + * to other implementations. */ +#define USE_KEXGUESS2 + /* Minimum key sizes for DSS and RSA */ #ifndef MIN_DSS_KEYLEN #define MIN_DSS_KEYLEN 512 |