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.c181
1 files changed, 96 insertions, 85 deletions
diff --git a/src/starter/keywords.c b/src/starter/keywords.c
index 215b95ad6..f7f24eefb 100644
--- a/src/starter/keywords.c
+++ b/src/starter/keywords.c
@@ -56,12 +56,12 @@ struct kw_entry {
kw_token_t token;
};
-#define TOTAL_KEYWORDS 90
+#define TOTAL_KEYWORDS 93
#define MIN_WORD_LENGTH 3
#define MAX_WORD_LENGTH 17
#define MIN_HASH_VALUE 15
-#define MAX_HASH_VALUE 188
-/* maximum key range = 174, duplicates = 0 */
+#define MAX_HASH_VALUE 209
+/* maximum key range = 195, duplicates = 0 */
#ifdef __GNUC__
__inline
@@ -77,32 +77,32 @@ hash (str, len)
{
static const unsigned char asso_values[] =
{
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 40,
- 10, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 80, 189, 20,
- 75, 5, 95, 0, 30, 0, 189, 55, 0, 45,
- 0, 35, 20, 189, 15, 70, 40, 15, 20, 189,
- 0, 25, 0, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189
+ 210, 210, 210, 210, 210, 210, 210, 210, 210, 210,
+ 210, 210, 210, 210, 210, 210, 210, 210, 210, 210,
+ 210, 210, 210, 210, 210, 210, 210, 210, 210, 210,
+ 210, 210, 210, 210, 210, 210, 210, 210, 210, 210,
+ 210, 210, 210, 210, 210, 210, 210, 210, 210, 40,
+ 5, 210, 210, 210, 210, 210, 210, 210, 210, 210,
+ 210, 210, 210, 210, 210, 210, 210, 210, 210, 210,
+ 210, 210, 210, 210, 210, 210, 210, 210, 210, 210,
+ 210, 210, 210, 210, 210, 210, 210, 210, 210, 210,
+ 210, 210, 210, 210, 210, 210, 210, 90, 210, 25,
+ 75, 5, 85, 0, 95, 0, 210, 55, 0, 25,
+ 0, 70, 20, 210, 15, 70, 40, 20, 5, 210,
+ 5, 65, 0, 210, 210, 210, 210, 210, 210, 210,
+ 210, 210, 210, 210, 210, 210, 210, 210, 210, 210,
+ 210, 210, 210, 210, 210, 210, 210, 210, 210, 210,
+ 210, 210, 210, 210, 210, 210, 210, 210, 210, 210,
+ 210, 210, 210, 210, 210, 210, 210, 210, 210, 210,
+ 210, 210, 210, 210, 210, 210, 210, 210, 210, 210,
+ 210, 210, 210, 210, 210, 210, 210, 210, 210, 210,
+ 210, 210, 210, 210, 210, 210, 210, 210, 210, 210,
+ 210, 210, 210, 210, 210, 210, 210, 210, 210, 210,
+ 210, 210, 210, 210, 210, 210, 210, 210, 210, 210,
+ 210, 210, 210, 210, 210, 210, 210, 210, 210, 210,
+ 210, 210, 210, 210, 210, 210, 210, 210, 210, 210,
+ 210, 210, 210, 210, 210, 210, 210, 210, 210, 210,
+ 210, 210, 210, 210, 210, 210
};
return len + asso_values[(unsigned char)str[1]] + asso_values[(unsigned char)str[0]] + asso_values[(unsigned char)str[len - 1]];
}
@@ -116,7 +116,8 @@ static const struct kw_entry wordlist[] =
{"leftfirewall", KW_LEFTFIREWALL},
{""}, {""}, {""},
{"leftsubnetwithin", KW_LEFTSUBNETWITHIN},
- {""}, {""}, {""}, {""},
+ {""}, {""}, {""},
+ {"virtual_private", KW_VIRTUAL_PRIVATE},
{"rightupdown", KW_RIGHTUPDOWN},
{""},
{"rightfirewall", KW_RIGHTFIREWALL},
@@ -129,30 +130,23 @@ static const struct kw_entry wordlist[] =
{""},
{"leftnexthop", KW_LEFTNEXTHOP},
{"leftsourceip", KW_LEFTSOURCEIP},
- {""}, {""},
- {"virtual_private", KW_VIRTUAL_PRIVATE},
- {"crluri", KW_CRLURI},
- {""},
- {"leftrsasigkey", KW_LEFTRSASIGKEY},
- {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""},
{"rightnatip", KW_RIGHTNATIP},
- {""},
+ {"crluri", KW_CRLURI},
{"rightnexthop", KW_RIGHTNEXTHOP},
{"rightsourceip", KW_RIGHTSOURCEIP},
{"left", KW_LEFT},
- {"rekey", KW_REKEY},
- {"crlcheckinterval", KW_CRLCHECKINTERVAL},
+ {""}, {""},
{"crluri2", KW_CRLURI2},
{"leftcert", KW_LEFTCERT,},
- {"rightrsasigkey", KW_RIGHTRSASIGKEY},
+ {""},
{"leftsubnet", KW_LEFTSUBNET},
- {"reauth", KW_REAUTH},
+ {"crlcheckinterval", KW_CRLCHECKINTERVAL},
{"leftsendcert", KW_LEFTSENDCERT},
{"leftprotoport", KW_LEFTPROTOPORT},
{""},
{"right", KW_RIGHT},
- {"charondebug", KW_CHARONDEBUG},
- {"ocspuri", KW_OCSPURI},
+ {""}, {""},
{"ike", KW_IKE},
{"rightcert", KW_RIGHTCERT},
{"klipsdebug", KW_KLIPSDEBUG},
@@ -163,78 +157,95 @@ static const struct kw_entry wordlist[] =
{"plutostart", KW_PLUTOSTART},
{"ikelifetime", KW_IKELIFETIME},
{"keylife", KW_KEYLIFE},
- {"ocspuri2", KW_OCSPURI2},
- {"type", KW_TYPE},
+ {""}, {""},
{"keep_alive", KW_KEEP_ALIVE},
{"keyexchange", KW_KEYEXCHANGE},
+ {""}, {""}, {""},
+ {"interfaces", KW_INTERFACES},
{""},
- {"prepluto", KW_PREPLUTO},
+ {"leftallowany", KW_LEFTALLOWANY},
+ {"leftrsasigkey", KW_LEFTRSASIGKEY},
{""},
- {"interfaces", KW_INTERFACES},
- {"overridemtu", KW_OVERRIDEMTU},
- {"crluri1", KW_CRLURI},
- {""}, {""},
{"leftgroups", KW_LEFTGROUPS},
{"leftid", KW_LEFTID},
- {""},
+ {"crluri1", KW_CRLURI},
{"ldapbase", KW_LDAPBASE},
{"lefthostaccess", KW_LEFTHOSTACCESS},
- {"modeconfig", KW_MODECONFIG},
- {"leftca", KW_LEFTCA},
+ {"rekey", KW_REKEY},
+ {""},
{"pkcs11module", KW_PKCS11MODULE},
- {"nat_traversal", KW_NAT_TRAVERSAL},
- {"uniqueids", KW_UNIQUEIDS},
+ {"rightallowany", KW_RIGHTALLOWANY},
+ {"rightrsasigkey", KW_RIGHTRSASIGKEY},
{"pkcs11keepstate", KW_PKCS11KEEPSTATE},
{"rightgroups", KW_RIGHTGROUPS},
{"rightid", KW_RIGHTID},
{"esp", KW_ESP},
- {"postpluto", KW_POSTPLUTO},
+ {"uniqueids", KW_UNIQUEIDS},
{"righthostaccess", KW_RIGHTHOSTACCESS},
- {"charonstart", KW_CHARONSTART},
- {"rightca", KW_RIGHTCA},
- {"ocspuri1", KW_OCSPURI},
+ {"leftca", KW_LEFTCA},
+ {"ocspuri", KW_OCSPURI},
+ {"nat_traversal", KW_NAT_TRAVERSAL},
{"dpdaction", KW_DPDACTION},
+ {"modeconfig", KW_MODECONFIG},
+ {"overridemtu", KW_OVERRIDEMTU},
+ {""},
+ {"ocspuri2", KW_OCSPURI2},
+ {""}, {""}, {""},
+ {"rightca", KW_RIGHTCA},
+ {"prepluto", KW_PREPLUTO},
+ {"type", KW_TYPE},
{""},
{"eapdir", KW_EAPDIR},
- {"hidetos", KW_HIDETOS},
- {"eap", KW_EAP},
- {""}, {""},
- {"pkcs11proxy", KW_PKCS11PROXY},
{"dumpdir", KW_DUMPDIR},
+ {"eap", KW_EAP},
{""}, {""},
- {"xauth", KW_XAUTH},
- {""}, {""},
- {"nocrsend", KW_NOCRSEND},
- {"also", KW_ALSO},
- {""}, {""}, {""},
- {"ldaphost", KW_LDAPHOST},
- {""}, {""},
- {"authby", KW_AUTHBY},
+ {"reauth", KW_REAUTH},
{""},
- {"dpddelay", KW_DPDDELAY},
- {"auth", KW_AUTH},
- {""}, {""}, {""},
- {"compress", KW_COMPRESS},
- {"auto", KW_AUTO},
- {""}, {""}, {""},
+ {"ldaphost", KW_LDAPHOST},
+ {""}, {""}, {""}, {""},
{"fragicmp", KW_FRAGICMP},
{""}, {""},
- {"keyingtries", KW_KEYINGTRIES},
+ {"charondebug", KW_CHARONDEBUG},
{""},
{"pfsgroup", KW_PFSGROUP},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {"keyingtries", KW_KEYINGTRIES},
+ {""},
+ {"ocspuri1", KW_OCSPURI},
{""},
{"dpdtimeout", KW_DPDTIMEOUT},
+ {""}, {""}, {""}, {""}, {""},
+ {"pkcs11proxy", KW_PKCS11PROXY},
+ {""},
+ {"nocrsend", KW_NOCRSEND},
+ {""}, {""}, {""}, {""}, {""},
+ {"pkcs11initargs", KW_PKCS11INITARGS},
+ {""},
{"cacert", KW_CACERT},
+ {""},
+ {"packetdefault", KW_PACKETDEFAULT},
+ {"also", KW_ALSO},
{""}, {""}, {""},
- {"strictcrlpolicy", KW_STRICTCRLPOLICY},
+ {"dpddelay", KW_DPDDELAY},
+ {"postpluto", KW_POSTPLUTO},
+ {""},
+ {"charonstart", KW_CHARONSTART},
+ {"hidetos", KW_HIDETOS},
+ {"compress", KW_COMPRESS},
+ {""}, {""}, {""}, {""},
+ {"pfs", KW_PFS},
{""}, {""},
- {"packetdefault", KW_PACKETDEFAULT},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {"authby", KW_AUTHBY},
+ {""}, {""},
+ {"auto", KW_AUTO},
+ {""}, {""}, {""}, {""}, {""},
+ {"strictcrlpolicy", KW_STRICTCRLPOLICY},
+ {""}, {""}, {""},
{"cachecrls", KW_CACHECRLS},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {"pfs", KW_PFS}
+ {"xauth", KW_XAUTH},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""},
+ {"auth", KW_AUTH}
};
#ifdef __GNUC__
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-10 07:33:20 +0000