Load /tmp/tmp.IBEBMao893/strongswan-2.8.0+dfsg into

branches/source-dist/debian/strongswan.

1 files changed, 94 insertions, 85 deletions

diff --git a/programs/starter/keywords.c b/programs/starter/keywords.c
index 4cc5c03e8..75be0a542 100644
--- a/programs/starter/keywords.c
+++ b/programs/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.c,v 1.7 2006/04/17 10:32:48 as Exp $
+ * RCSID $Id: keywords.c,v 1.8 2006/10/19 14:58:30 as Exp $
  */
 
 #include <string.h>
@@ -56,12 +56,12 @@ struct kw_entry {
     kw_token_t token;
 };
 
-#define TOTAL_KEYWORDS 77
+#define TOTAL_KEYWORDS 80
 #define MIN_WORD_LENGTH 3
 #define MAX_WORD_LENGTH 17
 #define MIN_HASH_VALUE 9
-#define MAX_HASH_VALUE 146
-/* maximum key range = 138, duplicates = 0 */
+#define MAX_HASH_VALUE 156
+/* maximum key range = 148, duplicates = 0 */
 
 #ifdef __GNUC__
 __inline
@@ -77,32 +77,32 @@ hash (str, len)
 {
   static const unsigned char asso_values[] =
     {
-      147, 147, 147, 147, 147, 147, 147, 147, 147, 147,
-      147, 147, 147, 147, 147, 147, 147, 147, 147, 147,
-      147, 147, 147, 147, 147, 147, 147, 147, 147, 147,
-      147, 147, 147, 147, 147, 147, 147, 147, 147, 147,
-      147, 147, 147, 147, 147, 147, 147, 147, 147, 147,
-       15, 147, 147, 147, 147, 147, 147, 147, 147, 147,
-      147, 147, 147, 147, 147, 147, 147, 147, 147, 147,
-      147, 147, 147, 147, 147, 147, 147, 147, 147, 147,
-      147, 147, 147, 147, 147, 147, 147, 147, 147, 147,
-      147, 147, 147, 147, 147, 147, 147,  85, 147,  40,
-       25,  25,   0,  10,   5,  80, 147,  35,  60,  35,
-       60,  55,  10, 147,  15,  20,   5,  65, 147, 147,
-      147,  35,   0, 147, 147, 147, 147, 147, 147, 147,
-      147, 147, 147, 147, 147, 147, 147, 147, 147, 147,
-      147, 147, 147, 147, 147, 147, 147, 147, 147, 147,
-      147, 147, 147, 147, 147, 147, 147, 147, 147, 147,
-      147, 147, 147, 147, 147, 147, 147, 147, 147, 147,
-      147, 147, 147, 147, 147, 147, 147, 147, 147, 147,
-      147, 147, 147, 147, 147, 147, 147, 147, 147, 147,
-      147, 147, 147, 147, 147, 147, 147, 147, 147, 147,
-      147, 147, 147, 147, 147, 147, 147, 147, 147, 147,
-      147, 147, 147, 147, 147, 147, 147, 147, 147, 147,
-      147, 147, 147, 147, 147, 147, 147, 147, 147, 147,
-      147, 147, 147, 147, 147, 147, 147, 147, 147, 147,
-      147, 147, 147, 147, 147, 147, 147, 147, 147, 147,
-      147, 147, 147, 147, 147, 147
+      157, 157, 157, 157, 157, 157, 157, 157, 157, 157,
+      157, 157, 157, 157, 157, 157, 157, 157, 157, 157,
+      157, 157, 157, 157, 157, 157, 157, 157, 157, 157,
+      157, 157, 157, 157, 157, 157, 157, 157, 157, 157,
+      157, 157, 157, 157, 157, 157, 157, 157, 157, 157,
+       25, 157, 157, 157, 157, 157, 157, 157, 157, 157,
+      157, 157, 157, 157, 157, 157, 157, 157, 157, 157,
+      157, 157, 157, 157, 157, 157, 157, 157, 157, 157,
+      157, 157, 157, 157, 157, 157, 157, 157, 157, 157,
+      157, 157, 157, 157, 157, 157, 157,  90, 157,  60,
+       50,  25,   0,  10,   5,  65, 157,  65,  70,   5,
+        0,  75,  35, 157,  10,  20,   5,  70, 157, 157,
+      157,  55,   0, 157, 157, 157, 157, 157, 157, 157,
+      157, 157, 157, 157, 157, 157, 157, 157, 157, 157,
+      157, 157, 157, 157, 157, 157, 157, 157, 157, 157,
+      157, 157, 157, 157, 157, 157, 157, 157, 157, 157,
+      157, 157, 157, 157, 157, 157, 157, 157, 157, 157,
+      157, 157, 157, 157, 157, 157, 157, 157, 157, 157,
+      157, 157, 157, 157, 157, 157, 157, 157, 157, 157,
+      157, 157, 157, 157, 157, 157, 157, 157, 157, 157,
+      157, 157, 157, 157, 157, 157, 157, 157, 157, 157,
+      157, 157, 157, 157, 157, 157, 157, 157, 157, 157,
+      157, 157, 157, 157, 157, 157, 157, 157, 157, 157,
+      157, 157, 157, 157, 157, 157, 157, 157, 157, 157,
+      157, 157, 157, 157, 157, 157, 157, 157, 157, 157,
+      157, 157, 157, 157, 157, 157
     };
   return len + asso_values[(unsigned char)str[2]] + asso_values[(unsigned char)str[len - 1]];
 }
