Imported Upstream version 4.6.4

1 files changed, 134 insertions, 133 deletions

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