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 9d6aba51efa803e6b20f5fb140df5ddc0783f7ab..45c7a8ca6f972c15ec981083c776bd6edee877b2 100644 (file)
--- 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 236183dc43c0d03eb3b2b53171c857c3e156d7c3..b0ee8b389a1db40b3fd41d0f835fd977bca31f37 100644 (file)
--- 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;