- "twofish-cbc" is an alias for "twofish256-cbc"

- increase the maximum key length constant

--HG--
extra : convert_revision : 8e534d4002dc8572041e6c7091ca3c694ce680fa
This commit is contained in:
Matt Johnston 2005-08-30 17:30:39 +00:00
parent ca77392bd1
commit 77f4520207
2 changed files with 8 additions and 7 deletions

View File

@ -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
@ -95,12 +102,6 @@ algo_type sshciphers[] = {
#endif
#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}
};

View File

@ -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