Imported Upstream version 5.0.2

1 files changed, 153 insertions, 149 deletions

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