blowfish-mktab.c: Remove the eye-candy progress meter.

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

diff --git a/key-pack.c b/key-pack.c
index 0303dbc..7f79800 100644 (file)
--- a/key-pack.c
+++ b/key-pack.c
@@ -7,7 +7,7 @@
  * (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,
@@ -31,7 +31,6 @@
 
 #include <mLib/dstr.h>
 
-#include "key.h"
 #include "key-data.h"
 
 /*----- Generic packing and unpacking -------------------------------------*/
@@ -138,7 +137,7 @@ int key_unpack(key_packdef *kp, key_data *kd, dstr *d)
   /* --- Ensure that the key has the right type --- */
 
   if ((kd->e & KF_ENCMASK) != e) {
-    err = KERR_BADTYPE;
+    err = KERR_WRONGTYPE;
     goto fail;
   }