Imported Upstream version 4.6.4

1 files changed, 47 insertions, 43 deletions

diff --git a/src/stroke/stroke_keywords.c b/src/stroke/stroke_keywords.c
index b43f4b475..b5ca2e143 100644
--- a/src/stroke/stroke_keywords.c
+++ b/src/stroke/stroke_keywords.c
@@ -54,12 +54,12 @@ struct stroke_token {
     stroke_keyword_t kw;
 };
 
-#define TOTAL_KEYWORDS 37
+#define TOTAL_KEYWORDS 41
 #define MIN_WORD_LENGTH 2
 #define MAX_WORD_LENGTH 15
 #define MIN_HASH_VALUE 2
-#define MAX_HASH_VALUE 42
-/* maximum key range = 41, duplicates = 0 */
+#define MAX_HASH_VALUE 44
+/* maximum key range = 43, duplicates = 0 */
 
 #ifdef __GNUC__
 __inline
@@ -75,32 +75,32 @@ hash (str, len)
 {
   static const unsigned char asso_values[] =
     {
-      43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
-      43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
-      43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
-      43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
-      43, 43, 43, 43, 43, 20, 43, 43, 43, 43,
-      43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
-      43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
-      43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
-      43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
-      43, 43, 43, 43, 43, 43, 43,  0, 23,  1,
-       1, 15, 43, 21, 43, 23, 43,  9,  0, 43,
-      43, 10,  2, 43,  6,  5,  1,  0, 43, 43,
-       2, 19, 43, 43, 43, 43, 43, 43, 43, 43,
-      43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
-      43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
-      43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
-      43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
-      43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
-      43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
-      43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
-      43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
-      43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
-      43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
-      43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
-      43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
-      43, 43, 43, 43, 43, 43
+      45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+      45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+      45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+      45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+      45, 45, 45, 45, 45, 15, 45, 45, 45, 45,
+      45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+      45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+      45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+      45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+      45, 45, 45, 45, 45, 45, 45,  0, 30,  1,
+       1, 15, 45, 15, 45, 30, 45, 13,  0,  0,
+      45,  9,  3, 45,  6, 18,  1,  0, 45, 45,
+       5,  0, 45, 45, 45, 45, 45, 45, 45, 45,
+      45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+      45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+      45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+      45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+      45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+      45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+      45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+      45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+      45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+      45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+      45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+      45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+      45, 45, 45, 45, 45, 45
     };
   register int hval = len;
 
@@ -132,10 +132,10 @@ static const struct stroke_token wordlist[] =
     {"listall",         STROKE_LIST_ALL},
     {"delete",          STROKE_DELETE},
     {"listcrls",        STROKE_LIST_CRLS},
-    {"status",          STROKE_STATUS},
+    {"rekey",           STROKE_REKEY},
     {"listaacerts",     STROKE_LIST_AACERTS},
     {"listcacerts",     STROKE_LIST_CACERTS},
-    {"statusall",       STROKE_STATUSALL},
+    {"listplugins",     STROKE_LIST_PLUGINS},
     {"rereadall",       STROKE_REREAD_ALL},
     {"listcerts",       STROKE_LIST_CERTS},
     {"rereadcrls",      STROKE_REREAD_CRLS},
@@ -144,32 +144,36 @@ static const struct stroke_token wordlist[] =
     {"rereadcacerts",   STROKE_REREAD_CACERTS},
     {"leases",          STROKE_LEASES},
     {"unroute",         STROKE_UNROUTE},
-    {"listocsp",        STROKE_LIST_OCSP},
-    {"rereadsecrets",   STROKE_REREAD_SECRETS},
+    {"listalgs",        STROKE_LIST_ALGS},
+    {"status",          STROKE_STATUS},
     {"listacerts",      STROKE_LIST_ACERTS},
     {"route",           STROKE_ROUTE},
+    {"statusall",       STROKE_STATUSALL},
     {"purgeocsp",       STROKE_PURGE_OCSP},
-    {"listocspcerts",   STROKE_LIST_OCSPCERTS},
-    {"listalgs",        STROKE_LIST_ALGS},
-    {"rekey",           STROKE_REKEY},
+    {"statusallnb",     STROKE_STATUSALL_NOBLK},
     {"rereadocspcerts", STROKE_REREAD_OCSPCERTS},
+    {"user-creds",      STROKE_USER_CREDS},
+    {"down-srcip",      STROKE_DOWN_SRCIP},
     {"purgecrls",       STROKE_PURGE_CRLS},
+    {"listgroups",      STROKE_LIST_GROUPS},
+    {"listocsp",        STROKE_LIST_OCSP},
     {"exportx509",      STROKE_EXPORT_X509},
+    {"rereadsecrets",   STROKE_REREAD_SECRETS},
+    {"loglevel",        STROKE_LOGLEVEL},
     {"purgeike",        STROKE_PURGE_IKE},
+    {"listocspcerts",   STROKE_LIST_OCSPCERTS},
+    {"memusage",        STROKE_MEMUSAGE},
     {"listcainfos",     STROKE_LIST_CAINFOS},
-    {"listpubkeys",     STROKE_LIST_PUBKEYS},
-    {"down-srcip",      STROKE_DOWN_SRCIP},
-    {"loglevel",        STROKE_LOGLEVEL},
-    {"listgroups",      STROKE_LIST_GROUPS},
-    {"purgecerts",      STROKE_PURGE_CERTS}
+    {"purgecerts",      STROKE_PURGE_CERTS},
+    {"listpubkeys",     STROKE_LIST_PUBKEYS}
   };
 
 static const short lookup[] =
   {
     -1, -1,  0,  1,  2,  3, -1,  4,  5,  6, -1,  7,  8,  9,
     10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
-    24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, -1, -1, 35,
-    36
+    24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
+    38, 39, 40
   };
 
 #ifdef __GNUC__