Mercurial > dropbear
changeset 237:961f6a74c5f4
merge of 57902417ad22502b79c63fcabb7f4a8c8449e682
and 92bb4dd3f6f212342a5c991f738b987d7a07a6b2
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Fri, 02 Sep 2005 15:33:45 +0000 |
| parents | c3dbd3e1a8ce (diff) ea5189f97cfd (current diff) |
| children | e923801a7678 |
| files | common-algo.c |
| diffstat | 1 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/common-algo.c Fri Sep 02 15:33:09 2005 +0000 +++ b/common-algo.c Fri Sep 02 15:33:45 2005 +0000 @@ -84,13 +84,6 @@ /* 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 @@ -100,6 +93,13 @@ #ifdef DROPBEAR_AES256_CBC {"aes256-cbc", 0, (void*)&dropbear_aes256, 1}, #endif +#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_BLOWFISH_CBC {"blowfish-cbc", 0, (void*)&dropbear_blowfish, 1}, #endif