cc.h: Fix FHF_MASK.

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

diff --git a/key-misc.c b/key-misc.c
index 37027c0..5ff7078 100644 (file)
--- a/key-misc.c
+++ b/key-misc.c
@@ -1,13 +1,13 @@
 /* -*-c-*-
  *
- * $Id: key-misc.c,v 1.5 2004/04/08 01:36:15 mdw Exp $
+ * $Id$
  *
  * Simple key management
  *
  * (c) 1999 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of Catacomb.
  *
@@ -15,12 +15,12 @@
  * it under the terms of the GNU Library General Public License as
  * published by the Free Software Foundation; either version 2 of the
  * License, or (at your option) any later version.
- * 
+ *
  * Catacomb is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Library General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Library General Public
  * License along with Catacomb; if not, write to the Free
  * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
@@ -177,7 +177,7 @@ key *key_bytag(key_file *f, const char *tag)
  *             @const char *tag@ = pointer to tag string
  *             @dstr *d@ = pointer to string for full tag name
  *             @key **k@ = where to store the key pointer
- *             @key_data **kd@ = where to store the key data pointer
+ *             @key_data ***kd@ = where to store the key data pointer
  *
  * Returns:    Zero if OK, nonzero if it failed.
  *
@@ -185,15 +185,15 @@ key *key_bytag(key_file *f, const char *tag)
  *             qualified by the names of subkeys, separated by dots.  Hence,
  *             a qualified tag is ID|TAG[.TAG...].  The various result
  *             pointers can be null to indicate that the result isn't
- *             interesting. 
+ *             interesting.
  */
 
-int key_qtag(key_file *f, const char *tag, dstr *d, key **k, key_data **kd)
+int key_qtag(key_file *f, const char *tag, dstr *d, key **k, key_data ***kd)
 {
   dstr dd = DSTR_INIT;
   const char *q;
   key *kk;
-  key_data *kkd;
+  key_data **kkd;
 
   /* --- Find the end of the base tag --- */
 
@@ -222,36 +222,42 @@ int key_qtag(key_file *f, const char *tag, dstr *d, key **k, key_data **kd)
 
   /* --- Now dig through the rest of the tag --- */
 
-  while (q && *q) {
-
-    /* --- Stick on the next bit of the fullqtag --- */
-
-    DRESET(&dd);
-    while (*q && *q != '.') {
-      DPUTC(&dd, *q);
-      q++;
-    }
-    DPUTZ(&dd);
-    if (d) {
-      DPUTC(d, '.');
-      DPUTD(d, &dd);
-    }
-
-    /* --- Look up the subkey --- */
-
-    if (kkd->e != KENC_STRUCT) {
-      kkd = 0;
-      break;
+  if (q) {
+    while (*q) {
+      key_struct *ks;
+
+      /* --- Stick on the next bit of the fullqtag --- */
+
+      DRESET(&dd);
+      while (*q && *q != '.') {
+       DPUTC(&dd, *q);
+       q++;
+      }
+      DPUTZ(&dd);
+      if (d) {
+       DPUTC(d, '.');
+       DPUTD(d, &dd);
+      }
+
+      /* --- Look up the subkey --- */
+
+      if ((*kkd)->e != KENC_STRUCT) {
+       kkd = 0;
+       break;
+      }
+      if ((ks = sym_find(&(*kkd)->u.s, dd.buf, -1, 0, 0)) == 0) {
+       kkd = 0;
+       break;
+      }
+      kkd = &ks->k;
     }
-    if ((kkd = key_structfind(kkd, dd.buf)) == 0)
-      break;
   }
 
   /* --- Return the results --- */
 
+  dstr_destroy(&dd);
   if (!kkd)
     return (-1);
-  dstr_destroy(&dd);
   if (kd)
     *kd = kkd;
   return (0);
@@ -371,13 +377,15 @@ int key_fingerprint(key *k, ghash *h, const key_filter *kf)
   dstr d = DSTR_INIT;
   int rc = 0;
   key_attr *a, **v;
-  size_t n, i, len;
-  octet b[2];
+  size_t n, i;
   sym_iter ai;
 
-  if (!key_encode(&k->k, &d, kf))
+  if (!key_encode(k->k, &d, kf))
     goto done;
   rc = 1;
+  GH_HASHSTR(h, "catacomb-key-fingerprint:");
+  GH_HASHU32(h, k->id);
+  GH_HASHSTR8(h, k->type);
   GH_HASH(h, d.buf, d.len);
   for (n = 0, sym_mkiter(&ai, &k->a); (a = sym_next(&ai)) != 0; n++);
   if (n) {
@@ -385,17 +393,12 @@ int key_fingerprint(key *k, ghash *h, const key_filter *kf)
     for (i = 0, sym_mkiter(&ai, &k->a); (a = sym_next(&ai)) != 0; i++)
       v[i] = a;
     qsort(v, n, sizeof(*v), abyname);
-    len = strlen(k->type); STORE8(b, len);
-    GH_HASH(h, b, 1); GH_HASH(h, k->type, len);
     for (i = 0; i < n; i++) {
-      a = v[i];
-      len = strlen(SYM_NAME(a)); STORE8(b, len);
-      GH_HASH(h, b, 1); GH_HASH(h, SYM_NAME(a), len);
-      len = strlen(a->p); STORE16(b, len);
-      GH_HASH(h, b, 2); GH_HASH(h, a->p, len);
+      GH_HASHSTR8(h, SYM_NAME(v[i]));
+      GH_HASHSTR16(h, v[i]->p);
     }
     xfree(v);
-  }    
+  }
 done:
   dstr_destroy(&d);
   return (rc);