wpa_supplicant: bump to version 2.2

index 74145f1..5cb3f1b 100644
@@ -7,11 +7,35 @@ config BR2_PACKAGE_WPA_SUPPLICANT
 
 if BR2_PACKAGE_WPA_SUPPLICANT
 
+config BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT
+	bool "Enable AP mode"
+	help
+	  With this option enabled, wpa_supplicant can act as an
+	  access point much like hostapd does with a limited feature set.
+	  This links in parts of hostapd functionality into wpa_supplicant,
+	  making it bigger but dispensing the need for a separate hostapd
+	  binary in some applications hence being smaller overall.
+
 config BR2_PACKAGE_WPA_SUPPLICANT_EAP
 	bool "Enable EAP"
 	help
 	  Enable support for EAP.
 
+config BR2_PACKAGE_WPA_SUPPLICANT_HOTSPOT
+	bool "Enable HS20"
+	help
+	  Enable Hotspot 2.0 and IEEE 802.11u interworking functionality.
+
+config BR2_PACKAGE_WPA_SUPPLICANT_DEBUG_SYSLOG
+        bool "Enable syslog support"
+	help
+	  Enable support for sending debug messages to syslog.
+
+config BR2_PACKAGE_WPA_SUPPLICANT_WPS
+	bool "Enable WPS"
+	help
+	  Enable support for Wi-Fi Protected Setup (WPS).
+
 config BR2_PACKAGE_WPA_SUPPLICANT_CLI
 	bool "Install wpa_cli binary"
 	help

@@ -20,15 +44,7 @@ config BR2_PACKAGE_WPA_SUPPLICANT_CLI
 config BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE
 	bool "Install wpa_passphrase binary"
 	help
-	  Install wpa_passphrase command line utility
-
-config BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT
-	bool "Enable support for soft AP"
-	help
-	  With this option enabled, wpa_supplicant can act as
-	  access point. This can be used for open and WPA2-Personal networks
-	  (optionally, with WPS); this links in parts of hostapd functionality
-	  into wpa_supplicant.
+	  Install wpa_passphrase command line utility.
 
 config BR2_PACKAGE_WPA_SUPPLICANT_DBUS_OLD
 	bool "Enable support for old DBus control interface"

@@ -49,14 +65,4 @@ config BR2_PACKAGE_WPA_SUPPLICANT_DBUS_INTROSPECTION
 	help
 	  Add introspection support for new DBus control interface.
 
-config BR2_PACKAGE_WPA_SUPPLICANT_DEBUG_SYSLOG
-	bool "Enable syslog support"
-	help
-	  Enable support for sending debug messages to syslog
-
-config BR2_PACKAGE_WPA_SUPPLICANT_WPS
-	bool "Enable support for WPS"
-	help
-	  Enable support for Wi-Fi Protected Setup (WPS)
-
 endif

121 lines not on this page · raw message

deleted file mode 100644
index 5a5b0c3..0000000
@@ -1,38 +0,0 @@
-From 9c29d48725fd40a82407a89f193cf009aeef9745 Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <[email protected]>
-Date: Mon, 19 May 2014 23:25:38 +0300
-Subject: [PATCH] X.509: Fix internal TLS/X.509 validation of PKCS#1
- signature
-
-Verify that there is no extra data after the hash field. This is needed
-to avoid potential attacks using additional data to construct a value
-that passes the RSA operation and allows the hash value to be forged.
-
-Signed-off-by: Jouni Malinen <[email protected]>
----
- src/tls/x509v3.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/src/tls/x509v3.c b/src/tls/x509v3.c
-index a9483cb7fc2f..751a268e1caf 100644
---- a/src/tls/x509v3.c
-+++ b/src/tls/x509v3.c
-@@ -1783,6 +1783,15 @@ skip_digest_oid:
- 		return -1;
- 	}
- 
-+	if (hdr.payload + hdr.length < data + data_len) {
-+		wpa_hexdump(MSG_INFO,
-+			    "X509: Extra data after certificate signature hash",
-+			    hdr.payload + hdr.length,
-+			    data + data_len - hdr.payload - hdr.length);
-+		os_free(data);
-+		return -1;
-+	}
-+
- 	os_free(data);
- 
- 	wpa_printf(MSG_DEBUG, "X509: Certificate Digest matches with "
--- 
-2.0.0.rc2
-

67 lines not on this page · raw message

deleted file mode 100644
index 7862de7..0000000
@@ -1,35 +0,0 @@
-From 6c5be116dd6997f68e524247751cff53c74519d7 Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <[email protected]>
-Date: Mon, 19 May 2014 23:26:43 +0300
-Subject: [PATCH] PKCS #1: Enforce minimum padding for decryption in
- internal TLS
-
-Follow the PKCS #1 v1.5, 8.1 constraint of at least eight octets long PS
-for the case where the internal TLS implementation decrypts PKCS #1
-formatted data. Similar limit was already in place for signature
-validation, but not for this decryption routine.
-
-Signed-off-by: Jouni Malinen <[email protected]>
----
- src/tls/pkcs1.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/tls/pkcs1.c b/src/tls/pkcs1.c
-index af58a42987c6..ea3e6171a1d1 100644
---- a/src/tls/pkcs1.c
-+++ b/src/tls/pkcs1.c
-@@ -113,6 +113,11 @@ int pkcs1_v15_private_key_decrypt(struct crypto_rsa_key *key,
- 		pos++;
- 	if (pos == end)
- 		return -1;
-+	if (pos - out - 2 < 8) {
-+		/* PKCS #1 v1.5, 8.1: At least eight octets long PS */
-+		wpa_printf(MSG_INFO, "LibTomCrypt: Too short padding");
-+		return -1;
-+	}
- 	pos++;
- 
- 	*outlen -= pos - out;
--- 
-2.0.0.rc2
-

index 9321f08..2df4f5e 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WPA_SUPPLICANT_VERSION = 2.1
+WPA_SUPPLICANT_VERSION = 2.2
 WPA_SUPPLICANT_SITE = http://hostap.epitest.fi/releases
 WPA_SUPPLICANT_LICENSE = GPLv2/BSD-3c
 WPA_SUPPLICANT_LICENSE_FILES = README

@@ -20,10 +20,10 @@ WPA_SUPPLICANT_CONFIG_EDITS =
 WPA_SUPPLICANT_CONFIG_SET =
 
 WPA_SUPPLICANT_CONFIG_ENABLE = \
+	CONFIG_ELOOP_EPOLL	\
 	CONFIG_IEEE80211AC	\
 	CONFIG_IEEE80211N	\
 	CONFIG_IEEE80211R	\
-	CONFIG_INTERWORKING	\
 	CONFIG_INTERNAL_LIBTOMMATH
 
 WPA_SUPPLICANT_CONFIG_DISABLE = \

@@ -49,6 +49,11 @@ else
 	WPA_SUPPLICANT_CONFIG_DISABLE += CONFIG_EAP
 endif
 
+ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_HOTSPOT),y)
+	WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_HS20 \
+		CONFIG_INTERWORKING
+endif
+
 ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT),y)
 	WPA_SUPPLICANT_CONFIG_ENABLE += \
 		CONFIG_AP \