@@ -111,104 +111,113 @@ static const struct kw_entry wordlist[] =
   {
     {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
     {"left",              KW_LEFT},
-    {""}, {""}, {""},
+    {"leftupdown",        KW_LEFTUPDOWN},
+    {""}, {""},
     {"leftcert",          KW_LEFTCERT,},
     {"auth",              KW_AUTH},
     {"leftsubnet",        KW_LEFTSUBNET},
-    {""},
+    {"leftsubnetwithin",  KW_LEFTSUBNETWITHIN},
     {"leftsendcert",      KW_LEFTSENDCERT},
     {"leftprotoport",     KW_LEFTPROTOPORT},
     {""},
     {"right",             KW_RIGHT},
-    {"leftnexthop",       KW_LEFTNEXTHOP},
-    {"leftsourceip",      KW_LEFTSOURCEIP},
-    {"esp",               KW_ESP},
+    {"rightupdown",       KW_RIGHTUPDOWN},
+    {"dumpdir",           KW_DUMPDIR},
+    {""},
     {"rightcert",         KW_RIGHTCERT},
     {""},
     {"rightsubnet",       KW_RIGHTSUBNET},
-    {""},
+    {"rightsubnetwithin", KW_RIGHTSUBNETWITHIN},
     {"rightsendcert",     KW_RIGHTSENDCERT},
     {"rightprotoport",    KW_RIGHTPROTOPORT},
     {"leftgroups",        KW_LEFTGROUPS},
-    {"leftid",            KW_LEFTID},
-    {"rightnexthop",      KW_RIGHTNEXTHOP},
-    {"rightsourceip",     KW_RIGHTSOURCEIP},
+    {""}, {""},
+    {"compress",          KW_COMPRESS},
     {"lefthostaccess",    KW_LEFTHOSTACCESS},
     {"interfaces",        KW_INTERFACES},
+    {""}, {""}, {""}, {""}, {""},
+    {"rightgroups",       KW_RIGHTGROUPS},
+    {""},
+    {"pfs",               KW_PFS},
+    {"leftnatip",         KW_LEFTNATIP},
+    {"righthostaccess",   KW_RIGHTHOSTACCESS},
+    {"leftnexthop",       KW_LEFTNEXTHOP},
+    {"leftsourceip",      KW_LEFTSOURCEIP},
     {""}, {""},
+    {"virtual_private",   KW_VIRTUAL_PRIVATE},
+    {""}, {""},
+    {"ike",               KW_IKE},
+    {""},
+    {"rightnatip",        KW_RIGHTNATIP},
+    {"leftid",            KW_LEFTID},
+    {"rightnexthop",      KW_RIGHTNEXTHOP},
+    {"rightsourceip",     KW_RIGHTSOURCEIP},
+    {"dpdaction",         KW_DPDACTION},
+    {"keep_alive",        KW_KEEP_ALIVE},
+    {"ikelifetime",       KW_IKELIFETIME},
+    {""},
     {"pfsgroup",          KW_PFSGROUP},
     {"type",              KW_TYPE},
     {"dpdtimeout",        KW_DPDTIMEOUT},
-    {"rightgroups",       KW_RIGHTGROUPS},
-    {"rightid",           KW_RIGHTID},
-    {"pfs",               KW_PFS},
-    {"rekeyfuzz",         KW_REKEYFUZZ},
-    {"righthostaccess",   KW_RIGHTHOSTACCESS},
     {"authby",            KW_AUTHBY},
-    {""},
+    {"rightid",           KW_RIGHTID},
     {"leftrsasigkey",     KW_LEFTRSASIGKEY},
-    {""}, {""},
+    {""},
+    {"modeconfig",        KW_MODECONFIG},
     {"cacert",            KW_CACERT},
-    {"hidetos",           KW_HIDETOS},
-    {"ike",               KW_IKE},
     {""},
-    {"virtual_private",   KW_VIRTUAL_PRIVATE},
+    {"esp",               KW_ESP},
+    {"rekeyfuzz",         KW_REKEYFUZZ},
     {""},
-    {"dumpdir",           KW_DUMPDIR},
+    {"rekeymargin",       KW_REKEYMARGIN},
+    {"hidetos",           KW_HIDETOS},
     {"packetdefault",     KW_PACKETDEFAULT},
     {"rightrsasigkey",    KW_RIGHTRSASIGKEY},
-    {"keep_alive",        KW_KEEP_ALIVE},
-    {"ikelifetime",       KW_IKELIFETIME},
+    {"strictcrlpolicy",   KW_STRICTCRLPOLICY},
+    {""},
+    {"leftfirewall",      KW_LEFTFIREWALL},
     {""},
-    {"compress",          KW_COMPRESS},
     {"auto",              KW_AUTO},
-    {"strictcrlpolicy",   KW_STRICTCRLPOLICY},
+    {"klipsdebug",        KW_KLIPSDEBUG},
     {"keyingtries",       KW_KEYINGTRIES},
     {"keylife",           KW_KEYLIFE},
-    {"dpddelay",          KW_DPDDELAY},
+    {"nat_traversal",     KW_NAT_TRAVERSAL},
     {"cachecrls",         KW_CACHECRLS},
-    {"leftupdown",        KW_LEFTUPDOWN},
+    {"plutodebug",        KW_PLUTODEBUG},
     {"keyexchange",       KW_KEYEXCHANGE},
-    {"leftfirewall",      KW_LEFTFIREWALL},
-    {"nocrsend",          KW_NOCRSEND},
+    {"ocspuri",           KW_OCSPURI},
+    {"rightfirewall",     KW_RIGHTFIREWALL},
+    {"uniqueids",         KW_UNIQUEIDS},
     {""},
-    {"rekey",             KW_REKEY},
-    {"leftsubnetwithin",  KW_LEFTSUBNETWITHIN},
+    {"leftca",            KW_LEFTCA},
     {"pkcs11module",      KW_PKCS11MODULE},
-    {"nat_traversal",     KW_NAT_TRAVERSAL},
+    {""},
     {"also",              KW_ALSO},
     {"pkcs11keepstate",   KW_PKCS11KEEPSTATE},
-    {"rightupdown",       KW_RIGHTUPDOWN},
+    {""},
     {"crluri2",           KW_CRLURI2},
-    {"rightfirewall",     KW_RIGHTFIREWALL},
-    {"postpluto",         KW_POSTPLUTO},
-    {"plutodebug",        KW_PLUTODEBUG},
-    {"pkcs11proxy",       KW_PKCS11PROXY},
-    {"rightsubnetwithin", KW_RIGHTSUBNETWITHIN},
-    {"prepluto",          KW_PREPLUTO},
-    {""}, {""},
-    {"leftca",            KW_LEFTCA},
-    {""}, {""},
-    {"dpdaction",         KW_DPDACTION},
-    {""}, {""}, {""},
     {"ldaphost",          KW_LDAPHOST},
+    {"postpluto",         KW_POSTPLUTO},
     {""},
-    {"klipsdebug",        KW_KLIPSDEBUG},
     {"overridemtu",       KW_OVERRIDEMTU},
     {"rightca",           KW_RIGHTCA},
-    {"fragicmp",          KW_FRAGICMP},
-    {""}, {""},
-    {"rekeymargin",       KW_REKEYMARGIN},
-    {"ocspuri",           KW_OCSPURI},
-    {""},
-    {"uniqueids",         KW_UNIQUEIDS},
-    {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+    {"prepluto",          KW_PREPLUTO},
+    {""}, {""}, {""}, {""},
+    {"dpddelay",          KW_DPDDELAY},
+    {""}, {""}, {""}, {""},
+    {"nocrsend",          KW_NOCRSEND},
+    {""}, {""}, {""}, {""},
     {"ldapbase",          KW_LDAPBASE},
+    {""},
+    {"rekey",             KW_REKEY},
+    {"pkcs11proxy",       KW_PKCS11PROXY},
+    {""}, {""}, {""}, {""}, {""}, {""},
+    {"fragicmp",          KW_FRAGICMP},
+    {""}, {""}, {""}, {""}, {""}, {""}, {""},
+    {"crluri",            KW_CRLURI},
     {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-    {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-    {"crlcheckinterval",  KW_CRLCHECKINTERVAL},
-    {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-    {"crluri",            KW_CRLURI}
+    {""}, {""}, {""}, {""}, {""},
+    {"crlcheckinterval",  KW_CRLCHECKINTERVAL}
   };
 
 #ifdef __GNUC__