wpa: Fix a SIGBUS error in wpa_sm_set_rekey_offload

Incorrectly linked built-in wpa functions resulted in overwriting
sm->ctx->set_rekey_offload with garbage. It was initialized correctly
however it changed after wpa_supplicant became a daemon.

No SIGBUS violations reported by dhw@ were experienced during testing
of the original commit by msyelf or philip@.

Reported by:	dhw
Tested by:	dhw
MFC after:	2 months
X-MFC with:	25ecdc7d52770caf1c9b44b5ec11f468f6b636f3

22 files changed, 191 insertions, 85 deletions

diff --git a/usr.sbin/wpa/Makefile.crypto b/usr.sbin/wpa/Makefile.crypto
index a7ddb917ac6d..a65ee29e0ebe 100644
--- a/usr.sbin/wpa/Makefile.crypto
+++ b/usr.sbin/wpa/Makefile.crypto
@@ -24,6 +24,7 @@ NEED_AES_ENC=true
 NEED_AES_CBC=true
 .endif
 NEED_AES_OMAC1=true
+TLS_FUNCS=y
 
 .if defined(TLS_FUNCS)
 NEED_TLS_PRF=y
diff --git a/usr.sbin/wpa/hostapd/Makefile b/usr.sbin/wpa/hostapd/Makefile
index 6e026babae1a..c0083747782a 100644
--- a/usr.sbin/wpa/hostapd/Makefile
+++ b/usr.sbin/wpa/hostapd/Makefile
@@ -3,6 +3,8 @@
 .include <src.opts.mk>
 .include "../Makefile.inc"
 
+.include "../Makefile.crypto"
+
 .PATH.c:${HOSTAPD_DISTDIR}
 
 PACKAGE=	hostapd
@@ -40,8 +42,6 @@ CFLAGS+=${HOSTAPD_CFLAGS}
 LDADD+=${HOSTAPD_LDADD}
 #LDFLAGS+=${HOSTAPD_LDFLAGS}
 
-TLS_FUNCS=y
-
 # For WPS, EAP modes, etc
 NEED_DH_GROUPS=y
 NEED_DH_GROUPS_ALL=y
@@ -67,6 +67,4 @@ CFLAGS+=-DEAP_GPSK_SHA256
 NEED_AES_OMAC1=y
 .endif
 
-.include "../Makefile.crypto"
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/wpa/hostapd_cli/Makefile b/usr.sbin/wpa/hostapd_cli/Makefile
index 276e25058298..fef18dab7b32 100644
--- a/usr.sbin/wpa/hostapd_cli/Makefile
+++ b/usr.sbin/wpa/hostapd_cli/Makefile
@@ -2,6 +2,8 @@
 
 .include "../Makefile.inc"
 
+.include "../Makefile.crypto"
+
 .PATH.c:${HOSTAPD_DISTDIR}
 
 PACKAGE=	hostapd
@@ -12,6 +14,4 @@ LIBADD+=	util wpacommon wpautils
 
 MAN=	hostapd_cli.8
 
-.include "../Makefile.crypto"
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/wpa/src/ap/Makefile b/usr.sbin/wpa/src/ap/Makefile
index edb2f1e9d089..77caf1ed8efe 100644
--- a/usr.sbin/wpa/src/ap/Makefile
+++ b/usr.sbin/wpa/src/ap/Makefile
@@ -2,6 +2,8 @@
 
 .include "../../Makefile.inc"
 
+.include "../../Makefile.crypto"
+
 LIB=	wpaap
 INTERNALLIB=
 
@@ -51,8 +53,6 @@ CFLAGS+=-DCONFIG_MBO \
 	-DCONFIG_RSN_PREAUTH \
 	-DHOSTAPD
 
-.include "../../Makefile.crypto"
-
 # We are only interested in includes at this point. Not libraries.
 LIBADD=
 
diff --git a/usr.sbin/wpa/src/common/Makefile b/usr.sbin/wpa/src/common/Makefile
index 28c16ff9d31a..b415b926c207 100644
--- a/usr.sbin/wpa/src/common/Makefile
+++ b/usr.sbin/wpa/src/common/Makefile
@@ -2,6 +2,8 @@
 
 .include "../../Makefile.inc"
 
+.include "../../Makefile.crypto"
+
 LIB=	wpacommon
 INTERNALLIB=
 
