Miscellaneous constification.

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

diff --git a/key-flags.c b/key-flags.c
index f25bb21..d80da4f 100644 (file)
--- a/key-flags.c
+++ b/key-flags.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: key-flags.c,v 1.1 1999/12/22 15:47:48 mdw Exp $
+ * $Id: key-flags.c,v 1.4 2004/04/02 01:03:49 mdw Exp $
  *
  * Reading and writing key flag strings
  *
@@ -30,6 +30,15 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: key-flags.c,v $
+ * Revision 1.4  2004/04/02 01:03:49  mdw
+ * Miscellaneous constification.
+ *
+ * Revision 1.3  2004/03/28 01:58:47  mdw
+ * Generate, store and retreive elliptic curve keys.
+ *
+ * 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.
  *
@@ -60,7 +69,7 @@ typedef struct flagent {
   unsigned m;
 } flagent;
 
-static flagent flagtab[] = {
+static const flagent flagtab[] = {
 
   /* --- Encoding types --- */
 
@@ -68,6 +77,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 --- */
 
@@ -108,7 +119,7 @@ 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 --- */
 
@@ -162,7 +173,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++) {
@@ -176,4 +187,31 @@ void key_writeflags(unsigned f, dstr *d)
   }
 }
 
+/* --- @key_match@ --- *
+ *
+ * Arguments:  @key_data *k@ = pointer to key data block
+ *             @const key_filter *kf@ = pointer to filter block
+ *
+ * Returns:    Nonzero if the key matches the filter.
+ *
+ * Use:                Checks whether a key matches a filter.
+ */
+
+int key_match(key_data *k, const key_filter *kf)
+{
+  sym_iter i;
+  key_struct *ks;
+
+  if (!kf)
+    return (1);
+  if ((k->e & KF_ENCMASK) != KENC_STRUCT)
+    return ((k->e & kf->m) == kf->f);
+
+  for (sym_mkiter(&i, &k->u.s); (ks = sym_next(&i)) != 0; ) {
+    if (key_match(&ks->k, kf))
+      return (1);
+  }
+  return (0);
+}
+
 /*----- That's all, folks -------------------------------------------------*/