summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMatt Johnston <matt@ucc.asn.au>2020-06-10 23:42:42 +0800
committerMatt Johnston <matt@ucc.asn.au>2020-06-10 23:42:42 +0800
commit6145289e0d6de9bad520c64316672c8f583cdb1e (patch)
tree3dae7a993347684a64aede719d00fdf84114180e
parentd14ebdbf0e6fcb031544402105324c6183b82443 (diff)
Remove blowfish
-rw-r--r--common-algo.c7
-rw-r--r--default_options.h2
-rw-r--r--libtomcrypt/src/headers/tomcrypt_dropbear.h3
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