diff options
| author | Matt Johnston <matt@ucc.asn.au> | 2005-08-30 17:30:39 +0000 |
|---|---|---|
| committer | Matt Johnston <matt@ucc.asn.au> | 2005-08-30 17:30:39 +0000 |
| commit | 77f4520207bf6be9dc89be406f8270c371dba22e (patch) | |
| tree | f2719aa803b2336bf49da4f37f9663f74bd55d3b | |
| parent | ca77392bd1bde7e42b8254f82ca9b0b569b4f74d (diff) | |
- "twofish-cbc" is an alias for "twofish256-cbc"
- increase the maximum key length constant
--HG--
extra : convert_revision : 8e534d4002dc8572041e6c7091ca3c694ce680fa
| -rw-r--r-- | common-algo.c | 13 | ||||
| -rw-r--r-- | options.h | 2 |
2 files changed, 8 insertions, 7 deletions
diff --git a/common-algo.c b/common-algo.c index 4a8f49c..cc91c88 100644 --- a/common-algo.c +++ b/common-algo.c @@ -84,6 +84,13 @@ const struct dropbear_hash dropbear_nohash = /* The following map ssh names to internal values */ algo_type sshciphers[] = { +#ifdef DROPBEAR_TWOFISH256_CBC + {"twofish256-cbc", 0, (void*)&dropbear_twofish256, 1}, + {"twofish-cbc", 0, (void*)&dropbear_twofish256, 1}, +#endif +#ifdef DROPBEAR_TWOFISH128_CBC + {"twofish128-cbc", 0, (void*)&dropbear_twofish128, 1}, +#endif #ifdef DROPBEAR_AES128_CBC {"aes128-cbc", 0, (void*)&dropbear_aes128, 1}, #endif @@ -96,12 +103,6 @@ algo_type sshciphers[] = { #ifdef DROPBEAR_BLOWFISH_CBC {"blowfish-cbc", 0, (void*)&dropbear_blowfish, 1}, #endif -#ifdef DROPBEAR_TWOFISH256_CBC - {"twofish256-cbc", 0, (void*)&dropbear_twofish256, 1}, -#endif -#ifdef DROPBEAR_TWOFISH128_CBC - {"twofish128-cbc", 0, (void*)&dropbear_twofish128, 1}, -#endif {NULL, 0, NULL, 0} }; @@ -278,7 +278,7 @@ etc) slower (perhaps by 50%). Recommended for most small systems. */ #define MAX_MAC_LEN SHA1_HASH_SIZE -#define MAX_KEY_LEN 24 /* 3DES requires a 24 byte key */ +#define MAX_KEY_LEN 32 /* 256 bytes for aes256 etc */ #define MAX_IV_LEN 20 /* must be same as max blocksize, and >= SHA1_HASH_SIZE */ #define MAX_MAC_KEY 20 |