@@ -19,8 +21,6 @@ CFLAGS+=-DCONFIG_SAE \
 	-DCONFIG_SUITE \
 	-DCONFIG_SUITEB
 
-.include "../../Makefile.crypto"
-
 # We are only interested in includes at this point. Not libraries.
 LIBADD=
 
diff --git a/usr.sbin/wpa/src/crypto/Makefile b/usr.sbin/wpa/src/crypto/Makefile
index d7e1304dc95e..b25489072425 100644
--- a/usr.sbin/wpa/src/crypto/Makefile
+++ b/usr.sbin/wpa/src/crypto/Makefile
@@ -2,49 +2,156 @@
 
 .include "../../Makefile.inc"
 
+.include "../../Makefile.crypto"
+
 LIB=	wpacrypto
 INTERNALLIB=
 
 .PATH:	${WPA_DISTDIR}/src/crypto
 
-SRCS=	aes-cbc.c \
-	aes-ctr.c \
-	aes-eax.c \
-	aes-encblock.c \
-	aes-internal.c \
-	aes-internal-dec.c \
-	aes-internal-enc.c \
-	aes-omac1.c \
-	aes-unwrap.c \
-	aes-wrap.c \
-	crypto_internal.c \
-	crypto_internal-cipher.c \
-	crypto_internal-modexp.c \
-	crypto_internal-rsa.c \
-	des-internal.c \
-	dh_group5.c \
-	dh_groups.c \
-	fips_prf_internal.c \
-	md4-internal.c \
-	md5.c \
-	md5-internal.c \
-	ms_funcs.c \
+.if ${MK_OPENSSL} != "no"
+SRCS=	crypto_openssl.c \
 	random.c \
-	rc4.c \
-	sha1.c \
-	sha1-internal.c \
-	sha1-pbkdf2.c \
 	sha1-prf.c \
-	sha1-tlsprf.c \
-	sha256.c \
 	sha256-prf.c \
 	sha256-tlsprf.c \
-	sha256-internal.c \
-	sha384.c \
-	sha384-prf.c \
-	sha384-internal.c \
-	sha512-internal.c \
+	sha512.c
+.else
+SRCS=	crypto_internal.c \
+	random.c
+.endif
+
+.if defined(TLS_FUNCS)
+.if defined(CONFIG_INTERNAL_TLS)
+SRCS+=	crypto_internal-cipher.c \
+	crypto_internal-modexp.c \
+	crypto_internal-rsa.c \
 	tls_internal.c
