X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/d03ab969116fe715d569304c1c474749b2f64529..578a86d91941a0f722b87973d88e84ec2cf9a608:/des.c

diff --git a/des.c b/des.c
index cb73a8e..822a12f 100644
--- a/des.c
+++ b/des.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: des.c,v 1.1 1999/09/03 08:41:11 mdw Exp $
+ * $Id: des.c,v 1.3 2004/04/08 01:36:15 mdw Exp $
  *
  * The Data Encryption Standard
  *
@@ -27,14 +27,6 @@
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: des.c,v $
- * Revision 1.1  1999/09/03 08:41:11  mdw
- * Initial import.
- *
- */
-
 /*----- Header files ------------------------------------------------------*/
 
 #include <assert.h>
@@ -47,6 +39,11 @@
 #include "blkc.h"
 #include "des-base.h"
 #include "des.h"
+#include "gcipher.h"
+
+/*----- Global variables --------------------------------------------------*/
+
+const octet des_keysz[] = { KSZ_SET, 7, 8, 0 };
 
 /*----- Main code ---------------------------------------------------------*/
 
@@ -189,7 +186,7 @@ void des_init(des_ctx *k, const void *buf, size_t sz)
    * table.
    */
 
-  assert(((void)"DES key must be 56 or 64 bits", sz == 7 || sz == 8));
+  KSZ_ASSERT(des, sz);
 
   if (sz == 8) {
     const octet *p = buf;