OBJS_both += ../src/crypto/md5.o
OBJS_both += ../src/crypto/rc4.o
OBJS_both += ../src/crypto/md4.o
-OBJS_both += ../src/crypto/sha1.o ../src/crypto/sha1-internal.o
-OBJS_both += ../src/crypto/des.o
+OBJS_both += ../src/crypto/sha1.o
OBJS_both += ../src/crypto/aes_wrap.o
OBJS_both += ../src/crypto/aes.o
OBJS_both += ../src/crypto/ms_funcs.o
OBJS_both += ../src/crypto/sha256.o
+ifeq ($(CONFIG_TLS), internal)
+OBJS_both += ../src/crypto/sha1-internal.o
+OBJS_both += ../src/crypto/des-internal.o
+endif
+
OBJS_both += ../src/eap_common/eap_peap_common.o
OBJS_both += ../src/eap_common/eap_psk_common.o
CFLAGS += -DINTERNAL_SHA256
CFLAGS += -DINTERNAL_MD5
CFLAGS += -DINTERNAL_MD4
-CFLAGS += -DINTERNAL_DES
ifdef CONFIG_INTERNAL_LIBTOMMATH
CFLAGS += -DCONFIG_INTERNAL_LIBTOMMATH
else
OBJS += ../src/crypto/rc4.o
OBJS += ../src/crypto/md4.o
OBJS += ../src/crypto/sha1.o
-OBJS += ../src/crypto/des.o
OBJS += ../src/crypto/aes_wrap.o
OBJS += ../src/crypto/aes.o
CFLAGS += -DINTERNAL_MD4
endif
ifdef CONFIG_INTERNAL_DES
-CFLAGS += -DINTERNAL_DES
+OBJS += ../src/crypto/des-internal.o
endif
ifdef NEED_SHA256
#include "common.h"
#include "crypto.h"
-
-#ifdef INTERNAL_DES
-
/*
* This implementation is based on a DES implementation included in
* LibTomCrypt. The version here is modified to fit in wpa_supplicant/hostapd
WPA_PUT_BE32(plain, work[0]);
WPA_PUT_BE32(plain + 4, work[1]);
}
-
-#endif /* INTERNAL_DES */
#define INTERNAL_SHA256
#define INTERNAL_MD5
#define INTERNAL_MD4
-#define INTERNAL_DES
#define CONFIG_INTERNAL_X509
#define CONFIG_CRYPTO_INTERNAL
#endif /* USE_INTERNAL_CRYPTO */
#define INTERNAL_AES
#define INTERNAL_MD5
#define INTERNAL_MD4
-#define INTERNAL_DES
#define CONFIG_INTERNAL_LIBTOMMATH
#define CONFIG_INTERNAL_X509
#define EAP_TLS_FUNCS
$(MAKE) -C ../src install
SHA1OBJS = ../src/crypto/sha1.o
+DESOBJS = # none needed when not internal
OBJS = config.o
OBJS += ../src/crypto/md5.o
OBJS += ../src/crypto/rc4.o
OBJS += ../src/crypto/md4.o
-OBJS += ../src/crypto/des.o
OBJS_p = wpa_passphrase.o
OBJS_p += ../src/utils/common.o
OBJS_p += ../src/utils/wpa_debug.o
OBJS_p += ../src/crypto/md5.o
OBJS_p += ../src/crypto/md4.o
-OBJS_p += ../src/crypto/des.o
OBJS_c = wpa_cli.o ../src/common/wpa_ctrl.o
-include .config
CFLAGS += -DINTERNAL_MD4
endif
ifdef CONFIG_INTERNAL_DES
-CFLAGS += -DINTERNAL_DES
+DESOBJS += ../src/crypto/des-internal.o
endif
ifdef CONFIG_IEEE80211R
endif
OBJS += ../src/drivers/scan_helpers.o
-OBJS += $(SHA1OBJS)
+OBJS += $(SHA1OBJS) $(DESOBJS)
-OBJS_p += $(SHA1OBJS)
+OBJS_p += $(SHA1OBJS) $(DESOBJS)
OBJS_wpa_rm := ctrl_iface.o mlme.o ctrl_iface_unix.o
OBJS_wpa := $(filter-out $(OBJS_wpa_rm),$(OBJS)) $(OBJS_h) tests/test_wpa.o
OBJSa=../src/tls/asn1_test.o ../src/tls/asn1.o ../src/tls/x509v3.o ../src/utils/common.o ../src/utils/wpa_debug.o ../src/utils/os_unix.o \
../src/crypto/crypto_$(CONFIG_CRYPTO).o ../src/crypto/md5.o $(SHA1OBSJ) \
- ../src/crypto/rc4.o ../src/crypto/des.o ../src/crypto/aes_wrap.o \
+ ../src/crypto/rc4.o $(DESOBJS) ../src/crypto/aes_wrap.o \
../src/crypto/aes.o ../src/tls/bignum.o ../src/tls/rsa.o
asn1_test: $(OBJSa)
$(LDO) $(LDFLAGS) -o asn1_test $(OBJSa)
../src/utils/common.o ../src/utils/wpa_debug.o ../src/utils/os_unix.o \
../src/crypto/crypto_$(CONFIG_CRYPTO).o \
../src/crypto/md5.o $(SHA1OBJS) ../src/crypto/aes.o \
- ../src/crypto/rc4.o ../src/crypto/des.o ../src/crypto/aes_wrap.o \
+ ../src/crypto/rc4.o $(DESOBJS) ../src/crypto/aes_wrap.o \
../src/crypto/sha256.o \
../src/tls/bignum.o ../src/tls/rsa.o
test_x509v3: $(OBJSx)