+.else
+SRCS+=	tls_openssl.c \
+	tls_openssl_ocsp.c
+.endif
+.endif
+
+.if defined(CONFIG_INTERNAL_AES)
+SRCS+=  aes-unwrap.c aes-wrap.c \
+        aes-internal.c \
+        aes-internal-dec.c \
+        aes-internal-enc.c
+.else
+.endif
+
+.if defined(NEED_AES_CBC)
+SRCS+=	aes-cbc.c
+.endif
+
+.if defined(NEED_AES_EAX)
+SRCS+=	aes-eax.c
+.endif
+
+.if defined(NEED_AES_CTR)
+SRCS+=	aes-ctr.c
+.endif
+
+.if defined(NEED_AES_ENCBLOCK)
+SRCS+=	aes-encblock.c
+.endif
+
+.if defined(NEED_AES_OMAC1)
+SRCS+=	aes-omac1.c
+.endif
+
+.if defined(NEED_DES)
+.if defined(CONFIG_INTERNAL_DES)
+SRCS+=	des-internal.c
+.endif
+.endif
+
+.if defined(NEED_MD4)
+.if defined(CONFIG_INTERNAL_MD4)
+SRCS+=	md4-internal.c
+.endif
+.endif
+
+.if defined(CONFIG_INTERNAL_MD5)
+SRCS+=	md5.c \
+	md5-internal.c
+.endif
+
+.if defined(NEED_FIPS186_2_PRF)
+.if defined(CONFIG_INTERNAL_SHA1)
+SRCS+=	fips_prf_internal.c
+.else
+SRCS+=	fips_prf_openssl.c
+.endif
+.endif
+
+.if defined(CONFIG_INTERNAL_RC4)
+SRCS+=	rc4.c
+.endif
+
+.if defined(CONFIG_INTERNAL_SHA1)
+SRCS+=	sha1-internal.c \
+	sha1-pbkdf2.c \
+	sha1.c \
+	sha1-prf.c
+.endif
+
+.if defined(NEED_SHA256)
+SRCS+=	sha256.c
+.if defined(CONFIG_INTERNAL_SHA256)
+SRCS+=	sha256-internal.c \
+	sha256-prf.c
+.endif
+.endif
+
+.if defined(NEED_SHA384)
+SRCS+=	sha384.c
+.if defined(CONFIG_INTERNAL_SHA384)
+SRCS+=	sha384-internal.c \
+	sha384-prf.c
+.endif
+.endif
+
+.if defined(NEED_SHA512)
+SRCS+=	sha512.c
+.if defined(CONFIG_INTERNAL_SHA512)
+SRCS+=	sha512-internal.c \
+	sha512-prf.c
+.endif
+.endif
+
+.if defined(NEED_TLS_PRF)
+SRCS+=	sha1-tlsprf.c
+.endif
+
+.if defined(CONFIG_INTERNAL_DH5)
+.if defined(NEED_DH_GROUPS)
+SRCS+=	dh_group5.c
+.endif
+.endif
+
+.if defined(NEED_DH_GROUPS)
+SRCS+=	dh_groups.c
+.endif
+
+.if ${MK_WPA_SUPPLICANT_EAPOL} != "no"
+CFLAGS+=-DCONFIG_WPS \
+	-DCONFIG_HS20 \
+	-DCONFIG_INTERWORKING \
+	-DEAP_GTC \
+	-DEAP_LEAP \
+	-DEAP_MD5 \
+	-DEAP_MSCHAPv2 \
+	-DEAP_OTP \
+	-DEAP_PEAP \
+	-DEAP_PSK \
+	-DEAP_TLS \
+	-DEAP_TTLS \
+	-DEAP_WSC \
+	-DIEEE8021X_EAPOL
+SRCS+=	ms_funcs.c
+.endif
 
 CFLAGS+=-DCONFIG_CRYPTO_INTERNAL \
 	-DCONFIG_TLS_INTERNAL_CLIENT \
@@ -55,8 +162,6 @@ CFLAGS+=-DCONFIG_CRYPTO_INTERNAL \
 	-DCONFIG_INTERNAL_SHA384
 #CFLAGS+=-DALL_DH_GROUPS
 
-.include "../../Makefile.crypto"
-
 # We are only interested in includes at this point. Not libraries.
 LIBADD=
 
diff --git a/usr.sbin/wpa/src/drivers/Makefile b/usr.sbin/wpa/src/drivers/Makefile
index 1800b651885f..0f901bdcf2fd 100644
--- a/usr.sbin/wpa/src/drivers/Makefile
+++ b/usr.sbin/wpa/src/drivers/Makefile
@@ -2,6 +2,8 @@
 
 .include "../../Makefile.inc"
 
+.include "../../Makefile.crypto"
+
 LIB=	wpadrivers
 INTERNALLIB=
 
@@ -13,8 +15,6 @@ SRCS=	drivers.c \
 	driver_wired.c \
 	driver_wired_common.c
 
-.include "../../Makefile.crypto"
-
 # We are only interested in includes at this point. Not libraries.
 LIBADD=
 
diff --git a/usr.sbin/wpa/src/eap_common/Makefile b/usr.sbin/wpa/src/eap_common/Makefile
index 4da89b221b36..7ec416c74102 100644
--- a/usr.sbin/wpa/src/eap_common/Makefile
+++ b/usr.sbin/wpa/src/eap_common/Makefile
@@ -2,6 +2,8 @@
 
 .include "../../Makefile.inc"
 
+.include "../../Makefile.crypto"
+
 LIB=	wpaeap_common
 INTERNALLIB=
 
@@ -17,8 +19,6 @@ SRCS=	chap.c \
 	eap_sim_common.c \
 	eap_wsc_common.c
 
-.include "../../Makefile.crypto"
-
 # We are only interested in includes at this point. Not libraries.
 LIBADD=
 
diff --git a/usr.sbin/wpa/src/eap_peer/Makefile b/usr.sbin/wpa/src/eap_peer/Makefile
index 524c7cf6c6f1..bab1b690f6d9 100644
--- a/usr.sbin/wpa/src/eap_peer/Makefile
+++ b/usr.sbin/wpa/src/eap_peer/Makefile
@@ -2,6 +2,8 @@
 
 .include "../../Makefile.inc"
 
