X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/d03ab969116fe715d569304c1c474749b2f64529..025c5f4aa5ffbf8948482a4233318db81c2df5d2:/des3.c

diff --git a/des3.c b/des3.c
index 281d8ea..1b08d2e 100644
--- a/des3.c
+++ b/des3.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: des3.c,v 1.1 1999/09/03 08:41:11 mdw Exp $
+ * $Id: des3.c,v 1.3 2004/04/08 01:36:15 mdw Exp $
  *
  * Implementation of double- and triple-DES
  *
@@ -27,14 +27,6 @@
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: des3.c,v $
- * Revision 1.1  1999/09/03 08:41:11  mdw
- * Initial import.
- *
- */
-
 /*----- Header files ------------------------------------------------------*/
 
 #include <assert.h>
@@ -48,6 +40,11 @@
 #include "des-base.h"
 #include "des.h"
 #include "des3.h"
+#include "gcipher.h"
+
+/*----- Global variables --------------------------------------------------*/
+
+const octet des3_keysz[] = { KSZ_SET, 21, 7, 8, 14, 16, 24, 0 };
 
 /*----- Main code ---------------------------------------------------------*/
 
@@ -70,8 +67,7 @@ void des3_init(des3_ctx *k, const void *buf, size_t sz)
   size_t step;
   const octet *p = buf;
 
-  assert(((void)("des3 key length must be one of 7, 8, 14, 16, 21 or 24"),
-		(sz % 7 == 0 || sz % 8 == 0) && sz < 25));
+  KSZ_ASSERT(des3, sz);
 
   if (sz % 7 == 0)
     step = 7;