X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/680bedf81bb4e939d3137ef0a4d9ca25a4638355..89ae755da614975a84c65da6ffcf351dec60a690:/des.c diff --git a/des.c b/des.c index cb73a8e..d48637b 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.2 2000/06/17 10:52:32 mdw Exp $ * * The Data Encryption Standard * @@ -30,6 +30,9 @@ /*----- Revision history --------------------------------------------------* * * $Log: des.c,v $ + * Revision 1.2 2000/06/17 10:52:32 mdw + * Support new key size interface. + * * Revision 1.1 1999/09/03 08:41:11 mdw * Initial import. * @@ -47,6 +50,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 +197,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;