jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Crypto build cleanup: remove INTERNAL_MD4

Browse source 
In addition, rename md4.c to md4-internal.c to match in style with
SHA-1 conditionally built internal implementation.
This commit is contained in:
Johannes Berg 2009-07-28 21:27:02 +03:00 committed by Jouni Malinen
parent 598a792d8c
commit bd4e28950d
8 changed files with 9 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
eap_example/Makefile
View file

@ -33,7 +33,7 @@ OBJS_both += ../src/utils/base64.o
OBJS_both += ../src/utils/wpabuf.o OBJS_both += ../src/utils/wpabuf.o
OBJS_both += ../src/crypto/md5.o OBJS_both += ../src/crypto/md5.o
OBJS_both += ../src/crypto/rc4.o OBJS_both += ../src/crypto/rc4.o
OBJS_both += ../src/crypto/md4.o OBJS_both += ../src/crypto/md4-internal.o
OBJS_both += ../src/crypto/sha1.o OBJS_both += ../src/crypto/sha1.o
OBJS_both += ../src/crypto/aes_wrap.o OBJS_both += ../src/crypto/aes_wrap.o
OBJS_both += ../src/crypto/ms_funcs.o OBJS_both += ../src/crypto/ms_funcs.o
@ -126,7 +126,6 @@ CFLAGS += -DCONFIG_CRYPTO_INTERNAL
CFLAGS += -DCONFIG_INTERNAL_X509 CFLAGS += -DCONFIG_INTERNAL_X509
CONFIG_INTERNAL_SHA256=y CONFIG_INTERNAL_SHA256=y
CFLAGS += -DINTERNAL_MD5 CFLAGS += -DINTERNAL_MD5
CFLAGS += -DINTERNAL_MD4
ifdef CONFIG_INTERNAL_LIBTOMMATH ifdef CONFIG_INTERNAL_LIBTOMMATH
CFLAGS += -DCONFIG_INTERNAL_LIBTOMMATH CFLAGS += -DCONFIG_INTERNAL_LIBTOMMATH
else else

3
hostapd/Makefile
View file

@ -88,7 +88,6 @@ endif
OBJS += ../src/crypto/md5.o OBJS += ../src/crypto/md5.o
OBJS += ../src/crypto/rc4.o OBJS += ../src/crypto/rc4.o
OBJS += ../src/crypto/md4.o
OBJS += ../src/crypto/sha1.o OBJS += ../src/crypto/sha1.o
AESOBJS = ../src/crypto/aes_wrap.o AESOBJS = ../src/crypto/aes_wrap.o
@ -538,7 +537,7 @@ ifdef CONFIG_INTERNAL_MD5
CFLAGS += -DINTERNAL_MD5 CFLAGS += -DINTERNAL_MD5
endif endif
ifdef CONFIG_INTERNAL_MD4 ifdef CONFIG_INTERNAL_MD4
CFLAGS += -DINTERNAL_MD4 OBJS += ../src/crypto/md4-internal.o
endif endif
ifdef CONFIG_INTERNAL_DES ifdef CONFIG_INTERNAL_DES
OBJS += ../src/crypto/des-internal.o OBJS += ../src/crypto/des-internal.o

5
src/crypto/md4.c → src/crypto/md4-internal.c
View file

@ -17,9 +17,6 @@
#include "common.h" #include "common.h"
#include "crypto.h" #include "crypto.h"
#ifdef INTERNAL_MD4
#define MD4_BLOCK_LENGTH 64 #define MD4_BLOCK_LENGTH 64
#define MD4_DIGEST_LENGTH 16 #define MD4_DIGEST_LENGTH 16
@ -278,5 +275,3 @@ MD4Transform(u32 state[4], const u8 block[MD4_BLOCK_LENGTH])
state[3] += d; state[3] += d;
} }
/* ===== end - public domain MD4 implementation ===== */ /* ===== end - public domain MD4 implementation ===== */
#endif /* INTERNAL_MD4 */

2
src/utils/build_config.h
View file

@ -52,7 +52,6 @@
#define CONFIG_TLS_INTERNAL_CLIENT #define CONFIG_TLS_INTERNAL_CLIENT
#define CONFIG_INTERNAL_LIBTOMMATH #define CONFIG_INTERNAL_LIBTOMMATH
#define INTERNAL_MD5 #define INTERNAL_MD5
#define INTERNAL_MD4
#define CONFIG_INTERNAL_X509 #define CONFIG_INTERNAL_X509
#define CONFIG_CRYPTO_INTERNAL #define CONFIG_CRYPTO_INTERNAL
#endif /* USE_INTERNAL_CRYPTO */ #endif /* USE_INTERNAL_CRYPTO */
@ -66,7 +65,6 @@
#define CONFIG_NO_STDOUT_DEBUG #define CONFIG_NO_STDOUT_DEBUG
#define CONFIG_BACKEND_FILE #define CONFIG_BACKEND_FILE
#define INTERNAL_MD5 #define INTERNAL_MD5
#define INTERNAL_MD4
#define CONFIG_INTERNAL_LIBTOMMATH #define CONFIG_INTERNAL_LIBTOMMATH
#define CONFIG_INTERNAL_X509 #define CONFIG_INTERNAL_X509
#define EAP_TLS_FUNCS #define EAP_TLS_FUNCS

