General utilities cleanup. Add signature support to catcrypt. Throw in

[u/mdw/catacomb] / key-flags.c

diff --git a/key-flags.c b/key-flags.c
index 7840462..605eb06 100644 (file)
--- a/key-flags.c
+++ b/key-flags.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: key-flags.c,v 1.2 2000/02/12 18:21:02 mdw Exp $
+ * $Id: key-flags.c,v 1.5 2004/04/08 01:36:15 mdw Exp $
  *
  * Reading and writing key flag strings
  *
@@ -27,17 +27,6 @@
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: key-flags.c,v $
- * Revision 1.2  2000/02/12 18:21:02  mdw
- * Overhaul of key management (again).
- *
- * Revision 1.1  1999/12/22 15:47:48  mdw
- * Major key-management revision.
- *
- */
-
 /*----- Header files ------------------------------------------------------*/
 
 #include <stdlib.h>
@@ -63,7 +52,7 @@ typedef struct flagent {
   unsigned m;
 } flagent;
 
-static flagent flagtab[] = {
+static const flagent flagtab[] = {
 
   /* --- Encoding types --- */
 
@@ -71,6 +60,8 @@ static flagent flagtab[] = {
   { "integer",         KENC_MP,        KF_ENCMASK },
   { "struct",          KENC_STRUCT,    KF_ENCMASK },
   { "encrypt",         KENC_ENCRYPT,   KF_ENCMASK },
+  { "string",          KENC_STRING,    KF_ENCMASK },
+  { "ec",              KENC_EC,        KF_ENCMASK },
 
   /* --- Classes of keys --- */
 
@@ -111,10 +102,12 @@ int key_readflags(const char *p, char **pp, unsigned *ff, unsigned *mm)
 
   for (;;) {
     size_t sz = strcspn(p, ",:");
-    flagent *e, *ee = 0;
+    const flagent *e, *ee = 0;
 
     /* --- Look up the string in the flags table --- */
 
+    if (sz == 4 && strncmp(p, "none", 4) == 0)
+      goto next;
     for (e = flagtab; e->name; e++) {
       if (strncmp(e->name, p, sz) == 0) {
        if (e->name[sz] == 0) {
@@ -138,6 +131,7 @@ int key_readflags(const char *p, char **pp, unsigned *ff, unsigned *mm)
       return (KERR_BADFLAGS);
     m |= ee->m;
     f |= ee->f;
+  next:
     p += sz;
     if (*p == 0 || *p == ':')
       break;
@@ -165,7 +159,7 @@ int key_readflags(const char *p, char **pp, unsigned *ff, unsigned *mm)
 void key_writeflags(unsigned f, dstr *d)
 {
   int del = 0;
-  flagent *e;
+  const flagent *e;
   unsigned m = 0;
 
   for (e = flagtab; e->name; e++) {