From: Martin Willi <martin@revosec.ch>
Date: Thu, 20 Jun 2013 14:08:23 +0000 (+0200)
Subject: starter: Add an 'ah' keyword for Authentication Header Security Associations
X-Git-Tag: 5.1.1rc1~48^2~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a07b97e8042752c7b1b85828dc2bfcf60d49a0da;p=thirdparty%2Fstrongswan.git

starter: Add an 'ah' keyword for Authentication Header Security Associations
---

diff --git a/src/starter/args.c b/src/starter/args.c
index 5fbf51856b..9672c66db0 100644
--- a/src/starter/args.c
+++ b/src/starter/args.c
@@ -161,6 +161,7 @@ static const token_info_t token_info[] =
 	{ ARG_MISC, 0, NULL  /* KW_REAUTH */                                           },
 	{ ARG_STR,  offsetof(starter_conn_t, ike), NULL                                },
 	{ ARG_STR,  offsetof(starter_conn_t, esp), NULL                                },
+	{ ARG_STR,  offsetof(starter_conn_t, ah), NULL                                 },
 	{ ARG_TIME, offsetof(starter_conn_t, dpd_delay), NULL                          },
 	{ ARG_TIME, offsetof(starter_conn_t, dpd_timeout), NULL                        },
 	{ ARG_ENUM, offsetof(starter_conn_t, dpd_action), LST_dpd_action               },
diff --git a/src/starter/confread.h b/src/starter/confread.h
index 0690bed4e4..27e6fcdd97 100644
--- a/src/starter/confread.h
+++ b/src/starter/confread.h
@@ -171,6 +171,7 @@ struct starter_conn {
 		unsigned long   id;
 
 		char            *esp;
+		char            *ah;
 		char            *ike;
 
 		time_t          dpd_delay;
diff --git a/src/starter/keywords.h b/src/starter/keywords.h
index 83ce4a7ddf..32815e2f6c 100644
--- a/src/starter/keywords.h
+++ b/src/starter/keywords.h
@@ -57,6 +57,7 @@ typedef enum {
 	KW_REAUTH,
 	KW_IKE,
 	KW_ESP,
+	KW_AH,
 	KW_DPDDELAY,
 	KW_DPDTIMEOUT,
 	KW_DPDACTION,
diff --git a/src/starter/keywords.txt b/src/starter/keywords.txt
index 20d35ded06..eb977f5f8c 100644
--- a/src/starter/keywords.txt
+++ b/src/starter/keywords.txt
@@ -57,6 +57,7 @@ rekey,             KW_REKEY
 reauth,            KW_REAUTH
 ike,               KW_IKE
 esp,               KW_ESP
+ah,                KW_AH
 dpddelay,          KW_DPDDELAY
 dpdtimeout,        KW_DPDTIMEOUT
 dpdaction,         KW_DPDACTION
diff --git a/src/starter/starterstroke.c b/src/starter/starterstroke.c
index bf7e0284fd..fca4b1e7dc 100644
--- a/src/starter/starterstroke.c
+++ b/src/starter/starterstroke.c
@@ -192,6 +192,7 @@ int starter_stroke_add_conn(starter_config_t *cfg, starter_conn_t *conn)
 	msg.add_conn.unique = cfg->setup.uniqueids;
 	msg.add_conn.algorithms.ike = push_string(&msg, conn->ike);
 	msg.add_conn.algorithms.esp = push_string(&msg, conn->esp);
+	msg.add_conn.algorithms.ah = push_string(&msg, conn->ah);
 	msg.add_conn.dpd.delay = conn->dpd_delay;
 	msg.add_conn.dpd.timeout = conn->dpd_timeout;
 	msg.add_conn.dpd.action = conn->dpd_action;
diff --git a/src/stroke/stroke_msg.h b/src/stroke/stroke_msg.h
index 6c8dcf5f93..5ece7248bf 100644
--- a/src/stroke/stroke_msg.h
+++ b/src/stroke/stroke_msg.h
@@ -275,6 +275,7 @@ struct stroke_msg_t {
 			struct {
 				char *ike;
 				char *esp;
+				char *ah;
 			} algorithms;
 			struct {
 				int reauth;