X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/5c3f75ec49019d160806489824fc76652a2ef444..df82bc85db06b9cd8917aec33aadaf151d9d4a46:/blkc.h diff --git a/blkc.h b/blkc.h index 77ecf0e..d95c4f9 100644 --- a/blkc.h +++ b/blkc.h @@ -1,13 +1,13 @@ /* -*-c-*- * - * $Id: blkc.h,v 1.8 2004/04/17 09:58:36 mdw Exp $ + * $Id$ * * Common definitions for block ciphers * * (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, @@ -257,6 +257,8 @@ #ifdef TEST_RIG +#include + #include #include @@ -287,7 +289,7 @@ static int pre##_verify(dstr *v) \ if (memcmp(b.buf, v[2].buf, PRE##_BLKSZ)) { \ ok = 0; \ printf("\nfail encryption:" \ - "\n\tkey = "); \ + "\n\tkey = "); \ type_hex.dump(&v[0], stdout); \ printf("\n\tplaintext = "); type_hex.dump(&v[1], stdout); \ printf("\n\texpected = "); type_hex.dump(&v[2], stdout); \ @@ -303,7 +305,7 @@ static int pre##_verify(dstr *v) \ if (memcmp(b.buf, v[1].buf, PRE##_BLKSZ)) { \ ok = 0; \ printf("\nfail decryption:" \ - "\n\tkey = "); \ + "\n\tkey = "); \ type_hex.dump(&v[0], stdout); \ printf("\n\tciphertext = "); type_hex.dump(&v[2], stdout); \ printf("\n\texpected = "); type_hex.dump(&v[1], stdout); \