diff options
| author | Matt Johnston <matt@ucc.asn.au> | 2009-07-01 04:16:32 +0000 |
|---|---|---|
| committer | Matt Johnston <matt@ucc.asn.au> | 2009-07-01 04:16:32 +0000 |
| commit | 709a3e75cfb242c1b7165e599a4ccc54198967ca (patch) | |
| tree | 0841170dfc5ff65f02b6ef6ec3cd0d73a13a960c /sysoptions.h | |
| parent | e674c73ee62c79608dc986ca4eda4d8299f2e324 (diff) | |
| parent | cb82c6e3e0db91adc8aa65620935f4c9d57f70e9 (diff) | |
propagate from branch 'au.asn.ucc.matt.dropbear' (head 899a8851a5edf840b2f7925bcc26ffe99dcac54d)
to branch 'au.asn.ucc.matt.dropbear.cli-agent' (head 6bbab8364de17bd9ecb1dee5ffb796e48c0380d2)
--HG--
branch : agent-client
extra : convert_revision : d39a49137cc36b624768d4e79e564141dde8d355
Diffstat (limited to 'sysoptions.h')
| -rw-r--r-- | sysoptions.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/sysoptions.h b/sysoptions.h index 6b17151..2de1184 100644 --- a/sysoptions.h +++ b/sysoptions.h @@ -4,7 +4,7 @@ *******************************************************************/ #ifndef DROPBEAR_VERSION -#define DROPBEAR_VERSION "0.51" +#define DROPBEAR_VERSION "0.52" #endif #define LOCAL_IDENT "SSH-2.0-dropbear_" DROPBEAR_VERSION @@ -68,6 +68,7 @@ #define DROPBEAR_COMP_NONE 0 #define DROPBEAR_COMP_ZLIB 1 +#define DROPBEAR_COMP_ZLIB_DELAY 2 /* Required for pubkey auth */ #if defined(ENABLE_SVR_PUBKEY_AUTH) || defined(DROPBEAR_CLIENT) @@ -133,12 +134,12 @@ accept for keyb-interactive auth */ -#if defined(DROPBEAR_AES256_CBC) || defined(DROPBEAR_AES128_CBC) -#define DROPBEAR_AES_CBC +#if defined(DROPBEAR_AES256) || defined(DROPBEAR_AES128) +#define DROPBEAR_AES #endif -#if defined(DROPBEAR_TWOFISH256_CBC) || defined(DROPBEAR_TWOFISH128_CBC) -#define DROPBEAR_TWOFISH_CBC +#if defined(DROPBEAR_TWOFISH256) || defined(DROPBEAR_TWOFISH128) +#define DROPBEAR_TWOFISH #endif #ifndef ENABLE_X11FWD @@ -201,5 +202,8 @@ #define IS_DROPBEAR_CLIENT 1 #else -#error You must compiled with either DROPBEAR_CLIENT or DROPBEAR_SERVER selected +/* Just building key utils? */ +#define IS_DROPBEAR_SERVER 0 +#define IS_DROPBEAR_CLIENT 0 + #endif |