+.include "../../Makefile.crypto"
+
 LIB=	wpaeap_peer
 INTERNALLIB=
 
@@ -25,8 +27,6 @@ SRCS=	eap.c \
 
 CFLAGS+=-DIEEE8021X_EAPOL
 
-.include "../../Makefile.crypto"
-
 # We are only interested in includes at this point. Not libraries.
 LIBADD=
 
diff --git a/usr.sbin/wpa/src/eap_server/Makefile b/usr.sbin/wpa/src/eap_server/Makefile
index c5a4566bb444..795d2a9c68a0 100644
--- a/usr.sbin/wpa/src/eap_server/Makefile
+++ b/usr.sbin/wpa/src/eap_server/Makefile
@@ -2,6 +2,8 @@
 
 .include "../../Makefile.inc"
 
+.include "../../Makefile.crypto"
+
 LIB=	wpaeap_server
 INTERNALLIB=
 
@@ -26,8 +28,6 @@ SRCS=	eap_server.c \
 	eap_server_wsc.c \
 	eap_sim_db.c
 
-.include "../../Makefile.crypto"
-
 # We are only interested in includes at this point. Not libraries.
 LIBADD=
 
diff --git a/usr.sbin/wpa/src/eapol_auth/Makefile b/usr.sbin/wpa/src/eapol_auth/Makefile
index 7f05367edfb0..984b96df5c6f 100644
--- a/usr.sbin/wpa/src/eapol_auth/Makefile
+++ b/usr.sbin/wpa/src/eapol_auth/Makefile
@@ -2,6 +2,8 @@
 
 .include "../../Makefile.inc"
 
+.include "../../Makefile.crypto"
+
 LIB=	wpaeapol_auth
 INTERNALLIB=
 
@@ -10,8 +12,6 @@ INTERNALLIB=
 SRCS=	eapol_auth_sm.c \
 	eapol_auth_dump.c
 
-.include "../../Makefile.crypto"
-
 # We are only interested in includes at this point. Not libraries.
 LIBADD=
 
diff --git a/usr.sbin/wpa/src/eapol_supp/Makefile b/usr.sbin/wpa/src/eapol_supp/Makefile
index 2b3cc0179109..a4588fc23de1 100644
--- a/usr.sbin/wpa/src/eapol_supp/Makefile
+++ b/usr.sbin/wpa/src/eapol_supp/Makefile
@@ -2,6 +2,8 @@
 
 .include "../../Makefile.inc"
 
+.include "../../Makefile.crypto"
+
 LIB=	wpaeapol_supp
 INTERNALLIB=
 
@@ -11,8 +13,6 @@ SRCS=	eapol_supp_sm.c
 
 CFLAGS+=-DIEEE8021X_EAPOL
 
-.include "../../Makefile.crypto"
-
 # We are only interested in includes at this point. Not libraries.
 LIBADD=
 
diff --git a/usr.sbin/wpa/src/l2_packet/Makefile b/usr.sbin/wpa/src/l2_packet/Makefile
index 89ce771b0343..f53dc81fdf52 100644
--- a/usr.sbin/wpa/src/l2_packet/Makefile
+++ b/usr.sbin/wpa/src/l2_packet/Makefile
@@ -2,6 +2,8 @@
 
 .include "../../Makefile.inc"
 
+.include "../../Makefile.crypto"
+
 LIB=	wpal2_packet
 INTERNALLIB=
 
@@ -11,8 +13,6 @@ SRCS=	l2_packet_freebsd.c
 
 CFLAGS+=-DIEEE8021X_EAPOL
 
-.include "../../Makefile.crypto"
-
 # We are only interested in includes at this point. Not libraries.
 LIBADD=
 
diff --git a/usr.sbin/wpa/src/radius/Makefile b/usr.sbin/wpa/src/radius/Makefile
index 1ef986a799ae..a37d60be6f7d 100644
--- a/usr.sbin/wpa/src/radius/Makefile
+++ b/usr.sbin/wpa/src/radius/Makefile
@@ -2,6 +2,8 @@
 
 .include "../../Makefile.inc"
 