10
wpa_supplicant/Makefile
View file

@ -45,6 +45,7 @@ SHA1OBJS = ../src/crypto/sha1.o
DESOBJS = # none needed when not internal DESOBJS = # none needed when not internal
AESOBJS = ../src/crypto/aes_wrap.o AESOBJS = ../src/crypto/aes_wrap.o
SHA256OBJS = # none by default SHA256OBJS = # none by default
MD4OBJS = # none by default
OBJS = config.o OBJS = config.o
@ -53,12 +54,10 @@ OBJS += ../src/utils/wpa_debug.o
OBJS += ../src/utils/wpabuf.o OBJS += ../src/utils/wpabuf.o
OBJS += ../src/crypto/md5.o OBJS += ../src/crypto/md5.o
OBJS += ../src/crypto/rc4.o OBJS += ../src/crypto/rc4.o
OBJS += ../src/crypto/md4.o
OBJS_p = wpa_passphrase.o OBJS_p = wpa_passphrase.o
OBJS_p += ../src/utils/common.o OBJS_p += ../src/utils/common.o
OBJS_p += ../src/utils/wpa_debug.o OBJS_p += ../src/utils/wpa_debug.o
OBJS_p += ../src/crypto/md5.o OBJS_p += ../src/crypto/md5.o
OBJS_p += ../src/crypto/md4.o
OBJS_c = wpa_cli.o ../src/common/wpa_ctrl.o OBJS_c = wpa_cli.o ../src/common/wpa_ctrl.o
-include .config -include .config
@ -914,8 +913,11 @@ ifdef CONFIG_INTERNAL_MD5
CFLAGS += -DINTERNAL_MD5 CFLAGS += -DINTERNAL_MD5
endif endif
ifdef CONFIG_INTERNAL_MD4 ifdef CONFIG_INTERNAL_MD4
CFLAGS += -DINTERNAL_MD4 MD4OBJS += ../src/crypto/md4-internal.o
endif endif
OBJS += $(MD4OBJS)
OBJS_p += $(MD4OBJS)
ifdef CONFIG_INTERNAL_DES ifdef CONFIG_INTERNAL_DES
DESOBJS += ../src/crypto/des-internal.o DESOBJS += ../src/crypto/des-internal.o
endif endif
@ -1328,7 +1330,7 @@ test-eap_sim_common: $(TEST_EAP_SIM_COMMON_OBJS)
./test-eap_sim_common ./test-eap_sim_common
rm test-eap_sim_common rm test-eap_sim_common
TEST_MD4_OBJS = ../src/crypto/md4.o tests/test_md4.o #../src/crypto/crypto_openssl.o TEST_MD4_OBJS = ../src/crypto/md4-internal.o tests/test_md4.o #../src/crypto/crypto_openssl.o
test-md4: $(TEST_MD4_OBJS) test-md4: $(TEST_MD4_OBJS)
$(LDO) $(LDFLAGS) -o $@ $(TEST_MD4_OBJS) $(LIBS) $(LDO) $(LDFLAGS) -o $@ $(TEST_MD4_OBJS) $(LIBS)
./test-md4 ./test-md4

2
wpa_supplicant/symbian/wpa_supplicant.mmp
View file

@ -21,7 +21,7 @@ SOURCE wpa_common.c
SOURCEPATH ..\..\src\utils SOURCEPATH ..\..\src\utils
SOURCE os_none.c common.c wpa_debug.c eloop_none.c base64.c SOURCE os_none.c common.c wpa_debug.c eloop_none.c base64.c
SOURCEPATH ..\..\src\crypto SOURCEPATH ..\..\src\crypto
SOURCE sha1.c md5.c rc4.c md4.c des.c aes_wrap.c aes.c ms_funcs.c SOURCE sha1.c md5.c rc4.c des.c aes_wrap.c aes.c ms_funcs.c
SOURCE tls_internal.c crypto_internal.c SOURCE tls_internal.c crypto_internal.c
SOURCEPATH ..\..\src\tls SOURCEPATH ..\..\src\tls
SOURCE asn1.c bignum.c rsa.c x509v3.c tlsv1_client.c tlsv1_common.c SOURCE asn1.c bignum.c rsa.c x509v3.c tlsv1_client.c tlsv1_common.c

4
wpa_supplicant/vs2005/wpa_supplicant/wpa_supplicant.vcproj
View file

@ -310,10 +310,6 @@
RelativePath="..\..\main.c" RelativePath="..\..\main.c"
> >
</File> </File>
<File
RelativePath="..\..\..\src\crypto\md4.c"
>
</File>
<File <File
RelativePath="..\..\..\src\crypto\md5.c" RelativePath="..\..\..\src\crypto\md5.c"
> >

4
wpa_supplicant/vs2005/wpasvc/wpasvc.vcproj
View file

@ -310,10 +310,6 @@
RelativePath="..\..\main_winsvc.c" RelativePath="..\..\main_winsvc.c"
> >
</File> </File>
<File
RelativePath="..\..\..\src\crypto\md4.c"
>
</File>
<File <File
RelativePath="..\..\..\src\crypto\md5.c" RelativePath="..\..\..\src\crypto\md5.c"
> >