support of PKCS#11 init arguments required by NSS softoken, patch contributed by...

[strongswan.git] / src / starter / keywords.h

diff --git a/src/starter/keywords.h b/src/starter/keywords.h
index d62a83d..8f5108a 100644 (file)
--- a/src/starter/keywords.h
+++ b/src/starter/keywords.h
@@ -25,8 +25,9 @@ typedef enum {
     KW_CHARONSTART,
     KW_PLUTOSTART,
 
-    /* pluto keywords */
+    /* pluto/charon keywords */
     KW_PLUTODEBUG,
+    KW_CHARONDEBUG,
     KW_PREPLUTO,
     KW_POSTPLUTO,
     KW_UNIQUEIDS,
@@ -38,7 +39,9 @@ typedef enum {
     KW_NAT_TRAVERSAL,
     KW_KEEP_ALIVE,
     KW_VIRTUAL_PRIVATE,
+    KW_EAPDIR,
     KW_PKCS11MODULE,
+    KW_PKCS11INITARGS,
     KW_PKCS11KEEPSTATE,
     KW_PKCS11PROXY,
 
@@ -66,21 +69,25 @@ typedef enum {
     KW_COMPRESS,
     KW_AUTH,
     KW_AUTHBY,
+    KW_EAP,
     KW_IKELIFETIME,
     KW_KEYLIFE,
     KW_REKEYMARGIN,
     KW_KEYINGTRIES,
     KW_REKEYFUZZ,
     KW_REKEY,
+    KW_REAUTH,
     KW_IKE,
     KW_ESP,
     KW_PFSGROUP,
     KW_DPDDELAY,
     KW_DPDTIMEOUT,
     KW_DPDACTION,
+    KW_MODECONFIG,
+    KW_XAUTH,
 
 #define KW_CONN_FIRST  KW_CONN_SETUP
-#define KW_CONN_LAST   KW_DPDACTION
+#define KW_CONN_LAST   KW_XAUTH
 
    /* ca section keywords */
     KW_CA_NAME,
@@ -91,9 +98,10 @@ typedef enum {
     KW_CRLURI,
     KW_CRLURI2,
     KW_OCSPURI,
+    KW_OCSPURI2,
 
 #define KW_CA_FIRST    KW_CA_SETUP
-#define KW_CA_LAST     KW_OCSPURI
+#define KW_CA_LAST     KW_OCSPURI2
 
    /* end keywords */
     KW_HOST,
@@ -102,8 +110,10 @@ typedef enum {
     KW_SUBNETWITHIN,
     KW_PROTOPORT,
     KW_SOURCEIP,
+    KW_NATIP,
     KW_FIREWALL,
     KW_HOSTACCESS,
+    KW_ALLOWANY,
     KW_UPDOWN,
     KW_ID,
     KW_RSASIGKEY,
@@ -123,8 +133,10 @@ typedef enum {
     KW_LEFTSUBNETWITHIN,
     KW_LEFTPROTOPORT,
     KW_LEFTSOURCEIP,
+    KW_LEFTNATIP,
     KW_LEFTFIREWALL,
     KW_LEFTHOSTACCESS,
+    KW_LEFTALLOWANY,
     KW_LEFTUPDOWN,
     KW_LEFTID,
     KW_LEFTRSASIGKEY,
@@ -143,8 +155,10 @@ typedef enum {
     KW_RIGHTSUBNETWITHIN,
     KW_RIGHTPROTOPORT,
     KW_RIGHTSOURCEIP,
+    KW_RIGHTNATIP,
     KW_RIGHTFIREWALL,
     KW_RIGHTHOSTACCESS,
+    KW_RIGHTALLOWANY,
     KW_RIGHTUPDOWN,
     KW_RIGHTID,
     KW_RIGHTRSASIGKEY,