projects
/
libeap.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0dba017
)
Further crypto makefile unification
author
Jouni Malinen
<j@w1.fi>
Sun, 11 Oct 2009 17:31:15 +0000
(20:31 +0300)
committer
Jouni Malinen
<j@w1.fi>
Sun, 11 Oct 2009 17:31:15 +0000
(20:31 +0300)
hostapd/Makefile
patch
|
blob
|
history
wpa_supplicant/Makefile
patch
|
blob
|
history
diff --git
a/hostapd/Makefile
b/hostapd/Makefile
index
d29ad8a
..
66d26c5
100644
(file)
--- a/
hostapd/Makefile
+++ b/
hostapd/Makefile
@@
-486,7
+486,6
@@
else
CONFIG_INTERNAL_AES=y
CONFIG_INTERNAL_SHA1=y
CONFIG_INTERNAL_MD5=y
CONFIG_INTERNAL_AES=y
CONFIG_INTERNAL_SHA1=y
CONFIG_INTERNAL_MD5=y
-CONFIG_INTERNAL_SHA256=y
CONFIG_INTERNAL_RC4=y
endif
CONFIG_INTERNAL_RC4=y
endif
diff --git
a/wpa_supplicant/Makefile
b/wpa_supplicant/Makefile
index
78ce9d9
..
5b68213
100644
(file)
--- a/
wpa_supplicant/Makefile
+++ b/
wpa_supplicant/Makefile
@@
-723,10
+723,6
@@
ifdef CHAP
OBJS += ../src/eap_common/chap.o
endif
OBJS += ../src/eap_common/chap.o
endif
-ifndef CONFIG_NO_WPA
-NEED_CRYPTO=y
-endif
-
ifdef NEED_CRYPTO
ifndef TLS_FUNCS
ifeq ($(CONFIG_TLS), openssl)
ifdef NEED_CRYPTO
ifndef TLS_FUNCS
ifeq ($(CONFIG_TLS), openssl)
@@
-831,6
+827,7
@@
else
CONFIG_INTERNAL_AES=y
CONFIG_INTERNAL_SHA1=y
CONFIG_INTERNAL_MD5=y
CONFIG_INTERNAL_AES=y
CONFIG_INTERNAL_SHA1=y
CONFIG_INTERNAL_MD5=y
+CONFIG_INTERNAL_RC4=y
endif
ifdef CONFIG_INTERNAL_AES
endif
ifdef CONFIG_INTERNAL_AES