+.include "../../Makefile.crypto"
+
 LIB=	wparadius
 INTERNALLIB=
 
@@ -16,8 +18,6 @@ SRCS=	radius.c \
 CFLAGS+= -DCONFIG_IPV6
 .endif
 
-.include "../../Makefile.crypto"
-
 # We are only interested in includes at this point. Not libraries.
 LIBADD=
 
diff --git a/usr.sbin/wpa/src/rsn_supp/Makefile b/usr.sbin/wpa/src/rsn_supp/Makefile
index 1b50689e6960..4d952c2204c4 100644
--- a/usr.sbin/wpa/src/rsn_supp/Makefile
+++ b/usr.sbin/wpa/src/rsn_supp/Makefile
@@ -2,6 +2,8 @@
 
 .include "../../Makefile.inc"
 
+.include "../../Makefile.crypto"
+
 LIB=	wparsn_supp
 INTERNALLIB=
 
@@ -18,8 +20,6 @@ CFLAGS+=-DCONFIG_TDLS \
 	-DCONFIG_WNM \
 	-DIEEE8021X_EAPOL
 
-.include "../../Makefile.crypto"
-
 # We are only interested in includes at this point. Not libraries.
 LIBADD=
 
diff --git a/usr.sbin/wpa/src/tls/Makefile b/usr.sbin/wpa/src/tls/Makefile
index defe9b0faf6e..e5fdf96444d6 100644
--- a/usr.sbin/wpa/src/tls/Makefile
+++ b/usr.sbin/wpa/src/tls/Makefile
@@ -2,36 +2,41 @@
 
 .include "../../Makefile.inc"
 
+.include "../../Makefile.crypto"
+
 LIB=	wpatls
 INTERNALLIB=
 
 .PATH:	${WPA_DISTDIR}/src/tls
 
-SRCS=	asn1.c \
+SRCS=	tlsv1_server.c
+
+.if defined(TLS_FUNCS)
+.if defined(CONFIG_INTERNAL_TLS)
+SRCS+=	asn1.c \
 	bignum.c \
 	pkcs1.c \
 	pkcs5.c \
 	pkcs8.c \
 	rsa.c \
 	tlsv1_client.c \
+	tlsv1_client_ocsp.c \
 	tlsv1_client_read.c \
 	tlsv1_client_write.c \
-	tlsv1_client_ocsp.c \
 	tlsv1_common.c \
 	tlsv1_cred.c \
 	tlsv1_record.c \
-	tlsv1_server.c \
 	tlsv1_server_read.c \
 	tlsv1_server_write.c \
 	x509v3.c
+.endif
+.endif
 
 CFLAGS+=-DCONFIG_INTERNAL_LIBTOMMATH \
 	-DCONFIG_CRYPTO_INTERNAL \
 	-DCONFIG_TLSV11 \
 	-DCONFIG_TLSV12
 
-.include "../../Makefile.crypto"
-
 # We are only interested in includes at this point. Not libraries.
 LIBADD=
 
diff --git a/usr.sbin/wpa/src/utils/Makefile b/usr.sbin/wpa/src/utils/Makefile
index f08a2d78fced..22ec732a2b3b 100644
--- a/usr.sbin/wpa/src/utils/Makefile
+++ b/usr.sbin/wpa/src/utils/Makefile
@@ -2,6 +2,8 @@
 
 .include "../../Makefile.inc"
 
+.include "../../Makefile.crypto"
+
 LIB=	wpautils
 INTERNALLIB=
 
@@ -24,8 +26,6 @@ CFLAGS+=-DCONFIG_DEBUG_FILE
 CFLAGS+= -DCONFIG_IPV6
 .endif
 
-.include "../../Makefile.crypto"
-
 # We are only interested in includes at this point. Not libraries.
 LIBADD=
 
diff --git a/usr.sbin/wpa/src/wps/Makefile b/usr.sbin/wpa/src/wps/Makefile
index ddb40b682c27..5f5485d69bce 100644
--- a/usr.sbin/wpa/src/wps/Makefile
+++ b/usr.sbin/wpa/src/wps/Makefile
@@ -2,6 +2,8 @@
 
 .include "../../Makefile.inc"
 
+.include "../../Makefile.crypto"
+
 LIB=	wpawps
 INTERNALLIB=
 
