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.c197
1 files changed, 197 insertions, 0 deletions
diff --git a/src/starter/keywords.c b/src/starter/keywords.c
index 0c24c7dcf..78c243f7e 100644
--- a/src/starter/keywords.c
+++ b/src/starter/keywords.c
@@ -54,12 +54,21 @@ struct kw_entry {
kw_token_t token;
};
+<<<<<<< HEAD
#define TOTAL_KEYWORDS 127
#define MIN_WORD_LENGTH 3
#define MAX_WORD_LENGTH 17
#define MIN_HASH_VALUE 12
#define MAX_HASH_VALUE 238
/* maximum key range = 227, duplicates = 0 */
+=======
+#define TOTAL_KEYWORDS 130
+#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 */
+>>>>>>> upstream/4.5.1
#ifdef __GNUC__
__inline
@@ -75,6 +84,7 @@ hash (str, len)
{
static const unsigned char asso_values[] =
{
+<<<<<<< HEAD
239, 239, 239, 239, 239, 239, 239, 239, 239, 239,
239, 239, 239, 239, 239, 239, 239, 239, 239, 239,
239, 239, 239, 239, 239, 239, 239, 239, 239, 239,
@@ -101,6 +111,34 @@ hash (str, len)
239, 239, 239, 239, 239, 239, 239, 239, 239, 239,
239, 239, 239, 239, 239, 239, 239, 239, 239, 239,
239, 239, 239, 239, 239, 239
+=======
+ 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
+>>>>>>> upstream/4.5.1
};
register int hval = len;
@@ -124,6 +162,7 @@ hash (str, len)
static const struct kw_entry wordlist[] =
{
{"pfs", KW_PFS},
+<<<<<<< HEAD
{"uniqueids", KW_UNIQUEIDS},
{"rightgroups", KW_RIGHTGROUPS},
{"lifetime", KW_KEYLIFE},
@@ -250,11 +289,143 @@ static const struct kw_entry wordlist[] =
{"pkcs11initargs", KW_PKCS11INITARGS},
{"pkcs11keepstate", KW_PKCS11KEEPSTATE},
{"pkcs11proxy", KW_PKCS11PROXY}
+=======
+ {"right", KW_RIGHT},
+ {"rightgroups", KW_RIGHTGROUPS},
+ {"left", KW_LEFT},
+ {"lifetime", KW_KEYLIFE},
+ {"rightsubnet", KW_RIGHTSUBNET},
+ {"rightikeport", KW_RIGHTIKEPORT},
+ {"rightsendcert", KW_RIGHTSENDCERT},
+ {"leftcert", KW_LEFTCERT},
+ {"keyingtries", KW_KEYINGTRIES},
+ {"keylife", KW_KEYLIFE},
+ {"leftsendcert", KW_LEFTSENDCERT},
+ {"lifebytes", KW_LIFEBYTES},
+ {"keep_alive", KW_KEEP_ALIVE},
+ {"leftgroups", KW_LEFTGROUPS},
+ {"leftrsasigkey", KW_LEFTRSASIGKEY},
+ {"leftcertpolicy", KW_LEFTCERTPOLICY},
+ {"certuribase", KW_CERTURIBASE},
+ {"lifepackets", KW_LIFEPACKETS},
+ {"rightrsasigkey", KW_RIGHTRSASIGKEY},
+ {"leftprotoport", KW_LEFTPROTOPORT},
+ {"uniqueids", KW_UNIQUEIDS},
+ {"rightallowany", KW_RIGHTALLOWANY},
+ {"virtual_private", KW_VIRTUAL_PRIVATE},
+ {"leftca", KW_LEFTCA},
+ {"rightsubnetwithin", KW_RIGHTSUBNETWITHIN},
+ {"strictcrlpolicy", KW_STRICTCRLPOLICY},
+ {"type", KW_TYPE},
+ {"interfaces", KW_INTERFACES},
+ {"rightsourceip", KW_RIGHTSOURCEIP},
+ {"leftnexthop", KW_LEFTNEXTHOP},
+ {"rightprotoport", KW_RIGHTPROTOPORT},
+ {"mark_in", KW_MARK_IN},
+ {"reqid", KW_REQID},
+ {"inactivity", KW_INACTIVITY},
+ {"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},
+ {"leftfirewall", KW_LEFTFIREWALL},
+ {"rightfirewall", KW_RIGHTFIREWALL},
+ {"overridemtu", KW_OVERRIDEMTU},
+ {"mobike", KW_MOBIKE},
+ {"packetdefault", KW_PACKETDEFAULT},
+ {"crluri1", KW_CRLURI},
+ {"ldapbase", KW_LDAPBASE},
+ {"leftallowany", KW_LEFTALLOWANY},
+ {"mediation", KW_MEDIATION},
+ {"compress", KW_COMPRESS},
+ {"leftsubnet", KW_LEFTSUBNET},
+ {"lefthostaccess", KW_LEFTHOSTACCESS},
+ {"forceencaps", KW_FORCEENCAPS},
+ {"dumpdir", KW_DUMPDIR},
+ {"righthostaccess", KW_RIGHTHOSTACCESS},
+ {"authby", KW_AUTHBY},
+ {"aaa_identity", KW_AAA_IDENTITY},
+ {"tfc", KW_TFC},
+ {"nat_traversal", KW_NAT_TRAVERSAL},
+ {"rightauth", KW_RIGHTAUTH},
+ {"rightupdown", KW_RIGHTUPDOWN},
+ {"dpdtimeout", KW_DPDTIMEOUT},
+ {"installpolicy", KW_INSTALLPOLICY},
+ {"mark_out", KW_MARK_OUT},
+ {"fragicmp", KW_FRAGICMP},
+ {"force_keepalive", KW_FORCE_KEEPALIVE},
+ {"leftid", KW_LEFTID},
+ {"leftsubnetwithin", KW_LEFTSUBNETWITHIN},
+ {"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},
+ {"also", KW_ALSO},
+ {"leftca2", KW_LEFTCA2},
+ {"rekey", KW_REKEY},
+ {"plutostderrlog", KW_PLUTOSTDERRLOG},
+ {"plutostart", KW_PLUTOSTART},
+ {"ikelifetime", KW_IKELIFETIME},
+ {"crlcheckinterval", KW_CRLCHECKINTERVAL},
+ {"auto", KW_AUTO},
+ {"ldaphost", KW_LDAPHOST},
+ {"rekeyfuzz", KW_REKEYFUZZ},
+ {"leftikeport", KW_LEFTIKEPORT},
+ {"mark", KW_MARK},
+ {"auth", KW_AUTH},
+ {"prepluto", KW_PREPLUTO},
+ {"dpddelay", KW_DPDDELAY},
+ {"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},
+ {"crluri2", KW_CRLURI2},
+ {"plutodebug", KW_PLUTODEBUG},
+ {"leftauth2", KW_LEFTAUTH2},
+ {"pkcs11module", KW_PKCS11MODULE},
+ {"pkcs11initargs", KW_PKCS11INITARGS},
+ {"pkcs11keepstate", KW_PKCS11KEEPSTATE},
+ {"pkcs11proxy", KW_PKCS11PROXY},
+ {"modeconfig", KW_MODECONFIG},
+ {"postpluto", KW_POSTPLUTO}
+>>>>>>> upstream/4.5.1
};
static const short lookup[] =
{
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+<<<<<<< HEAD
-1, -1, 0, 1, -1, 2, -1, -1, 3, -1,
-1, 4, -1, 5, 6, 7, 8, 9, -1, 10,
11, -1, 12, 13, 14, 15, 16, 17, -1, 18,
@@ -278,6 +449,32 @@ static const short lookup[] =
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, 126
+=======
+ -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
+>>>>>>> upstream/4.5.1
};
#ifdef __GNUC__
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-05 06:51:20 +0000