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 1b2cf69..8f5108a 100644 (file)
--- a/src/starter/keywords.h
+++ b/src/starter/keywords.h
@@ -25,9 +25,9 @@ typedef enum {
     KW_CHARONSTART,
     KW_PLUTOSTART,
 
     KW_CHARONSTART,
     KW_PLUTOSTART,
 

-       /* pluto/charon keywords */
+    /* pluto/charon keywords */

     KW_PLUTODEBUG,
     KW_PLUTODEBUG,

-       KW_CHARONDEBUG,
+    KW_CHARONDEBUG,

     KW_PREPLUTO,
     KW_POSTPLUTO,
     KW_UNIQUEIDS,
     KW_PREPLUTO,
     KW_POSTPLUTO,
     KW_UNIQUEIDS,


@@ -39,7 +39,9 @@ typedef enum {
     KW_NAT_TRAVERSAL,
     KW_KEEP_ALIVE,
     KW_VIRTUAL_PRIVATE,
     KW_NAT_TRAVERSAL,
     KW_KEEP_ALIVE,
     KW_VIRTUAL_PRIVATE,

+    KW_EAPDIR,

     KW_PKCS11MODULE,
     KW_PKCS11MODULE,

+    KW_PKCS11INITARGS,

     KW_PKCS11KEEPSTATE,
     KW_PKCS11PROXY,
 
     KW_PKCS11KEEPSTATE,
     KW_PKCS11PROXY,
 


@@ -67,12 +69,14 @@ typedef enum {
     KW_COMPRESS,
     KW_AUTH,
     KW_AUTHBY,
     KW_COMPRESS,
     KW_AUTH,
     KW_AUTHBY,

+    KW_EAP,

     KW_IKELIFETIME,
     KW_KEYLIFE,
     KW_REKEYMARGIN,
     KW_KEYINGTRIES,
     KW_REKEYFUZZ,
     KW_REKEY,
     KW_IKELIFETIME,
     KW_KEYLIFE,
     KW_REKEYMARGIN,
     KW_KEYINGTRIES,
     KW_REKEYFUZZ,
     KW_REKEY,

+    KW_REAUTH,

     KW_IKE,
     KW_ESP,
     KW_PFSGROUP,
     KW_IKE,
     KW_ESP,
     KW_PFSGROUP,


@@ -80,9 +84,10 @@ typedef enum {
     KW_DPDTIMEOUT,
     KW_DPDACTION,
     KW_MODECONFIG,
     KW_DPDTIMEOUT,
     KW_DPDACTION,
     KW_MODECONFIG,

+    KW_XAUTH,

 
 #define KW_CONN_FIRST  KW_CONN_SETUP
 
 #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,
 
    /* ca section keywords */
     KW_CA_NAME,


@@ -93,9 +98,10 @@ typedef enum {
     KW_CRLURI,
     KW_CRLURI2,
     KW_OCSPURI,
     KW_CRLURI,
     KW_CRLURI2,
     KW_OCSPURI,

+    KW_OCSPURI2,

 
 #define KW_CA_FIRST    KW_CA_SETUP
 
 #define KW_CA_FIRST    KW_CA_SETUP

-#define KW_CA_LAST     KW_OCSPURI
+#define KW_CA_LAST     KW_OCSPURI2

 
    /* end keywords */
     KW_HOST,
 
    /* end keywords */
     KW_HOST,


@@ -107,6 +113,7 @@ typedef enum {
     KW_NATIP,
     KW_FIREWALL,
     KW_HOSTACCESS,
     KW_NATIP,
     KW_FIREWALL,
     KW_HOSTACCESS,

+    KW_ALLOWANY,

     KW_UPDOWN,
     KW_ID,
     KW_RSASIGKEY,
     KW_UPDOWN,
     KW_ID,
     KW_RSASIGKEY,


@@ -129,6 +136,7 @@ typedef enum {
     KW_LEFTNATIP,
     KW_LEFTFIREWALL,
     KW_LEFTHOSTACCESS,
     KW_LEFTNATIP,
     KW_LEFTFIREWALL,
     KW_LEFTHOSTACCESS,

+    KW_LEFTALLOWANY,

     KW_LEFTUPDOWN,
     KW_LEFTID,
     KW_LEFTRSASIGKEY,
     KW_LEFTUPDOWN,
     KW_LEFTID,
     KW_LEFTRSASIGKEY,


@@ -150,6 +158,7 @@ typedef enum {
     KW_RIGHTNATIP,
     KW_RIGHTFIREWALL,
     KW_RIGHTHOSTACCESS,
     KW_RIGHTNATIP,
     KW_RIGHTFIREWALL,
     KW_RIGHTHOSTACCESS,

+    KW_RIGHTALLOWANY,

     KW_RIGHTUPDOWN,
     KW_RIGHTID,
     KW_RIGHTRSASIGKEY,
     KW_RIGHTUPDOWN,
     KW_RIGHTID,
     KW_RIGHTRSASIGKEY,