Mercurial > dropbear
diff common-algo.c @ 1915:13cb8cc1b0e4
Remove twofish and remnants of blowfish
Twofish CTR was never enabled by default and CBC modes are
deprecated
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Wed, 30 Mar 2022 10:23:39 +0800 |
| parents | 4a6725ac957c |
| children |
line wrap: on
line diff
--- a/common-algo.c Wed Mar 30 10:10:15 2022 +0800 +++ b/common-algo.c Wed Mar 30 10:23:39 2022 +0800 @@ -64,14 +64,6 @@ static const struct dropbear_cipher dropbear_aes128 = {&aes_desc, 16, 16}; #endif -#if DROPBEAR_TWOFISH256 -static const struct dropbear_cipher dropbear_twofish256 = - {&twofish_desc, 32, 16}; -#endif -#if DROPBEAR_TWOFISH128 -static const struct dropbear_cipher dropbear_twofish128 = - {&twofish_desc, 16, 16}; -#endif #if DROPBEAR_3DES static const struct dropbear_cipher dropbear_3des = {&des3_desc, 24, 8}; @@ -156,15 +148,6 @@ #if DROPBEAR_AES256 {"aes256-ctr", 0, &dropbear_aes256, 1, &dropbear_mode_ctr}, #endif -#if DROPBEAR_TWOFISH_CTR -/* twofish ctr is conditional as it hasn't been tested for interoperability, see options.h */ -#if DROPBEAR_TWOFISH256 - {"twofish256-ctr", 0, &dropbear_twofish256, 1, &dropbear_mode_ctr}, -#endif -#if DROPBEAR_TWOFISH128 - {"twofish128-ctr", 0, &dropbear_twofish128, 1, &dropbear_mode_ctr}, -#endif -#endif /* DROPBEAR_TWOFISH_CTR */ #endif /* DROPBEAR_ENABLE_CTR_MODE */ #if DROPBEAR_ENABLE_CBC_MODE @@ -174,13 +157,6 @@ #if DROPBEAR_AES256 {"aes256-cbc", 0, &dropbear_aes256, 1, &dropbear_mode_cbc}, #endif -#if DROPBEAR_TWOFISH256 - {"twofish256-cbc", 0, &dropbear_twofish256, 1, &dropbear_mode_cbc}, - {"twofish-cbc", 0, &dropbear_twofish256, 1, &dropbear_mode_cbc}, -#endif -#if DROPBEAR_TWOFISH128 - {"twofish128-cbc", 0, &dropbear_twofish128, 1, &dropbear_mode_cbc}, -#endif #endif /* DROPBEAR_ENABLE_CBC_MODE */ #if DROPBEAR_3DES