changeset 1713:c2c0f43ff827

Remove blowfish
author Matt Johnston <matt@ucc.asn.au>
date Wed, 10 Jun 2020 23:42:42 +0800
parents d885a77b98e0
children c0f12eaf95c9
files common-algo.c default_options.h libtomcrypt/src/headers/tomcrypt_dropbear.h
diffstat 3 files changed, 0 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/common-algo.c	Wed Jun 10 23:26:05 2020 +0800
+++ b/common-algo.c	Wed Jun 10 23:42:42 2020 +0800
@@ -64,10 +64,6 @@
 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 @@
 #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}
 };
--- a/default_options.h	Wed Jun 10 23:26:05 2020 +0800
+++ b/default_options.h	Wed Jun 10 23:42:42 2020 +0800
@@ -87,8 +87,6 @@
 #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 */
--- a/libtomcrypt/src/headers/tomcrypt_dropbear.h	Wed Jun 10 23:26:05 2020 +0800
+++ b/libtomcrypt/src/headers/tomcrypt_dropbear.h	Wed Jun 10 23:42:42 2020 +0800
@@ -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