diff --git a/hostapd/Makefile b/hostapd/Makefile
index d29ad8a1f..66d26c54f 100644
--- 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_SHA256=y
 CONFIG_INTERNAL_RC4=y
 endif
 
diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
index 78ce9d9cb..5b6821358 100644
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
@@ -723,10 +723,6 @@ ifdef CHAP
 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)
@@ -831,6 +827,7 @@ else
 CONFIG_INTERNAL_AES=y
 CONFIG_INTERNAL_SHA1=y
 CONFIG_INTERNAL_MD5=y
+CONFIG_INTERNAL_RC4=y
 endif
 
 ifdef CONFIG_INTERNAL_AES