Mercurial > dropbear
changeset 229:1c03b27e1ceb
- "twofish-cbc" is an alias for "twofish256-cbc"
- increase the maximum key length constant
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Tue, 30 Aug 2005 17:30:39 +0000 |
| parents | 5e4110bb753a |
| children | 16f552859ee6 |
| files | common-algo.c options.h |
| diffstat | 2 files changed, 8 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/common-algo.c Tue Aug 30 16:58:57 2005 +0000 +++ b/common-algo.c Tue Aug 30 17:30:39 2005 +0000 @@ -84,6 +84,13 @@ /* 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 @@ #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} };
--- a/options.h Tue Aug 30 16:58:57 2005 +0000 +++ b/options.h Tue Aug 30 17:30:39 2005 +0000 @@ -278,7 +278,7 @@ #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