diff options
| author | Matt Johnston <matt@ucc.asn.au> | 2020-06-10 23:42:42 +0800 |
|---|---|---|
| committer | Matt Johnston <matt@ucc.asn.au> | 2020-06-10 23:42:42 +0800 |
| commit | f0be447b8eed580b5e6ad4428009ef08deced6e5 (patch) | |
| tree | 50e0ed93db17319ac343ae9a4b89b75946a1c056 | |
| parent | d41ca152cfb91a492b3b9719b94b7958c0a39754 (diff) | |
| download | dropbear-f0be447b8eed580b5e6ad4428009ef08deced6e5.tar.gz | |
Remove blowfish
| -rw-r--r-- | common-algo.c | 7 | ||||
| -rw-r--r-- | default_options.h | 2 | ||||
| -rw-r--r-- | libtomcrypt/src/headers/tomcrypt_dropbear.h | 3 |
3 files changed, 0 insertions, 12 deletions
diff --git a/common-algo.c b/common-algo.c index a710171..8b39892 100644 --- a/common-algo.c +++ b/common-algo.c @@ -64,10 +64,6 @@ static const struct dropbear_cipher dropbear_aes256 = static const struct dropbear_cipher dropbear_aes128 = {&aes_desc, 16, 16}; #endif -#if DROPBEAR_BLOWFISH -static const struct dropbear_cipher dropbear_blowfish = - {&blowfish_desc, 16, 8}; -#endif #if DROPBEAR_TWOFISH256 static const struct dropbear_cipher dropbear_twofish256 = {&twofish_desc, 32, 16}; @@ -197,9 +193,6 @@ algo_type sshciphers[] = { #endif /* DROPBEAR_3DES */ #if DROPBEAR_ENABLE_CBC_MODE -#if DROPBEAR_BLOWFISH - {"blowfish-cbc", 0, &dropbear_blowfish, 1, &dropbear_mode_cbc}, -#endif #endif /* DROPBEAR_ENABLE_CBC_MODE */ {NULL, 0, NULL, 0, NULL} }; diff --git a/default_options.h b/default_options.h index 2ca01b3..db2ea13 100644 --- a/default_options.h +++ b/default_options.h @@ -87,8 +87,6 @@ IMPORTANT: Some options will require "make clean" after changes */ #define DROPBEAR_AES256 1 #define DROPBEAR_TWOFISH256 0 #define DROPBEAR_TWOFISH128 0 -/* Compiling in Blowfish will add ~6kB to runtime heap memory usage */ -#define DROPBEAR_BLOWFISH 0 /* Enable CBC mode for ciphers. This has security issues though * is the most compatible with older SSH implementations */ diff --git a/libtomcrypt/src/headers/tomcrypt_dropbear.h b/libtomcrypt/src/headers/tomcrypt_dropbear.h index 36956da..3e24ea2 100644 --- a/libtomcrypt/src/headers/tomcrypt_dropbear.h +++ b/libtomcrypt/src/headers/tomcrypt_dropbear.h @@ -13,9 +13,6 @@ /* Fewer entries needed */ #define TAB_SIZE 5 -#if DROPBEAR_BLOWFISH -#define LTC_BLOWFISH -#endif #if DROPBEAR_AES #define LTC_RIJNDAEL #endif |