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