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.c206
1 files changed, 109 insertions, 97 deletions
diff --git a/src/starter/keywords.c b/src/starter/keywords.c
index b96019d83..35c17b9b5 100644
--- a/src/starter/keywords.c
+++ b/src/starter/keywords.c
@@ -44,7 +44,7 @@ error "gperf generated tables don't work with this execution character set. Plea
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*
- * RCSID $Id: keywords.txt 3928 2008-05-11 07:59:00Z andreas $
+ * RCSID $Id: keywords.txt 4276 2008-08-22 10:44:51Z martin $
*/
#include <string.h>
@@ -56,12 +56,12 @@ struct kw_entry {
kw_token_t token;
};
-#define TOTAL_KEYWORDS 100
+#define TOTAL_KEYWORDS 101
#define MIN_WORD_LENGTH 3
#define MAX_WORD_LENGTH 17
#define MIN_HASH_VALUE 6
-#define MAX_HASH_VALUE 263
-/* maximum key range = 258, duplicates = 0 */
+#define MAX_HASH_VALUE 248
+/* maximum key range = 243, duplicates = 0 */
#ifdef __GNUC__
__inline
@@ -75,34 +75,34 @@ hash (str, len)
register const char *str;
register unsigned int len;
{
- static const unsigned short asso_values[] =
+ static const unsigned char asso_values[] =
{
- 264, 264, 264, 264, 264, 264, 264, 264, 264, 264,
- 264, 264, 264, 264, 264, 264, 264, 264, 264, 264,
- 264, 264, 264, 264, 264, 264, 264, 264, 264, 264,
- 264, 264, 264, 264, 264, 264, 264, 264, 264, 264,
- 264, 264, 264, 264, 264, 264, 264, 264, 264, 10,
- 0, 264, 264, 264, 264, 264, 264, 264, 264, 264,
- 264, 264, 264, 264, 264, 264, 264, 264, 264, 264,
- 264, 264, 264, 264, 264, 264, 264, 264, 264, 264,
- 264, 264, 264, 264, 264, 264, 264, 264, 264, 264,
- 264, 264, 264, 264, 264, 264, 264, 15, 264, 0,
- 100, 5, 90, 85, 60, 0, 264, 60, 10, 55,
- 80, 75, 15, 264, 0, 50, 35, 5, 25, 264,
- 10, 75, 0, 264, 264, 264, 264, 264, 264, 264,
- 264, 264, 264, 264, 264, 264, 264, 264, 264, 264,
- 264, 264, 264, 264, 264, 264, 264, 264, 264, 264,
- 264, 264, 264, 264, 264, 264, 264, 264, 264, 264,
- 264, 264, 264, 264, 264, 264, 264, 264, 264, 264,
- 264, 264, 264, 264, 264, 264, 264, 264, 264, 264,
- 264, 264, 264, 264, 264, 264, 264, 264, 264, 264,
- 264, 264, 264, 264, 264, 264, 264, 264, 264, 264,
- 264, 264, 264, 264, 264, 264, 264, 264, 264, 264,
- 264, 264, 264, 264, 264, 264, 264, 264, 264, 264,
- 264, 264, 264, 264, 264, 264, 264, 264, 264, 264,
- 264, 264, 264, 264, 264, 264, 264, 264, 264, 264,
- 264, 264, 264, 264, 264, 264, 264, 264, 264, 264,
- 264, 264, 264, 264, 264, 264
+ 249, 249, 249, 249, 249, 249, 249, 249, 249, 249,
+ 249, 249, 249, 249, 249, 249, 249, 249, 249, 249,
+ 249, 249, 249, 249, 249, 249, 249, 249, 249, 249,
+ 249, 249, 249, 249, 249, 249, 249, 249, 249, 249,
+ 249, 249, 249, 249, 249, 249, 249, 249, 249, 25,
+ 10, 249, 249, 249, 249, 249, 249, 249, 249, 249,
+ 249, 249, 249, 249, 249, 249, 249, 249, 249, 249,
+ 249, 249, 249, 249, 249, 249, 249, 249, 249, 249,
+ 249, 249, 249, 249, 249, 249, 249, 249, 249, 249,
+ 249, 249, 249, 249, 249, 249, 249, 110, 249, 0,
+ 100, 5, 75, 65, 90, 0, 249, 60, 10, 15,
+ 80, 60, 15, 249, 0, 50, 35, 15, 30, 249,
+ 0, 75, 0, 249, 249, 249, 249, 249, 249, 249,
+ 249, 249, 249, 249, 249, 249, 249, 249, 249, 249,
+ 249, 249, 249, 249, 249, 249, 249, 249, 249, 249,
+ 249, 249, 249, 249, 249, 249, 249, 249, 249, 249,
+ 249, 249, 249, 249, 249, 249, 249, 249, 249, 249,
+ 249, 249, 249, 249, 249, 249, 249, 249, 249, 249,
+ 249, 249, 249, 249, 249, 249, 249, 249, 249, 249,
+ 249, 249, 249, 249, 249, 249, 249, 249, 249, 249,
+ 249, 249, 249, 249, 249, 249, 249, 249, 249, 249,
+ 249, 249, 249, 249, 249, 249, 249, 249, 249, 249,
+ 249, 249, 249, 249, 249, 249, 249, 249, 249, 249,
+ 249, 249, 249, 249, 249, 249, 249, 249, 249, 249,
+ 249, 249, 249, 249, 249, 249, 249, 249, 249, 249,
+ 249, 249, 249, 249, 249, 249
};
return len + asso_values[(unsigned char)str[1]] + asso_values[(unsigned char)str[0]] + asso_values[(unsigned char)str[len - 1]];
}
@@ -111,40 +111,39 @@ static const struct kw_entry wordlist[] =
{
{""}, {""}, {""}, {""}, {""}, {""},
{"crluri", KW_CRLURI},
- {"crluri2", KW_CRLURI2},
- {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""},
{"rekeyfuzz", KW_REKEYFUZZ},
{""}, {""},
- {"crluri1", KW_CRLURI},
+ {"crluri2", KW_CRLURI2},
{""}, {""}, {""},
{"certuribase", KW_CERTURIBASE},
- {"rightca", KW_RIGHTCA},
+ {""},
{"rightfirewall", KW_RIGHTFIREWALL},
{""},
{"rightnatip", KW_RIGHTNATIP},
{"crlcheckinterval", KW_CRLCHECKINTERVAL},
{"rightnexthop", KW_RIGHTNEXTHOP},
{"rightsourceip", KW_RIGHTSOURCEIP},
- {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {"leftca", KW_LEFTCA},
+ {""}, {""}, {""},
+ {"crluri1", KW_CRLURI},
+ {""}, {""}, {""}, {""},
{"leftfirewall", KW_LEFTFIREWALL},
- {"eap", KW_EAP},
+ {""},
{"leftnatip", KW_LEFTNATIP},
{"right", KW_RIGHT},
{"leftnexthop", KW_LEFTNEXTHOP},
{"leftsourceip", KW_LEFTSOURCEIP},
{""},
{"rightcert", KW_RIGHTCERT},
- {"virtual_private", KW_VIRTUAL_PRIVATE},
+ {""},
{"rightsubnet", KW_RIGHTSUBNET},
{""},
{"rightsendcert", KW_RIGHTSENDCERT},
{"rightprotoport", KW_RIGHTPROTOPORT},
- {""}, {""}, {""}, {""},
+ {"virtual_private", KW_VIRTUAL_PRIVATE},
+ {""}, {""}, {""},
{"left", KW_LEFT},
- {""},
- {"cacert", KW_CACERT},
- {""},
+ {""}, {""}, {""},
{"leftcert", KW_LEFTCERT,},
{""},
{"leftsubnet", KW_LEFTSUBNET},
@@ -153,29 +152,30 @@ static const struct kw_entry wordlist[] =
{"leftprotoport", KW_LEFTPROTOPORT},
{""},
{"righthostaccess", KW_RIGHTHOSTACCESS},
- {""}, {""},
+ {""},
+ {"ocspuri", KW_OCSPURI},
{"ike", KW_IKE},
{""},
{"plutostart", KW_PLUTOSTART},
- {"reauth", KW_REAUTH},
- {""},
+ {""}, {""},
{"esp", KW_ESP},
- {"cachecrls", KW_CACHECRLS},
+ {""},
{"leftgroups", KW_LEFTGROUPS},
{"ikelifetime", KW_IKELIFETIME},
{"keylife", KW_KEYLIFE},
- {"packetdefault", KW_PACKETDEFAULT},
+ {"ocspuri2", KW_OCSPURI2},
{"lefthostaccess", KW_LEFTHOSTACCESS},
{"keep_alive", KW_KEEP_ALIVE},
{"keyexchange", KW_KEYEXCHANGE},
- {"ocspuri", KW_OCSPURI},
- {"ocspuri2", KW_OCSPURI2},
- {"auth", KW_AUTH},
+ {""},
+ {"prepluto", KW_PREPLUTO},
+ {""},
{"rekey", KW_REKEY},
- {""}, {""},
+ {"mobike", KW_MOBIKE},
+ {""},
{"rightallowany", KW_RIGHTALLOWANY},
{"rightrsasigkey", KW_RIGHTRSASIGKEY},
- {"xauth", KW_XAUTH},
+ {""},
{"rightupdown", KW_RIGHTUPDOWN},
{"pkcs11module", KW_PKCS11MODULE},
{"ocspuri1", KW_OCSPURI},
@@ -183,78 +183,90 @@ static const struct kw_entry wordlist[] =
{"pkcs11keepstate", KW_PKCS11KEEPSTATE},
{"rekeymargin", KW_REKEYMARGIN},
{"rightsubnetwithin", KW_RIGHTSUBNETWITHIN},
- {"prepluto", KW_PREPLUTO},
- {"auto", KW_AUTO},
+ {"fragicmp", KW_FRAGICMP},
{""},
- {"authby", KW_AUTHBY},
+ {"plutodebug", KW_PLUTODEBUG},
+ {"reauth", KW_REAUTH},
{"leftallowany", KW_LEFTALLOWANY},
{"leftrsasigkey", KW_LEFTRSASIGKEY},
- {"also", KW_ALSO},
+ {"plutostderrlog", KW_PLUTOSTDERRLOG},
{"leftupdown", KW_LEFTUPDOWN},
- {"charonstart", KW_CHARONSTART},
+ {"mediated_by", KW_MEDIATED_BY},
{"rightid", KW_RIGHTID},
- {""}, {""}, {""},
+ {""},
+ {"mediation", KW_MEDIATION},
+ {""},
{"leftsubnetwithin", KW_LEFTSUBNETWITHIN},
- {"dumpdir", KW_DUMPDIR},
- {"fragicmp", KW_FRAGICMP},
+ {""},
+ {"pfsgroup", KW_PFSGROUP},
{""}, {""},
{"overridemtu", KW_OVERRIDEMTU},
- {"hidetos", KW_HIDETOS},
- {"nat_traversal", KW_NAT_TRAVERSAL},
+ {"rightca", KW_RIGHTCA},
+ {"compress", KW_COMPRESS},
{"type", KW_TYPE},
- {"plutodebug", KW_PLUTODEBUG},
- {"leftid", KW_LEFTID},
{""},
+ {"leftid", KW_LEFTID},
+ {"dumpdir", KW_DUMPDIR},
{"ldapbase", KW_LDAPBASE},
- {"plutostderrlog", KW_PLUTOSTDERRLOG},
- {""},
+ {""}, {""},
{"keyingtries", KW_KEYINGTRIES},
+ {""}, {""},
+ {"me_peerid", KW_ME_PEERID},
{""},
- {"pfsgroup", KW_PFSGROUP},
- {""}, {""}, {""}, {""},
- {"compress", KW_COMPRESS},
- {""}, {""}, {""}, {""}, {""},
+ {"leftca", KW_LEFTCA},
+ {""},
+ {"eap", KW_EAP},
+ {""}, {""},
+ {"charonstart", KW_CHARONSTART},
+ {""}, {""},
{"pkcs11initargs", KW_PKCS11INITARGS},
{"interfaces", KW_INTERFACES},
- {"mobike", KW_MOBIKE},
{""}, {""},
- {"uniqueids", KW_UNIQUEIDS},
+ {"pfs", KW_PFS},
+ {"postpluto", KW_POSTPLUTO},
+ {"klipsdebug", KW_KLIPSDEBUG},
{""},
- {"mediated_by", KW_MEDIATED_BY},
- {""}, {""},
- {"mediation", KW_MEDIATION},
- {""}, {""}, {""},
- {"ldaphost", KW_LDAPHOST},
+ {"hidetos", KW_HIDETOS},
{""}, {""},
- {"charondebug", KW_CHARONDEBUG},
- {""},
- {"pfs", KW_PFS},
+ {"modeconfig", KW_MODECONFIG},
+ {"cacert", KW_CACERT},
{""},
+ {"ldaphost", KW_LDAPHOST},
+ {"uniqueids", KW_UNIQUEIDS},
+ {"force_keepalive", KW_FORCE_KEEPALIVE},
+ {""}, {""}, {""}, {""},
{"dpdtimeout", KW_DPDTIMEOUT},
{"pkcs11proxy", KW_PKCS11PROXY},
- {""}, {""}, {""},
- {"klipsdebug", KW_KLIPSDEBUG},
- {""}, {""}, {""},
- {"me_peerid", KW_ME_PEERID},
{""}, {""}, {""}, {""},
- {"postpluto", KW_POSTPLUTO},
- {"strictcrlpolicy", KW_STRICTCRLPOLICY},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {"force_keepalive", KW_FORCE_KEEPALIVE},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {"charondebug", KW_CHARONDEBUG},
+ {""}, {""},
+ {"cachecrls", KW_CACHECRLS},
{""}, {""}, {""},
+ {"packetdefault", KW_PACKETDEFAULT},
+ {""},
+ {"strictcrlpolicy", KW_STRICTCRLPOLICY},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {"also", KW_ALSO},
+ {""}, {""}, {""}, {""},
+ {"auto", KW_AUTO},
+ {""}, {""}, {""}, {""}, {""}, {""},
+ {"forceencaps", KW_FORCEENCAPS},
+ {""},
{"dpddelay", KW_DPDDELAY},
- {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""},
+ {"eap_identity", KW_EAP_IDENTITY},
+ {""},
{"dpdaction", KW_DPDACTION},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""},
- {"modeconfig", KW_MODECONFIG},
- {"forceencaps", KW_FORCEENCAPS},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {"xauth", KW_XAUTH},
+ {"authby", KW_AUTHBY},
+ {""}, {""}, {""}, {""}, {""}, {""},
+ {"nat_traversal", KW_NAT_TRAVERSAL},
+ {""}, {""}, {""}, {""}, {""},
+ {"auth", KW_AUTH},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""},
{"nocrsend", KW_NOCRSEND}
};