From 15b050c9452660c37d700a412ad54850e4229dc1 Mon Sep 17 00:00:00 2001
From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Tue, 5 Dec 2006 23:13:02 +0000
Subject: [PATCH] added XAUTH support

---
 src/starter/args.c       |  1 +
 src/starter/confread.c   | 11 +++++++++--
 src/starter/keywords.h   |  3 ++-
 src/starter/keywords.txt |  1 +
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/starter/args.c b/src/starter/args.c
index ad37b1942..a784ac032 100644
--- a/src/starter/args.c
+++ b/src/starter/args.c
@@ -197,6 +197,7 @@ static const token_info_t token_info[] =
     { ARG_TIME, offsetof(starter_conn_t, dpd_timeout), NULL                        },
     { ARG_ENUM, offsetof(starter_conn_t, dpd_action), LST_dpd_action               },
     { ARG_MISC, 0, NULL  /* KW_MODECONFIG */                                       },
+    { ARG_MISC, 0, NULL  /* KW_XAUTH */                                            },
 
     /* ca section keywords */
     { ARG_STR,  offsetof(starter_ca_t, name), NULL                                 },
diff --git a/src/starter/confread.c b/src/starter/confread.c
index 93b8beeb3..6041d697f 100644
--- a/src/starter/confread.c
+++ b/src/starter/confread.c
@@ -410,7 +410,7 @@ load_conn(starter_conn_t *conn, kw_list_t *kw, starter_config_t *cfg)
 			KW_POLICY_FLAG("ah", "esp", POLICY_AUTHENTICATE)
 			break; 
 		case KW_AUTHBY:
-			conn->policy &= ~(POLICY_RSASIG | POLICY_PSK | POLICY_ENCRYPT);
+			conn->policy &= ~(POLICY_ID_AUTH_MASK | POLICY_ENCRYPT);
 
 			if (strcmp(kw->value, "never") != 0)
 			{
@@ -425,8 +425,12 @@ load_conn(starter_conn_t *conn, kw_list_t *kw, starter_config_t *cfg)
 				{
 					if (streq(value, "rsasig"))
 						conn->policy |= POLICY_RSASIG | POLICY_ENCRYPT;
-					else if (streq(value, "secret"))
+					else if (streq(value, "secret") || streq(value, "psk"))
 						conn->policy |= POLICY_PSK | POLICY_ENCRYPT;
+					else if (streq(value, "xauthrsasig"))
+						conn->policy |= POLICY_XAUTH_RSASIG | POLICY_ENCRYPT;
+					else if (streq(value, "xauthpsk"))
+						conn->policy |= POLICY_XAUTH_PSK | POLICY_ENCRYPT;
 					else
 					{
 						plog("# bad policy value: %s=%s", kw->entry->name, kw->value);
@@ -446,6 +450,9 @@ load_conn(starter_conn_t *conn, kw_list_t *kw, starter_config_t *cfg)
 		case KW_MODECONFIG:
 			KW_POLICY_FLAG("push", "pull", POLICY_MODECFG_PUSH)
 			break;
+		case KW_XAUTH:
+			KW_POLICY_FLAG("server", "client", POLICY_XAUTH_SERVER)
+			break;
 		default:
 			break;
 		}
diff --git a/src/starter/keywords.h b/src/starter/keywords.h
index 1b2cf69c6..eac737567 100644
--- a/src/starter/keywords.h
+++ b/src/starter/keywords.h
@@ -80,9 +80,10 @@ typedef enum {
     KW_DPDTIMEOUT,
     KW_DPDACTION,
     KW_MODECONFIG,
+    KW_XAUTH,
 
 #define KW_CONN_FIRST	KW_CONN_SETUP
-#define KW_CONN_LAST	KW_MODECONFIG
+#define KW_CONN_LAST	KW_XAUTH
 
    /* ca section keywords */
     KW_CA_NAME,
diff --git a/src/starter/keywords.txt b/src/starter/keywords.txt
index bc5ef4449..6e700f175 100644
--- a/src/starter/keywords.txt
+++ b/src/starter/keywords.txt
@@ -69,6 +69,7 @@ dpddelay,          KW_DPDDELAY
 dpdtimeout,        KW_DPDTIMEOUT
 dpdaction,         KW_DPDACTION
 modeconfig,        KW_MODECONFIG
+xauth,             KW_XAUTH
 cacert,            KW_CACERT
 ldaphost,          KW_LDAPHOST
 ldapbase,          KW_LDAPBASE