aboutsummaryrefslogtreecommitdiffstats
path: root/eap_example
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2009-07-28 18:20:04 (GMT)
committerJouni Malinen <j@w1.fi>2009-07-28 18:20:04 (GMT)
commit598a792d8cd822fc0c7ac7d7be58cbf66d22e83c (patch)
tree232b46ae085d64f1d283ba9eed57a0e184ab3b5c /eap_example
parent246157cba6b506d47f55474125528e3546564df0 (diff)
downloadhostap-598a792d8cd822fc0c7ac7d7be58cbf66d22e83c.zip
hostap-598a792d8cd822fc0c7ac7d7be58cbf66d22e83c.tar.gz
hostap-598a792d8cd822fc0c7ac7d7be58cbf66d22e83c.tar.bz2
Crypto build cleanup: remove INTERNAL_SHA256
Instead of using a define and conditional building of sha256.c parts, move the internal-SHA256 into a separate file.
Diffstat (limited to 'eap_example')
-rw-r--r--eap_example/Makefile12
1 files changed, 9 insertions, 3 deletions
diff --git a/eap_example/Makefile b/eap_example/Makefile
index 493eff0..2abe171 100644
--- a/eap_example/Makefile
+++ b/eap_example/Makefile
@@ -37,13 +37,13 @@ OBJS_both += ../src/crypto/md4.o
OBJS_both += ../src/crypto/sha1.o
OBJS_both += ../src/crypto/aes_wrap.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
OBJS_both += ../src/crypto/aes-internal.o
endif
+SHA256OBJS = ../src/crypto/sha256.o
OBJS_both += ../src/eap_common/eap_peap_common.o
@@ -103,7 +103,7 @@ CFLAGS += -DEAP_TLS_OPENSSL
OBJS_both += ../src/crypto/tls_openssl.o
OBJS_both += ../src/crypto/crypto_openssl.o
LIBS += -lssl -lcrypto
-CFLAGS += -DINTERNAL_SHA256
+CONFIG_INTERNAL_SHA256=y
endif
ifeq ($(CONFIG_TLS), internal)
@@ -124,7 +124,7 @@ CFLAGS += -DCONFIG_TLS_INTERNAL_SERVER
CFLAGS += -DCONFIG_TLS_INTERNAL
CFLAGS += -DCONFIG_CRYPTO_INTERNAL
CFLAGS += -DCONFIG_INTERNAL_X509
-CFLAGS += -DINTERNAL_SHA256
+CONFIG_INTERNAL_SHA256=y
CFLAGS += -DINTERNAL_MD5
CFLAGS += -DINTERNAL_MD4
ifdef CONFIG_INTERNAL_LIBTOMMATH
@@ -135,6 +135,12 @@ endif
endif
+ifdef CONFIG_INTERNAL_SHA256
+SHA256OBJS += ../src/crypto/sha256-internal.o
+endif
+
+OBJS_both += $(SHA256OBJS)
+
# Optional components to add EAP server support
OBJS_server += ../src/eap_server/eap_tls.o