[PATCH] Remove FreeRADIUS workaround from default configuration

[Dmitry Shmidt]

Signed-off-by: Dmitry Shmidt <dimitrysh at google.com>
---
 src/eap_peer/eap_config.h    | 2 ++
 src/eap_peer/eap_ttls.c      | 2 +-
 wpa_supplicant/config_ssid.h | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/eap_peer/eap_config.h b/src/eap_peer/eap_config.h
index 2591e11..f7d37c2 100644
--- a/src/eap_peer/eap_config.h
+++ b/src/eap_peer/eap_config.h
@@ -9,6 +9,8 @@
 #ifndef EAP_CONFIG_H
 #define EAP_CONFIG_H
 
+#define EAP_WORKAROUND_FREERADIUS BIT(0)
+
 /**
  * struct eap_peer_config - EAP peer configuration/credentials
  */
diff --git a/src/eap_peer/eap_ttls.c b/src/eap_peer/eap_ttls.c
index e110236..65a20cc 100644
--- a/src/eap_peer/eap_ttls.c
+++ b/src/eap_peer/eap_ttls.c
@@ -501,7 +501,7 @@ static int eap_ttls_phase2_request_mschapv2(struct eap_sm *sm,
 	wpabuf_put(msg, pos - buf);
 	*resp = msg;
 
-	if (sm->workaround) {
+	if (sm->workaround & EAP_WORKAROUND_FREERADIUS) {
 		/* At least FreeRADIUS seems to be terminating
 		 * EAP-TTLS/MSHCAPV2 without the expected MS-CHAP-v2 Success
 		 * packet. */
diff --git a/wpa_supplicant/config_ssid.h b/wpa_supplicant/config_ssid.h
index ab474ff..dfed662 100644
--- a/wpa_supplicant/config_ssid.h
+++ b/wpa_supplicant/config_ssid.h
@@ -16,7 +16,8 @@
 #define MAX_SSID_LEN 32
 
 
-#define DEFAULT_EAP_WORKAROUND ((unsigned int) -1)
+#define DEFAULT_EAP_WORKAROUND (((unsigned int) -1) & \
+				~EAP_WORKAROUND_FREERADIUS)
 #define DEFAULT_EAPOL_FLAGS (EAPOL_FLAG_REQUIRE_KEY_UNICAST | \
 			     EAPOL_FLAG_REQUIRE_KEY_BROADCAST)
 #define DEFAULT_PROTO (WPA_PROTO_WPA | WPA_PROTO_RSN)
-- 
2.0.0.526.g5318336