[svn-upgrade] new version strongswan (4.4.1)

1 files changed, 130 insertions, 126 deletions

diff --git a/src/starter/keywords.c b/src/starter/keywords.c
index df39f0dc7..1d7cae00b 100644
--- a/src/starter/keywords.c
+++ b/src/starter/keywords.c
@@ -54,12 +54,12 @@ struct kw_entry {
     kw_token_t token;
 };
 
-#define TOTAL_KEYWORDS 121
+#define TOTAL_KEYWORDS 126
 #define MIN_WORD_LENGTH 3
 #define MAX_WORD_LENGTH 17
-#define MIN_HASH_VALUE 11
-#define MAX_HASH_VALUE 230
-/* maximum key range = 220, duplicates = 0 */
+#define MIN_HASH_VALUE 20
+#define MAX_HASH_VALUE 220
+/* maximum key range = 201, duplicates = 0 */
 
 #ifdef __GNUC__
 __inline
@@ -75,32 +75,32 @@ hash (str, len)
 {
   static const unsigned char asso_values[] =
     {
-      231, 231, 231, 231, 231, 231, 231, 231, 231, 231,
-      231, 231, 231, 231, 231, 231, 231, 231, 231, 231,
-      231, 231, 231, 231, 231, 231, 231, 231, 231, 231,
-      231, 231, 231, 231, 231, 231, 231, 231, 231, 231,
-      231, 231, 231, 231, 231, 231, 231, 231, 231,  26,
-       75, 231, 231, 231, 231, 231, 231, 231, 231, 231,
-      231, 231, 231, 231, 231, 231, 231, 231, 231, 231,
-      231, 231, 231, 231, 231, 231, 231, 231, 231, 231,
-      231, 231, 231, 231, 231, 231, 231, 231, 231, 231,
-      231, 231, 231, 231, 231,   2, 231,  25, 231,  40,
-       61,   2, 114,  24,   3,   2, 231, 101,   2,  96,
-       48,  35,  23, 231,   4,  10,   3,  69,  25, 231,
-        2,  18,  16, 231, 231, 231, 231, 231, 231, 231,
-      231, 231, 231, 231, 231, 231, 231, 231, 231, 231,
-      231, 231, 231, 231, 231, 231, 231, 231, 231, 231,
-      231, 231, 231, 231, 231, 231, 231, 231, 231, 231,
-      231, 231, 231, 231, 231, 231, 231, 231, 231, 231,
-      231, 231, 231, 231, 231, 231, 231, 231, 231, 231,
-      231, 231, 231, 231, 231, 231, 231, 231, 231, 231,
-      231, 231, 231, 231, 231, 231, 231, 231, 231, 231,
-      231, 231, 231, 231, 231, 231, 231, 231, 231, 231,
-      231, 231, 231, 231, 231, 231, 231, 231, 231, 231,
-      231, 231, 231, 231, 231, 231, 231, 231, 231, 231,
-      231, 231, 231, 231, 231, 231, 231, 231, 231, 231,
-      231, 231, 231, 231, 231, 231, 231, 231, 231, 231,
-      231, 231, 231, 231, 231, 231
+      221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
+      221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
+      221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
+      221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
+      221, 221, 221, 221, 221, 221, 221, 221, 221,  35,
+       77, 221, 221, 221, 221, 221, 221, 221, 221, 221,
+      221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
+      221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
+      221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
+      221, 221, 221, 221, 221,   8, 221,  31, 221,  20,
+       28,   5,  75,  26,  88,   5, 221,  97,   5,  50,
+       39,  67,  29, 221,   7,  13,   6,  89,  15, 221,
+        5,  24,   7, 221, 221, 221, 221, 221, 221, 221,
+      221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
+      221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
+      221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
+      221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
+      221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
+      221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
+      221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
+      221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
+      221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
+      221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
+      221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
+      221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
+      221, 221, 221, 221, 221, 221
     };
   register int hval = len;
 
@@ -128,7 +128,6 @@ static const struct kw_entry wordlist[] =
     {"right",             KW_RIGHT},
     {"lifetime",          KW_KEYLIFE},
     {"leftcert",          KW_LEFTCERT,},
-    {"reauth",            KW_REAUTH},
     {"leftfirewall",      KW_LEFTFIREWALL},
     {"leftsendcert",      KW_LEFTSENDCERT},
     {"rightikeport",      KW_RIGHTIKEPORT},
@@ -137,142 +136,147 @@ static const struct kw_entry wordlist[] =
     {"leftgroups",        KW_LEFTGROUPS},
     {"rekey",             KW_REKEY},
     {"rightsubnet",       KW_RIGHTSUBNET},
+    {"crluri",            KW_CRLURI},
     {"rightsendcert",     KW_RIGHTSENDCERT},
-    {"righthostaccess",   KW_RIGHTHOSTACCESS},
-    {"xauth",             KW_XAUTH},
-    {"leftallowany",      KW_LEFTALLOWANY},
+    {"reqid",             KW_REQID},
+    {"rightcert",         KW_RIGHTCERT},
+    {"certuribase",       KW_CERTURIBASE},
     {"esp",               KW_ESP},
+    {"leftallowany",      KW_LEFTALLOWANY},
+    {"rightid",           KW_RIGHTID},
+    {"crlcheckinterval",  KW_CRLCHECKINTERVAL},
     {"leftnexthop",       KW_LEFTNEXTHOP},
     {"lifebytes",         KW_LIFEBYTES},
     {"rightrsasigkey",    KW_RIGHTRSASIGKEY},
-    {"rightauth",         KW_RIGHTAUTH},
     {"leftrsasigkey",     KW_LEFTRSASIGKEY},
     {"rightprotoport",    KW_RIGHTPROTOPORT},
+    {"rightgroups",       KW_RIGHTGROUPS},
     {"plutostart",        KW_PLUTOSTART},
     {"strictcrlpolicy",   KW_STRICTCRLPOLICY},
     {"lifepackets",       KW_LIFEPACKETS},
-    {"rightgroups",       KW_RIGHTGROUPS},
     {"rightsourceip",     KW_RIGHTSOURCEIP},
     {"eap",               KW_EAP},
-    {"crluri",            KW_CRLURI},
-    {"hidetos",           KW_HIDETOS},
-    {"rightcert",         KW_RIGHTCERT},
-    {"certuribase",       KW_CERTURIBASE},
-    {"leftca",            KW_LEFTCA},
-    {"leftnatip",         KW_LEFTNATIP},
-    {"rightallowany",     KW_RIGHTALLOWANY},
-    {"lefthostaccess",    KW_LEFTHOSTACCESS},
-    {"crlcheckinterval",  KW_CRLCHECKINTERVAL},
-    {"also",              KW_ALSO},
-    {"packetdefault",     KW_PACKETDEFAULT},
-    {"virtual_private",   KW_VIRTUAL_PRIVATE},
-    {"plutostderrlog",    KW_PLUTOSTDERRLOG},
-    {"leftsourceip",      KW_LEFTSOURCEIP},
-    {"rightid",           KW_RIGHTID},
     {"cacert",            KW_CACERT},
     {"rightca",           KW_RIGHTCA},
+    {"virtual_private",   KW_VIRTUAL_PRIVATE},
+    {"leftid",            KW_LEFTID},
     {"crluri1",           KW_CRLURI},
-    {"inactivity",        KW_INACTIVITY},
+    {"ldapbase",          KW_LDAPBASE},
+    {"leftca",            KW_LEFTCA},
+    {"leftnatip",         KW_LEFTNATIP},
+    {"rightallowany",     KW_RIGHTALLOWANY},
     {"rightsubnetwithin", KW_RIGHTSUBNETWITHIN},
+    {"xauth_identity",    KW_XAUTH_IDENTITY},
+    {"inactivity",        KW_INACTIVITY},
+    {"packetdefault",     KW_PACKETDEFAULT},
     {"installpolicy",     KW_INSTALLPOLICY},
-    {"leftauth",          KW_LEFTAUTH},
+    {"plutostderrlog",    KW_PLUTOSTDERRLOG},
     {"leftupdown",        KW_LEFTUPDOWN},
-    {"leftsubnet",        KW_LEFTSUBNET},
     {"rightnatip",        KW_RIGHTNATIP},
-    {"ocspuri",           KW_OCSPURI},
     {"rightnexthop",      KW_RIGHTNEXTHOP},
+    {"cachecrls",         KW_CACHECRLS},
+    {"dpddelay",          KW_DPDDELAY},
+    {"nat_traversal",     KW_NAT_TRAVERSAL},
+    {"mediated_by",       KW_MEDIATED_BY},
+    {"me_peerid",         KW_ME_PEERID},
+    {"plutodebug",        KW_PLUTODEBUG},
+    {"eap_identity",      KW_EAP_IDENTITY},
     {"leftcert2",         KW_LEFTCERT2,},
     {"rightid2",          KW_RIGHTID2},
-    {"nat_traversal",     KW_NAT_TRAVERSAL},
-    {"compress",          KW_COMPRESS},
-    {"ldapbase",          KW_LDAPBASE},
-    {"auth",              KW_AUTH},
-    {"postpluto",         KW_POSTPLUTO},
-    {"charonstart",       KW_CHARONSTART},
+    {"rekeyfuzz",         KW_REKEYFUZZ},
+    {"lefthostaccess",    KW_LEFTHOSTACCESS},
+    {"rightfirewall",     KW_RIGHTFIREWALL},
+    {"ocspuri",           KW_OCSPURI},
+    {"also",              KW_ALSO},
+    {"mediation",         KW_MEDIATION},
     {"ike",               KW_IKE},
+    {"dpdaction",         KW_DPDACTION},
+    {"rekeymargin",       KW_REKEYMARGIN},
+    {"compress",          KW_COMPRESS},
     {"ldaphost",          KW_LDAPHOST},
-    {"leftca2",           KW_LEFTCA2},
-    {"dpddelay",          KW_DPDDELAY},
-    {"ocspuri1",          KW_OCSPURI},
-    {"rightauth2",        KW_RIGHTAUTH2},
-    {"eap_identity",      KW_EAP_IDENTITY},
-    {"leftikeport",       KW_LEFTIKEPORT},
-    {"plutodebug",        KW_PLUTODEBUG},
-    {"cachecrls",         KW_CACHECRLS},
-    {"charondebug",       KW_CHARONDEBUG},
+    {"leftsubnet",        KW_LEFTSUBNET},
     {"crluri2",           KW_CRLURI2},
     {"rightca2",          KW_RIGHTCA2},
-    {"mediated_by",       KW_MEDIATED_BY},
+    {"leftsourceip",      KW_LEFTSOURCEIP},
     {"rightcert2",        KW_RIGHTCERT2},
-    {"leftid",            KW_LEFTID},
-    {"auto",              KW_AUTO},
-    {"rightupdown",       KW_RIGHTUPDOWN},
-    {"rightfirewall",     KW_RIGHTFIREWALL},
-    {"authby",            KW_AUTHBY},
-    {"leftsubnetwithin",  KW_LEFTSUBNETWITHIN},
-    {"uniqueids",         KW_UNIQUEIDS},
-    {"prepluto",          KW_PREPLUTO},
-    {"keep_alive",        KW_KEEP_ALIVE},
+    {"pfs",               KW_PFS},
+    {"leftid2",           KW_LEFTID2},
+    {"dpdtimeout",        KW_DPDTIMEOUT},
+    {"leftikeport",       KW_LEFTIKEPORT},
+    {"leftca2",           KW_LEFTCA2},
+    {"righthostaccess",   KW_RIGHTHOSTACCESS},
+    {"xauth",             KW_XAUTH},
+    {"rightauth2",        KW_RIGHTAUTH2},
+    {"mark_in",           KW_MARK_IN},
     {"mobike",	           KW_MOBIKE},
-    {"overridemtu",       KW_OVERRIDEMTU},
+    {"margintime",        KW_REKEYMARGIN},
     {"dumpdir",           KW_DUMPDIR},
-    {"dpdaction",         KW_DPDACTION},
-    {"rekeyfuzz",         KW_REKEYFUZZ},
-    {"leftid2",           KW_LEFTID2},
-    {"keyingtries",       KW_KEYINGTRIES},
-    {"pfs",               KW_PFS},
-    {"nocrsend",          KW_NOCRSEND},
+    {"ocspuri1",          KW_OCSPURI},
     {"keyexchange",       KW_KEYEXCHANGE},
-    {"leftauth2",         KW_LEFTAUTH2},
-    {"mediation",         KW_MEDIATION},
-    {"rekeymargin",       KW_REKEYMARGIN},
-    {"ocspuri2",          KW_OCSPURI2},
-    {"pkcs11module",      KW_PKCS11MODULE},
-    {"pkcs11keepstate",   KW_PKCS11KEEPSTATE},
-    {"force_keepalive",   KW_FORCE_KEEPALIVE},
-    {"me_peerid",         KW_ME_PEERID},
-    {"forceencaps",       KW_FORCEENCAPS},
-    {"pkcs11initargs",    KW_PKCS11INITARGS},
-    {"pkcs11proxy",       KW_PKCS11PROXY},
-    {"margintime",        KW_REKEYMARGIN},
-    {"interfaces",        KW_INTERFACES},
     {"fragicmp",          KW_FRAGICMP},
+    {"rightauth",         KW_RIGHTAUTH},
+    {"interfaces",        KW_INTERFACES},
     {"marginbytes",       KW_MARGINBYTES},
     {"marginpackets",     KW_MARGINPACKETS},
-    {"dpdtimeout",        KW_DPDTIMEOUT},
+    {"nocrsend",          KW_NOCRSEND},
+    {"keep_alive",        KW_KEEP_ALIVE},
+    {"rightupdown",       KW_RIGHTUPDOWN},
+    {"keyingtries",       KW_KEYINGTRIES},
+    {"leftsubnetwithin",  KW_LEFTSUBNETWITHIN},
+    {"uniqueids",         KW_UNIQUEIDS},
+    {"mark_out",          KW_MARK_OUT},
+    {"charonstart",       KW_CHARONSTART},
     {"klipsdebug",        KW_KLIPSDEBUG},
-    {"modeconfig",        KW_MODECONFIG},
-    {"pfsgroup",          KW_PFSGROUP},
+    {"force_keepalive",   KW_FORCE_KEEPALIVE},
+    {"forceencaps",       KW_FORCEENCAPS},
+    {"authby",            KW_AUTHBY},
+    {"postpluto",         KW_POSTPLUTO},
+    {"pkcs11module",      KW_PKCS11MODULE},
+    {"ocspuri2",          KW_OCSPURI2},
+    {"hidetos",           KW_HIDETOS},
+    {"pkcs11keepstate",   KW_PKCS11KEEPSTATE},
+    {"mark",              KW_MARK},
+    {"charondebug",       KW_CHARONDEBUG},
+    {"leftauth2",         KW_LEFTAUTH2},
+    {"overridemtu",       KW_OVERRIDEMTU},
+    {"pkcs11initargs",    KW_PKCS11INITARGS},
     {"keylife",           KW_KEYLIFE},
-    {"ikelifetime",       KW_IKELIFETIME}
+    {"auto",              KW_AUTO},
+    {"ikelifetime",       KW_IKELIFETIME},
+    {"reauth",            KW_REAUTH},
+    {"leftauth",          KW_LEFTAUTH},
+    {"pkcs11proxy",       KW_PKCS11PROXY},
+    {"prepluto",          KW_PREPLUTO},
+    {"pfsgroup",          KW_PFSGROUP},
+    {"auth",              KW_AUTH},
+    {"modeconfig",        KW_MODECONFIG}
   };
 
 static const short lookup[] =
   {
      -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-     -1,   0,  -1,  -1,   1,  -1,   2,   3,   4,  -1,
-      5,   6,  -1,   7,   8,  -1,  -1,   9,  10,  11,
-     12,  -1,  13,  -1,  14,  15,  16,  -1,  17,  -1,
-     18,  19,  20,  21,  -1,  22,  23,  -1,  24,  25,
-     26,  27,  28,  29,  30,  -1,  -1,  31,  32,  33,
-     34,  35,  36,  37,  38,  -1,  39,  40,  -1,  41,
-     -1,  -1,  -1,  42,  43,  -1,  44,  45,  46,  47,
-     48,  49,  -1,  50,  51,  52,  53,  54,  55,  56,
-     57,  58,  59,  -1,  -1,  60,  -1,  -1,  61,  -1,
-     -1,  62,  -1,  -1,  63,  64,  -1,  -1,  65,  66,
-     -1,  67,  68,  69,  -1,  -1,  70,  -1,  71,  72,
-     73,  -1,  -1,  -1,  74,  -1,  75,  -1,  76,  77,
-     78,  79,  80,  81,  82,  83,  84,  85,  86,  87,
-     88,  89,  90,  91,  92,  93,  -1,  94,  95,  -1,
-     96,  -1,  -1,  -1,  97,  -1,  98,  99, 100,  -1,
-     -1, 101, 102,  -1, 103,  -1,  -1, 104, 105,  -1,
-    106,  -1, 107,  -1, 108,  -1,  -1,  -1,  -1, 109,
-     -1, 110,  -1,  -1, 111,  -1,  -1,  -1,  -1, 112,
-    113,  -1, 114, 115,  -1,  -1,  -1,  -1, 116,  -1,
-    117,  -1,  -1, 118,  -1,  -1,  -1,  -1,  -1,  -1,
      -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
-     -1,  -1,  -1,  -1,  -1,  -1, 119,  -1,  -1,  -1,
-    120
+      0,  -1,  -1,   1,  -1,  -1,  -1,  -1,   2,   3,
+     -1,  -1,   4,   5,  -1,   6,   7,  -1,  -1,   8,
+      9,  10,  11,  12,  13,  14,  -1,  15,  16,  -1,
+     17,  18,  19,  20,  -1,  21,  22,  23,  -1,  -1,
+     24,  25,  26,  27,  28,  29,  -1,  30,  31,  32,
+     33,  34,  35,  -1,  36,  -1,  -1,  37,  38,  39,
+     40,  41,  42,  43,  -1,  44,  45,  46,  47,  -1,
+     48,  -1,  49,  50,  51,  52,  53,  54,  55,  -1,
+     56,  57,  58,  59,  60,  61,  62,  63,  -1,  64,
+     65,  66,  67,  68,  69,  70,  71,  72,  73,  74,
+     75,  -1,  76,  77,  78,  79,  -1,  -1,  80,  81,
+     82,  -1,  83,  84,  -1,  85,  86,  87,  88,  89,
+     90,  -1,  91,  -1,  92,  -1,  93,  94,  95,  -1,
+     -1,  96,  97,  -1,  98,  99,  -1,  -1,  -1,  -1,
+     -1,  -1, 100,  -1, 101,  -1, 102,  -1,  -1,  -1,
+    103, 104,  -1,  -1, 105,  -1,  -1, 106, 107, 108,
+    109, 110, 111,  -1, 112, 113,  -1, 114, 115, 116,
+     -1, 117,  -1, 118, 119, 120, 121,  -1,  -1,  -1,
+    122,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 123,  -1,
+     -1,  -1, 124,  -1,  -1,  -1,  -1,  -1,  -1,  -1,
+    125
   };
 
 #ifdef __GNUC__