Make tables of standard encryption schemes etc.

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

diff --git a/key-attr.c b/key-attr.c
index 3737a5d..d4f2e05 100644 (file)
--- a/key-attr.c
+++ b/key-attr.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: key-attr.c,v 1.1 1999/12/22 15:47:48 mdw Exp $
+ * $Id: key-attr.c,v 1.3 2001/06/22 19:39:43 mdw Exp $
  *
  * Key attribute manipulation
  *
@@ -30,6 +30,12 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: key-attr.c,v $
+ * Revision 1.3  2001/06/22 19:39:43  mdw
+ * Allow tagging if the tag is owned by a deleted key.
+ *
+ * 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.
  *
@@ -43,7 +49,7 @@
 #include <string.h>
 #include <time.h>
 
-#include <mLib/alloc.h>
+#include <mLib/dstr.h>
 #include <mLib/sym.h>
 
 #include "key.h"
@@ -246,7 +252,7 @@ int key_settag(key_file *f, key *k, const char *tag)
 
   if (tag) {
     kr = sym_find(&f->bytag, tag, -1, sizeof(*kr), &found);
-    if (found)
+    if (found && !KEY_EXPIRED(time(0), kr->k->del))
       return (KERR_DUPTAG);
     kr->k = k;
   }