From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Thu, 12 Aug 2010 21:57:42 +0000 (+0200)
Subject: recognize eap-ttls method
X-Git-Tag: 4.5.0~526
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4412ee86c57366ee9af6643e7058e2cf12110007;p=thirdparty%2Fstrongswan.git

recognize eap-ttls method
---

diff --git a/src/libcharon/sa/authenticators/eap/eap_method.c b/src/libcharon/sa/authenticators/eap/eap_method.c
index 9d6aba51ef..45c7a8ca6f 100644
--- a/src/libcharon/sa/authenticators/eap/eap_method.c
+++ b/src/libcharon/sa/authenticators/eap/eap_method.c
@@ -30,6 +30,7 @@ eap_type_t eap_type_from_string(char *name)
 		{"otp",			EAP_OTP},
 		{"gtc",			EAP_GTC},
 		{"tls",			EAP_TLS},
+		{"ttls",		EAP_TTLS},
 		{"sim",			EAP_SIM},
 		{"aka",			EAP_AKA},
 		{"mschapv2",	EAP_MSCHAPV2},
diff --git a/src/starter/confread.c b/src/starter/confread.c
index 236183dc43..b0ee8b389a 100644
--- a/src/starter/confread.c
+++ b/src/starter/confread.c
@@ -691,6 +691,10 @@ static void load_conn(starter_conn_t *conn, kw_list_t *kw, starter_config_t *cfg
 			{
 				conn->eap_type = 13;
 			}
+			else if (streq(kw->value, "ttls"))
+			{
+				conn->eap_type = 21;
+			}
 			else if (streq(kw->value, "mschapv2"))
 			{
 				conn->eap_type = 26;