From: Jouni Malinen <j@w1.fi>
Date: Sat, 22 Mar 2014 21:31:39 +0000 (+0200)
Subject: WPS: Comment out unused AP WEP config write with WPS 2.0
X-Git-Tag: hostap_2_2~481
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=70c35233aeca271b6d3b5677e8e058a53bcd29f0;p=thirdparty%2Fhostap.git

WPS: Comment out unused AP WEP config write with WPS 2.0

The main WPS code rejects WEP parameters, so this code is not used and
can be commented out from WPS 2.0 builds. This is similar to the earlier
commit that commented out in-memory update.

Signed-off-by: Jouni Malinen <j@w1.fi>
---

diff --git a/src/ap/wps_hostapd.c b/src/ap/wps_hostapd.c
index 787d2be52..e0033cedf 100644
--- a/src/ap/wps_hostapd.c
+++ b/src/ap/wps_hostapd.c
@@ -594,6 +594,13 @@ static int hapd_wps_cred_cb(struct hostapd_data *hapd, void *ctx)
 
 		fprintf(nconf, "auth_algs=1\n");
 	} else {
+#ifdef CONFIG_WPS2
+		/*
+		 * WPS 2.0 does not allow WEP to be configured, so no need to
+		 * process that option here either.
+		 */
+		fprintf(nconf, "auth_algs=1\n");
+#else /* CONFIG_WPS2 */
 		if ((cred->auth_type & WPS_AUTH_OPEN) &&
 		    (cred->auth_type & WPS_AUTH_SHARED))
 			fprintf(nconf, "auth_algs=3\n");
@@ -619,6 +626,7 @@ static int hapd_wps_cred_cb(struct hostapd_data *hapd, void *ctx)
 			}
 			fprintf(nconf, "\n");
 		}
+#endif /* CONFIG_WPS2 */
 	}
 
 	fprintf(nconf, "# WPS configuration - END\n");