Make it all compile properly.

diff --git a/Makefile.m4 b/Makefile.m4
index bf7b533..15ed97f 100644 (file)
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ##
-## $Id: Makefile.m4,v 1.24 2000/02/12 18:22:26 mdw Exp $
+## $Id: Makefile.m4,v 1.25 2000/02/12 18:55:40 mdw Exp $
 ##
 ## Makefile for Catacomb
 ##
@@ -29,6 +29,9 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.m4,v $
+## Revision 1.25  2000/02/12 18:55:40  mdw
+## Make it all compile properly.
+##
 ## Revision 1.24  2000/02/12 18:22:26  mdw
 ## Missed a file.  Whoops.
 ##
@@ -219,7 +222,7 @@ mpx.lo: mptypes.h
 
 ## --- Utility programs ---
 
-bin_PROGRAMS = key pixie rspit distsig
+bin_PROGRAMS = key pixie rspit
 bin_SCRIPTS = catacomb-config xpixie
 noinst_PROGRAMS = des-mktab genprimes mptypes
 LDADD = libcatacomb.la
@@ -231,8 +234,6 @@ pixie_LDADD =
 
 rspit_SOURCES = rspit.c
 
-distsig_SOURCES = distsig.c
-
 des_mktab_SOURCES = des-mktab.c
 des_mktab_LDADD =
 

diff --git a/key-error.c b/key-error.c
index 8ca934e..7b72d44 100644 (file)
--- a/key-error.c
+++ b/key-error.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: key-error.c,v 1.1 2000/02/12 18:21:02 mdw Exp $
+ * $Id: key-error.c,v 1.2 2000/02/12 18:55:40 mdw Exp $
  *
  * Translating key error codes into strings
  *
@@ -30,6 +30,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: key-error.c,v $
+ * Revision 1.2  2000/02/12 18:55:40  mdw
+ * Make it all compile properly.
+ *
  * Revision 1.1  2000/02/12 18:21:02  mdw
  * Overhaul of key management (again).
  *
@@ -62,7 +65,11 @@ const char *key_strerror(int err)
     "Key tag already exists",
     "Key file is read-only",
     "Key will eventually expire",
+    "Key has expired",
     "Bad key flags string",
+    "Failed to unlock encrypted key",
+    "Unexpected key encoding type",
+    "Key not found",
     "Unknown error code"
   };
   

diff --git a/key.h b/key.h
index d779489..88d4de5 100644 (file)
--- a/key.h
+++ b/key.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: key.h,v 1.4 2000/02/12 18:21:02 mdw Exp $
+ * $Id: key.h,v 1.5 2000/02/12 18:55:40 mdw Exp $
  *
  * Simple key management
  *
@@ -30,6 +30,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: key.h,v $
+ * Revision 1.5  2000/02/12 18:55:40  mdw
+ * Make it all compile properly.
+ *
  * Revision 1.4  2000/02/12 18:21:02  mdw
  * Overhaul of key management (again).
  *
@@ -175,7 +178,7 @@ enum {
   KERR_EXPIRED = -8,                   /* Key has already expired */
   KERR_BADFLAGS = -9,                  /* Error in flags string */
   KERR_BADPASS = -10,                  /* Error decrypting locked key */
-  KERR_BADTYPE = -11,                  /* Key has incorrect type */
+  KERR_WRONGTYPE = -11,                        /* Key has incorrect type */
   KERR_NOTFOUND = -12,                 /* Key couldn't be found */
   KERR_MAX                             /* Largest possible error */
 };