Page MenuHomeFreeBSD
Files F148977980

D27958.diff
No OneTemporary
Actions

D27958.diff
View Options

diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -438,7 +438,6 @@
MK_PKGBOOTSTRAP:= no
MK_SVN:= no
MK_SVNLITE:= no
-MK_WIRELESS:= no
.endif
.if ${MK_LDNS} == "no"
diff --git a/usr.sbin/wpa/Makefile.crypto b/usr.sbin/wpa/Makefile.crypto
--- a/usr.sbin/wpa/Makefile.crypto
+++ b/usr.sbin/wpa/Makefile.crypto
@@ -16,9 +16,13 @@
CONFIG_INTERNAL_SHA1=y
NEED_SHA256=y
CONFIG_INTERNAL_SHA256=y
+NEED_SHA384=y
+CONFIG_INTERNAL_SHA384=y
+NEED_SHA512=y
+CONFIG_INTERNAL_SHA512=y
CONFIG_INTERNAL_TLS=y
+NEED_DH_GROUPS=y
CONFIG_INTERNAL_DH5=y
-CONFIG_INTERNAL_DH=y
NEED_AES_ENC=true
NEED_AES_CBC=true
.endif
@@ -45,6 +49,7 @@
tlsv1_client.c \
tlsv1_client_write.c \
tlsv1_client_read.c \
+ tlsv1_client_ocsp.c \
x509v3.c
NEED_DES=y
NEED_MD4=y
@@ -123,14 +128,36 @@
.endif
.endif
+.if defined(NEED_SHA384)
+CFLAGS+=-DCONFIG_SHA384
+SRCS+= sha384.c
+.if defined(CONFIG_INTERNAL_SHA384)
+SRCS+= sha384-internal.c sha384-prf.c
+.endif
+.endif
+
+.if defined(NEED_SHA512)
+CFLAGS+=-DCONFIG_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(CONFIG_INTERNAL_DH)
+.if defined(NEED_DH_GROUPS)
SRCS+= dh_groups.c
.endif
+
+.if defined(NEED_DH_GROUPS_ALL)
+CFLAGS+=-DALL_DH_GROUPS
+.endif
diff --git a/usr.sbin/wpa/hostapd/Makefile b/usr.sbin/wpa/hostapd/Makefile
--- a/usr.sbin/wpa/hostapd/Makefile
+++ b/usr.sbin/wpa/hostapd/Makefile
@@ -163,6 +163,10 @@
eapol_auth_sm.c
TLS_FUNCS=y
+# For WPS, EAP modes, etc
+NEED_DH_GROUPS=y
+NEED_DH_GROUPS_ALL=y
+
.if !empty(CFLAGS:M*-DCONFIG_WPS)
NEED_SIM_COMMON=y
.endif
diff --git a/usr.sbin/wpa/wpa_supplicant/Makefile b/usr.sbin/wpa/wpa_supplicant/Makefile
--- a/usr.sbin/wpa/wpa_supplicant/Makefile
+++ b/usr.sbin/wpa/wpa_supplicant/Makefile
@@ -14,7 +14,7 @@
SRCS= base64.c bitfield.c blacklist.c bss.c cli.c common.c \
config.c config_file.c \
ctrl_iface.c ctrl_iface_common.c ctrl_iface_unix.c \
- dh_groups.c driver_bsd.c driver_common.c \
+ driver_bsd.c driver_common.c \
driver_ndis.c driver_wired.c driver_wired_common.c drivers.c \
eap_register.c eloop.c \
events.c gas.c gas_query.c \

File Metadata

Mime Type
text/plain
Expires
Sun, Mar 22, 11:49 AM (14 h, 39 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30121106
Default Alt Text
D27958.diff (2 KB)

Event Timeline