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.c91
1 files changed, 46 insertions, 45 deletions
diff --git a/src/starter/keywords.c b/src/starter/keywords.c
index b75ff1395..3692c2cdd 100644
--- a/src/starter/keywords.c
+++ b/src/starter/keywords.c
@@ -54,7 +54,7 @@ struct kw_entry {
kw_token_t token;
};
-#define TOTAL_KEYWORDS 135
+#define TOTAL_KEYWORDS 136
#define MIN_WORD_LENGTH 3
#define MAX_WORD_LENGTH 17
#define MIN_HASH_VALUE 10
@@ -79,15 +79,15 @@ hash (str, len)
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,
+ 260, 260, 260, 260, 260, 260, 260, 260, 260, 8,
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, 4, 260, 11, 4, 80,
+ 55, 6, 3, 2, 114, 2, 260, 114, 70, 33,
+ 22, 81, 51, 7, 14, 2, 7, 122, 8, 260,
+ 260, 43, 4, 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,
@@ -163,8 +163,8 @@ static const struct kw_entry wordlist[] =
{"rightrsasigkey", KW_RIGHTRSASIGKEY},
{"rightprotoport", KW_RIGHTPROTOPORT},
{"leftnexthop", KW_LEFT_DEPRECATED},
- {"strictcrlpolicy", KW_STRICTCRLPOLICY},
{"me_peerid", KW_ME_PEERID},
+ {"strictcrlpolicy", KW_STRICTCRLPOLICY},
{"inactivity", KW_INACTIVITY},
{"rightnexthop", KW_RIGHT_DEPRECATED},
{"rightfirewall", KW_RIGHTFIREWALL},
@@ -172,55 +172,52 @@ static const struct kw_entry wordlist[] =
{"leftupdown", KW_LEFTUPDOWN},
{"leftfirewall", KW_LEFTFIREWALL},
{"crluri", KW_CRLURI},
- {"ike", KW_IKE},
{"mediation", KW_MEDIATION},
{"rightcert", KW_RIGHTCERT},
- {"mobike", KW_MOBIKE},
+ {"crluri1", KW_CRLURI},
{"rightca", KW_RIGHTCA},
- {"compress", KW_COMPRESS},
+ {"mobike", KW_MOBIKE},
{"type", KW_TYPE},
{"ocspuri", KW_OCSPURI},
{"lefthostaccess", KW_LEFTHOSTACCESS},
{"esp", KW_ESP},
- {"crluri1", KW_CRLURI},
- {"ikelifetime", KW_IKELIFETIME},
- {"leftikeport", KW_LEFTIKEPORT},
{"cacert", KW_CACERT},
- {"mark", KW_MARK},
+ {"ocspuri1", KW_OCSPURI},
{"rightid2", KW_RIGHTID2},
{"forceencaps", KW_FORCEENCAPS},
{"nat_traversal", KW_SETUP_DEPRECATED},
{"eap", KW_CONN_DEPRECATED},
{"rightgroups2", KW_RIGHTGROUPS2},
{"packetdefault", KW_SETUP_DEPRECATED},
- {"ocspuri1", KW_OCSPURI},
- {"rekeyfuzz", KW_REKEYFUZZ},
+ {"force_keepalive", KW_SETUP_DEPRECATED},
{"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},
+ {"ike", KW_IKE},
+ {"compress", KW_COMPRESS},
{"aaa_identity", KW_AAA_IDENTITY},
{"leftgroups2", KW_LEFTGROUPS2},
{"leftallowany", KW_LEFTALLOWANY},
{"righthostaccess", KW_RIGHTHOSTACCESS},
- {"rekey", KW_REKEY},
+ {"rekeyfuzz", KW_REKEYFUZZ},
{"rightauth", KW_RIGHTAUTH},
{"klipsdebug", KW_SETUP_DEPRECATED},
+ {"ikelifetime", KW_IKELIFETIME},
+ {"leftikeport", KW_LEFTIKEPORT},
{"rightcertpolicy", KW_RIGHTCERTPOLICY},
- {"overridemtu", KW_SETUP_DEPRECATED},
+ {"mark", KW_MARK},
{"dpdaction", KW_DPDACTION},
{"pfsgroup", KW_PFS_DEPRECATED},
{"keyexchange", KW_KEYEXCHANGE},
{"hidetos", KW_SETUP_DEPRECATED},
{"leftsubnet", KW_LEFTSUBNET},
+ {"overridemtu", KW_SETUP_DEPRECATED},
{"installpolicy", KW_INSTALLPOLICY},
- {"dumpdir", KW_SETUP_DEPRECATED},
{"leftsourceip", KW_LEFTSOURCEIP},
+ {"dpdtimeout", KW_DPDTIMEOUT},
{"also", KW_ALSO},
{"rightupdown", KW_RIGHTUPDOWN},
{"charondebug", KW_CHARONDEBUG},
@@ -228,35 +225,39 @@ static const struct kw_entry wordlist[] =
{"fragicmp", KW_SETUP_DEPRECATED},
{"charonstart", KW_SETUP_DEPRECATED},
{"tfc", KW_TFC},
+ {"rekey", KW_REKEY},
{"leftsubnetwithin", KW_LEFTSUBNET},
{"leftid2", KW_LEFTID2},
{"eap_identity", KW_EAP_IDENTITY},
{"crlcheckinterval", KW_SETUP_DEPRECATED},
+ {"dumpdir", KW_SETUP_DEPRECATED},
{"cachecrls", KW_CACHECRLS},
+ {"rekeymargin", KW_REKEYMARGIN},
{"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},
+ {"closeaction", KW_CLOSEACTION},
{"ocspuri2", KW_OCSPURI2},
{"plutostderrlog", KW_SETUP_DEPRECATED},
{"plutostart", KW_SETUP_DEPRECATED},
{"auto", KW_AUTO},
+ {"pkcs11initargs", KW_PKCS11_DEPRECATED},
+ {"pkcs11module", KW_PKCS11_DEPRECATED},
{"authby", KW_AUTHBY},
+ {"pkcs11keepstate", KW_PKCS11_DEPRECATED},
{"dpddelay", KW_DPDDELAY},
{"modeconfig", KW_MODECONFIG},
{"nocrsend", KW_SETUP_DEPRECATED},
{"prepluto", KW_SETUP_DEPRECATED},
- {"pkcs11proxy", KW_PKCS11_DEPRECATED},
{"leftauth2", KW_LEFTAUTH2},
{"postpluto", KW_SETUP_DEPRECATED},
{"auth", KW_AUTH},
{"reauth", KW_REAUTH},
{"xauth", KW_XAUTH},
{"leftauth", KW_LEFTAUTH},
+ {"pkcs11proxy", KW_PKCS11_DEPRECATED},
+ {"ikedscp", KW_IKEDSCP,},
{"plutodebug", KW_SETUP_DEPRECATED}
};
@@ -270,24 +271,24 @@ static const short lookup[] =
-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
+ 40, -1, -1, -1, -1, -1, 41, -1, 42, 43,
+ 44, 45, 46, 47, 48, -1, -1, -1, -1, 49,
+ 50, 51, 52, 53, 54, 55, 56, 57, -1, -1,
+ -1, 58, 59, 60, 61, 62, 63, 64, 65, -1,
+ 66, 67, 68, 69, 70, 71, 72, -1, -1, 73,
+ 74, -1, 75, 76, 77, 78, 79, -1, 80, 81,
+ 82, 83, 84, 85, 86, 87, 88, 89, 90, 91,
+ 92, -1, -1, 93, -1, -1, 94, 95, -1, 96,
+ 97, -1, 98, -1, 99, 100, 101, -1, 102, 103,
+ 104, -1, 105, -1, -1, -1, 106, -1, 107, -1,
+ -1, -1, 108, -1, -1, -1, 109, -1, -1, -1,
+ -1, 110, 111, 112, 113, 114, -1, -1, -1, -1,
+ -1, -1, -1, 115, -1, -1, -1, -1, -1, -1,
+ 116, 117, -1, -1, 118, -1, -1, -1, 119, -1,
+ 120, 121, -1, 122, -1, -1, -1, 123, -1, 124,
+ 125, 126, -1, -1, -1, -1, -1, -1, -1, 127,
+ -1, -1, -1, 128, -1, -1, -1, 129, -1, -1,
+ -1, 130, 131, 132, -1, -1, 133, -1, 134, 135
};
#ifdef __GNUC__