Dropped support of deprecated authby=eap and eap= options

7 files changed, 1 insertions, 43 deletions

diff --git a/src/starter/args.c b/src/starter/args.c
index 88133dd53..0699eb058 100644
--- a/src/starter/args.c
+++ b/src/starter/args.c
@@ -207,7 +207,6 @@ static const token_info_t token_info[] =
 	{ ARG_ENUM, offsetof(starter_conn_t, aggressive), LST_bool                     },
 	{ ARG_MISC, 0, NULL  /* KW_AUTH */                                             },
 	{ ARG_MISC, 0, NULL  /* KW_AUTHBY */                                           },
-	{ ARG_MISC, 0, NULL  /* KW_EAP */                                              },
 	{ ARG_STR,  offsetof(starter_conn_t, eap_identity), NULL                       },
 	{ ARG_STR,  offsetof(starter_conn_t, aaa_identity), NULL                       },
 	{ ARG_MISC, 0, NULL  /* KW_MOBIKE */                                           },
diff --git a/src/starter/confread.c b/src/starter/confread.c
index 1da4eb025..ce69fd724 100644
--- a/src/starter/confread.c
+++ b/src/starter/confread.c
@@ -22,8 +22,6 @@
 
 #include <freeswan.h>
 
-#include <eap/eap.h>
-
 #include "../pluto/constants.h"
 #include "../pluto/defs.h"
 #include "../pluto/log.h"
@@ -668,7 +666,7 @@ static void load_conn(starter_conn_t *conn, kw_list_t *kw, starter_config_t *cfg
 					{
 						conn->policy |= POLICY_XAUTH_RSASIG | POLICY_ENCRYPT;
 					}
-					else if (streq(value, "xauthpsk") || streq(value, "eap"))
+					else if (streq(value, "xauthpsk"))
 					{
 						conn->policy |= POLICY_XAUTH_PSK | POLICY_ENCRYPT;
 					}
@@ -687,36 +685,6 @@ static void load_conn(starter_conn_t *conn, kw_list_t *kw, starter_config_t *cfg
 				}
 			}
 			break;
-		case KW_EAP:
-		{
-			char *sep;
-
-			/* check for vendor-type format */
-			sep = strchr(kw->value, '-');
-			if (sep)
-			{
-				*(sep++) = '\0';
-				conn->eap_type = atoi(kw->value);
-				conn->eap_vendor = atoi(sep);
-				if (conn->eap_type == 0 || conn->eap_vendor == 0)
-				{
-					plog("# invalid EAP type: %s=%s", kw->entry->name, kw->value);
-					cfg->err++;
-				}
-				break;
-			}
-			conn->eap_type = eap_type_from_string(kw->value);
-			if (conn->eap_type == 0)
-			{
-				conn->eap_type = atoi(kw->value);
-				if (conn->eap_type == 0)
-				{
-					plog("# unknown EAP type: %s=%s", kw->entry->name, kw->value);
-					cfg->err++;
-				}
-			}
-			break;
-		}
 		case KW_MARK:
 			if (!handle_mark(kw->value, &conn->mark_in))
 			{
diff --git a/src/starter/confread.h b/src/starter/confread.h
index 25f37e633..19c404e2e 100644
--- a/src/starter/confread.h
+++ b/src/starter/confread.h
@@ -110,8 +110,6 @@ struct starter_conn {
 		starter_state_t state;
 
 		keyexchange_t   keyexchange;
-		u_int32_t       eap_type;
-		u_int32_t       eap_vendor;
 		char            *eap_identity;
 		char            *aaa_identity;
 		char            *xauth_identity;
diff --git a/src/starter/keywords.h b/src/starter/keywords.h
index 71e31e9f5..3374fa8c7 100644
--- a/src/starter/keywords.h
+++ b/src/starter/keywords.h
@@ -70,7 +70,6 @@ typedef enum {
 	KW_AGGRESSIVE,
 	KW_AUTH,
 	KW_AUTHBY,
-	KW_EAP,
 	KW_EAP_IDENTITY,
 	KW_AAA_IDENTITY,
 	KW_MOBIKE,
diff --git a/src/starter/keywords.txt b/src/starter/keywords.txt
index bd1f9304c..d31fd2461 100644
--- a/src/starter/keywords.txt
+++ b/src/starter/keywords.txt
@@ -47,7 +47,6 @@ nat_traversal,     KW_NAT_TRAVERSAL
 keep_alive,        KW_KEEP_ALIVE
 force_keepalive,   KW_FORCE_KEEPALIVE
 virtual_private,   KW_VIRTUAL_PRIVATE
-eap,               KW_EAP
 eap_identity,      KW_EAP_IDENTITY
 aaa_identity,      KW_AAA_IDENTITY
 mobike,	           KW_MOBIKE
diff --git a/src/stroke/stroke.c b/src/stroke/stroke.c
index 697115a84..e70245362 100644
--- a/src/stroke/stroke.c
+++ b/src/stroke/stroke.c
@@ -139,7 +139,6 @@ static int add_connection(char *name,
 
 	msg.add_conn.name = push_string(&msg, name);
 	msg.add_conn.version = 2;
-	msg.add_conn.auth_method = 2;
 	msg.add_conn.mode = 1;
 	msg.add_conn.mobike = 1;
 	msg.add_conn.dpd.action = 1;
diff --git a/src/stroke/stroke_msg.h b/src/stroke/stroke_msg.h
index 825228e9d..be12cabbe 100644
--- a/src/stroke/stroke_msg.h
+++ b/src/stroke/stroke_msg.h
@@ -240,10 +240,6 @@ struct stroke_msg_t {
 		struct {
 			char *name;
 			int version;
-			/* next three are deprecated, use stroke_end_t.auth instead */
-			int auth_method;
-			u_int32_t eap_type;
-			u_int32_t eap_vendor;
 			char *eap_identity;
 			char *aaa_identity;
 			char *xauth_identity;