@@ -31,8 +33,6 @@ CFLAGS+=-DCONFIG_P2P
 CFLAGS+= -DCONFIG_IPV6
 .endif
 
-.include "../../Makefile.crypto"
-
 # We are only interested in includes at this point. Not libraries.
 LIBADD=
 
diff --git a/usr.sbin/wpa/wpa_cli/Makefile b/usr.sbin/wpa/wpa_cli/Makefile
index 7568154a7e45..bf2cf6252550 100644
--- a/usr.sbin/wpa/wpa_cli/Makefile
+++ b/usr.sbin/wpa/wpa_cli/Makefile
@@ -4,6 +4,8 @@
 
 .include "../Makefile.inc"
 
+.include "../Makefile.crypto"
+
 .PATH.c:${WPA_SUPPLICANT_DISTDIR}
 
 PACKAGE=	wpa
@@ -32,8 +34,4 @@ LIBADD+=wpaap \
 	wpautils
 LIBADD+=	pcap util
 
-TLS_FUNCS=y
-
-.include "../Makefile.crypto"
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/wpa/wpa_passphrase/Makefile b/usr.sbin/wpa/wpa_passphrase/Makefile
index 0dcb3e69da98..4cd540696d67 100644
--- a/usr.sbin/wpa/wpa_passphrase/Makefile
+++ b/usr.sbin/wpa/wpa_passphrase/Makefile
@@ -2,6 +2,8 @@
 
 .include "../Makefile.inc"
 
+.include "../Makefile.crypto"
+
 .PATH.c:${WPA_SUPPLICANT_DISTDIR}
 
 PACKAGE=	wpa
@@ -14,6 +16,4 @@ LIBADD+=	util wpacrypto wpautils
 
 MAN=	wpa_passphrase.8
 
-.include "../Makefile.crypto"
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/wpa/wpa_priv/Makefile b/usr.sbin/wpa/wpa_priv/Makefile
index fd316402c1cf..d3b693341276 100644
--- a/usr.sbin/wpa/wpa_priv/Makefile
+++ b/usr.sbin/wpa/wpa_priv/Makefile
@@ -2,6 +2,8 @@
 
 .include "../Makefile.inc"
 
+.include "../Makefile.crypto"
+
 .PATH.c:${WPA_SUPPLICANT_DISTDIR}
 
 PACKAGE=	wpa
@@ -9,8 +11,6 @@ PROG=	wpa_priv
 SRCS=	os_unix.c eloop.c common.c wpa_debug.c wpabuf.c wpa_priv.c \
 	l2_packet_freebsd.c
 
-LIBADD=	pcap wpadrivers
-
-.include "../Makefile.crypto"
+LIBADD+=pcap wpadrivers
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/wpa/wpa_supplicant/Makefile b/usr.sbin/wpa/wpa_supplicant/Makefile
index 482c06d68e40..332f66315346 100644
--- a/usr.sbin/wpa/wpa_supplicant/Makefile
+++ b/usr.sbin/wpa/wpa_supplicant/Makefile
@@ -4,6 +4,8 @@
 
 .include "../Makefile.inc"
 
+.include "../Makefile.crypto"
+
 .PATH.c:${WPA_SUPPLICANT_DISTDIR} \
 	${WPA_DISTDIR}/src/drivers
 
@@ -39,7 +41,7 @@ FILES=	wpa_supplicant.conf
 
 CFLAGS+=-DCONFIG_BACKEND_FILE
 #CFLAGS+= -g
-LIBADD=	pcap util wpaap wpacommon wpacrypto wpadrivers wpaeapol_supp \
+LIBADD+=pcap util wpaap wpacommon wpacrypto wpadrivers wpaeapol_supp \
 	wpaeap_common wpaeap_server \
 	wpaeap_peer wpal2_packet wparsn_supp wpatls wpautils wpawps
 
@@ -68,7 +70,6 @@ NEED_AES_EAX=y
 NEED_AES_ENCBLOCK=y
 NEED_AES_OMAC1=y
 .endif
-TLS_FUNCS=y
 
 .if !empty(CFLAGS:M*-DEAP_AKA)
 SRCS+=	eap_aka.c
@@ -116,6 +117,4 @@ SRCS+=	eap_sake.c \
 	eap_sake_common.c
 .endif
 
-.include "../Makefile.crypto"
-
 .include <bsd.prog.mk>