ClearML/dropbear
1
0
Fork 0
mirror of https://github.com/clearml/dropbear synced 2025-02-07 05:17:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove hmac-md5 entirely

Browse Source
This commit is contained in:
Matt Johnston 2022-11-10 17:10:16 +08:00
parent b5e941c0b1
commit cda8070898
5 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
INSTALL
View File

@ -58,7 +58,7 @@ Compiling for uClibc should be the same as normal, just set CC to the magic
uClibc toolchain compiler (ie export CC=i386-uclibc-gcc or whatever). uClibc toolchain compiler (ie export CC=i386-uclibc-gcc or whatever).
You can use "make STATIC=1" to make statically linked binaries, and it is You can use "make STATIC=1" to make statically linked binaries, and it is
advisable to strip the binaries too. If you're looking to make a small binary, advisable to strip the binaries too. If you're looking to make a small binary,
you should remove unneeded ciphers and MD5, by editing localoptions.h you should remove unneeded ciphers and algorithms, by editing localoptions.h
It is possible to compile zlib in, by copying zlib.h and zconf.h into a It is possible to compile zlib in, by copying zlib.h and zconf.h into a
subdirectory (ie zlibincludes), and subdirectory (ie zlibincludes), and

7
common-algo.c
View File

@ -114,10 +114,6 @@ static const struct dropbear_hash dropbear_sha2_256 =
static const struct dropbear_hash dropbear_sha2_512 = static const struct dropbear_hash dropbear_sha2_512 =
{&sha512_desc, 64, 64}; {&sha512_desc, 64, 64};
#endif #endif
#if DROPBEAR_MD5_HMAC
static const struct dropbear_hash dropbear_md5 =
{&md5_desc, 16, 16};
#endif
const struct dropbear_hash dropbear_nohash = const struct dropbear_hash dropbear_nohash =
{NULL, 16, 0}; /* used initially */ {NULL, 16, 0}; /* used initially */
@ -185,9 +181,6 @@ algo_type sshhashes[] = {
#endif #endif
#if DROPBEAR_SHA2_512_HMAC #if DROPBEAR_SHA2_512_HMAC
{"hmac-sha2-512", 0, &dropbear_sha2_512, 1, NULL}, {"hmac-sha2-512", 0, &dropbear_sha2_512, 1, NULL},
#endif
#if DROPBEAR_MD5_HMAC
{"hmac-md5", 0, (void*)&dropbear_md5, 1, NULL},
#endif #endif
{NULL, 0, NULL, 0, NULL} {NULL, 0, NULL, 0, NULL}
}; };

3
crypto_desc.c
View File

@ -34,9 +34,6 @@ void crypto_init() {
#if DROPBEAR_SHA1_HMAC #if DROPBEAR_SHA1_HMAC
&sha1_desc, &sha1_desc,
#endif #endif
#if DROPBEAR_MD5_HMAC
&md5_desc,
#endif
#if DROPBEAR_SHA256 #if DROPBEAR_SHA256
&sha256_desc, &sha256_desc,
#endif #endif

4
libtomcrypt/src/headers/tomcrypt_dropbear.h
View File

@ -54,10 +54,6 @@
#define LTC_SHA1 #define LTC_SHA1
#endif #endif
#if DROPBEAR_MD5
#define LTC_MD5
#endif
/* ECC */ /* ECC */
#if DROPBEAR_ECC #if DROPBEAR_ECC
#define LTC_MECC #define LTC_MECC

7
sysoptions.h
View File

@ -111,7 +111,6 @@
#define SHA1_HASH_SIZE 20 #define SHA1_HASH_SIZE 20
#define SHA256_HASH_SIZE 32 #define SHA256_HASH_SIZE 32
#define MD5_HASH_SIZE 16
#define MAX_HASH_SIZE 64 /* sha512 */ #define MAX_HASH_SIZE 64 /* sha512 */
#if DROPBEAR_CHACHA20POLY1305 #if DROPBEAR_CHACHA20POLY1305
@ -134,11 +133,6 @@
#define DROPBEAR_SHA2_512_HMAC 0 #define DROPBEAR_SHA2_512_HMAC 0
#endif #endif
/* might be needed for compatibility with very old implementations */
#ifndef DROPBEAR_MD5_HMAC
#define DROPBEAR_MD5_HMAC 0
#endif
#define DROPBEAR_ECC ((DROPBEAR_ECDH) || (DROPBEAR_ECDSA)) #define DROPBEAR_ECC ((DROPBEAR_ECDH) || (DROPBEAR_ECDSA))
/* Debian doesn't define this in system headers */ /* Debian doesn't define this in system headers */
@ -184,7 +178,6 @@
#define DROPBEAR_SHA512 ((DROPBEAR_SHA2_512_HMAC) || (DROPBEAR_ECC_521) \ #define DROPBEAR_SHA512 ((DROPBEAR_SHA2_512_HMAC) || (DROPBEAR_ECC_521) \
|| (DROPBEAR_SHA384) || (DROPBEAR_DH_GROUP16) \ || (DROPBEAR_SHA384) || (DROPBEAR_DH_GROUP16) \
|| (DROPBEAR_ED25519)) || (DROPBEAR_ED25519))
#define DROPBEAR_MD5 (DROPBEAR_MD5_HMAC)
#define DROPBEAR_DH_GROUP14 ((DROPBEAR_DH_GROUP14_SHA256) || (DROPBEAR_DH_GROUP14_SHA1)) #define DROPBEAR_DH_GROUP14 ((DROPBEAR_DH_GROUP14_SHA256) || (DROPBEAR_DH_GROUP14_SHA1))