summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2019-04-26 16:27:44 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2019-04-26 16:58:41 +0200
commitc82b34799a474368f978b88aef1395f2ae26aa21 (patch)
treef75e46085c71eddeaf79dc2fda6a7b0b66f96bd2
parent60378750d7f579b30b5c73896b4bd171e448453d (diff)
downloadptxdist-c82b34799a474368f978b88aef1395f2ae26aa21.tar.gz
ptxdist-c82b34799a474368f978b88aef1395f2ae26aa21.tar.xz
hostapd: version bump 2.7 -> 2.8
Also, follow Debian and upstream and enable some more options. The license md5 changes are just copyright year updates. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--config/hostapd/defconfig44
-rw-r--r--rules/hostapd.make8
2 files changed, 32 insertions, 20 deletions
diff --git a/config/hostapd/defconfig b/config/hostapd/defconfig
index 878daace0..3b63c5e93 100644
--- a/config/hostapd/defconfig
+++ b/config/hostapd/defconfig
@@ -42,7 +42,7 @@ CONFIG_LIBNL32=y
#LIBS_c += -L/usr/local/lib
# Driver interface for no driver (e.g., RADIUS server only)
-#CONFIG_DRIVER_NONE=y
+CONFIG_DRIVER_NONE=y
# IEEE 802.11F/IAPP
CONFIG_IAPP=y
@@ -53,6 +53,9 @@ CONFIG_RSN_PREAUTH=y
# IEEE 802.11w (management frame protection)
CONFIG_IEEE80211W=y
+# Support Operating Channel Validation
+#CONFIG_OCV=y
+
# Integrated EAP server
CONFIG_EAP=y
@@ -94,10 +97,10 @@ CONFIG_EAP_TTLS=y
#CONFIG_EAP_PSK=y
# EAP-pwd for the integrated EAP server (secure authentication with a password)
-#CONFIG_EAP_PWD=y
+CONFIG_EAP_PWD=y
# EAP-SAKE for the integrated EAP server
-#CONFIG_EAP_SAKE=y
+CONFIG_EAP_SAKE=y
# EAP-GPSK for the integrated EAP server
#CONFIG_EAP_GPSK=y
@@ -111,9 +114,9 @@ CONFIG_EAP_TTLS=y
#CONFIG_EAP_FAST=y
# Wi-Fi Protected Setup (WPS)
-#CONFIG_WPS=y
+CONFIG_WPS=y
# Enable UPnP support for external WPS Registrars
-#CONFIG_WPS_UPNP=y
+CONFIG_WPS_UPNP=y
# Enable WPS support with NFC config method
#CONFIG_WPS_NFC=y
@@ -121,7 +124,7 @@ CONFIG_EAP_TTLS=y
#CONFIG_EAP_IKEV2=y
# Trusted Network Connect (EAP-TNC)
-#CONFIG_EAP_TNC=y
+CONFIG_EAP_TNC=y
# EAP-EKE for the integrated EAP server
#CONFIG_EAP_EKE=y
@@ -138,7 +141,7 @@ CONFIG_PKCS12=y
CONFIG_IPV6=y
# IEEE Std 802.11r-2008 (Fast BSS Transition)
-#CONFIG_IEEE80211R=y
+CONFIG_IEEE80211R=y
# Use the hostapd's IEEE 802.11 authentication (ACL), but without
# the IEEE 802.11 Management capability (e.g., FreeBSD/net80211)
@@ -170,13 +173,13 @@ CONFIG_IEEE80211AC=y
CONFIG_DEBUG_FILE=y
# Send debug messages to syslog instead of stdout
-#CONFIG_DEBUG_SYSLOG=y
+CONFIG_DEBUG_SYSLOG=y
# Add support for sending all debug messages (regardless of debug verbosity)
# to the Linux kernel tracing facility. This helps debug the entire stack by
# making it easy to record everything happening from the driver up into the
# same file, e.g., using trace-cmd.
-CONFIG_DEBUG_LINUX_TRACING=y
+#CONFIG_DEBUG_LINUX_TRACING=y
# Remove support for RADIUS accounting
#CONFIG_NO_ACCOUNTING=y
@@ -249,6 +252,11 @@ CONFIG_VLAN_NETLINK=y
# requirements described above.
#CONFIG_NO_RANDOM_POOL=y
+# Should we attempt to use the getrandom(2) call that provides more reliable
+# yet secure randomness source than /dev/random on Linux 3.17 and newer.
+# Requires glibc 2.25 to build, falls back to /dev/random if unavailable.
+CONFIG_GETRANDOM=y
+
# Should we use poll instead of select? Select is used by default.
#CONFIG_ELOOP_POLL=y
@@ -298,10 +306,10 @@ CONFIG_TLSV12=y
# Interworking (IEEE 802.11u)
# This can be used to enable functionality to improve interworking with
# external networks.
-#CONFIG_INTERWORKING=y
+CONFIG_INTERWORKING=y
# Hotspot 2.0
-#CONFIG_HS20=y
+CONFIG_HS20=y
# Enable SQLite database support in hlr_auc_gw, EAP-SIM DB, and eap_user_file
#CONFIG_SQLITE=y
@@ -356,11 +364,9 @@ CONFIG_ACS=y
#CONFIG_TAXONOMY=y
# Fast Initial Link Setup (FILS) (IEEE 802.11ai)
-# Note: This is an experimental and not yet complete implementation. This
-# should not be enabled for production use.
-#CONFIG_FILS=y
+CONFIG_FILS=y
# FILS shared key authentication with PFS
-#CONFIG_FILS_SK_PFS=y
+CONFIG_FILS_SK_PFS=y
# Include internal line edit mode in hostapd_cli. This can be used to provide
# limited command line editing and history support.
@@ -368,7 +374,13 @@ CONFIG_WPA_CLI_EDIT=y
# Opportunistic Wireless Encryption (OWE)
# Experimental implementation of draft-harkins-owe-07.txt
-#CONFIG_OWE=y
+CONFIG_OWE=y
+
+# Device Provisioning Protocol (DPP)
+CONFIG_DPP=y
+
+# Simultaneous Authentication of Equals (SAE)
+CONFIG_SAE=y
# Override default value for the wpa_disable_eapol_key_retries configuration
# parameter. See that parameter in hostapd.conf for more details.
diff --git a/rules/hostapd.make b/rules/hostapd.make
index ae38acbc7..d17383d21 100644
--- a/rules/hostapd.make
+++ b/rules/hostapd.make
@@ -18,8 +18,8 @@ PACKAGES-$(PTXCONF_HOSTAPD) += hostapd
# Paths and names
#
HOSTAPD_NAME := hostapd
-HOSTAPD_VERSION := 2.7
-HOSTAPD_MD5 := 8d3799f3a3c247cff47d41503698721b
+HOSTAPD_VERSION := 2.8
+HOSTAPD_MD5 := ed2c254e5f400838cb9d8e7b6e43b86c
HOSTAPD := $(HOSTAPD_NAME)-$(HOSTAPD_VERSION)
HOSTAPD_SUFFIX := tar.gz
HOSTAPD_URL := http://w1.fi/releases/$(HOSTAPD).$(HOSTAPD_SUFFIX)
@@ -31,8 +31,8 @@ HOSTAPD_CONFIG = $(call ptx/get-alternative, config/hostapd, defconfig)
HOSTAPD_DOTCONFIG := $(BUILDDIR)/$(HOSTAPD)/$(HOSTAPD_SUBDIR)/.config
HOSTAPD_LICENSE := BSD-3-Clause
HOSTAPD_LICENSE_FILES := \
- file://COPYING;md5=a3791c270ad6bb026707d17bf750e5ef \
- file://README;md5=495cbce6008253de4b4d8f4cdfae9f4f
+ file://COPYING;md5=279b4f5abb9c153c285221855ddb78cc \
+ file://README;md5=e7d3dbb01f75f0b9799e192731d1e1ff
# ----------------------------------------------------------------------------
# Prepare