X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/d03ab969116fe715d569304c1c474749b2f64529..78614e02310dbe879d55f0a68e47349db074ff61:/blowfish.h

diff --git a/blowfish.h b/blowfish.h
index 9f4fb56..a9ece5e 100644
--- a/blowfish.h
+++ b/blowfish.h
@@ -1,13 +1,13 @@
 /* -*-c-*-
  *
- * $Id: blowfish.h,v 1.1 1999/09/03 08:41:11 mdw Exp $
+ * $Id: blowfish.h,v 1.4 2004/04/08 01:36:15 mdw Exp $
  *
  * The Blowfish block cipher
  *
  * (c) 1998 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of Catacomb.
  *
@@ -15,26 +15,18 @@
  * 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,
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: blowfish.h,v $
- * Revision 1.1  1999/09/03 08:41:11  mdw
- * Initial import.
- *
- */
-
 /*----- Notes on the Blowfish block cipher --------------------------------*
  *
  * Blowfish was invented by Bruce Schneier.  The algorithm is unpatented and
@@ -44,8 +36,8 @@
  * has a particularly heavyweight key schedule.
  */
 
-#ifndef BLOWFISH_H
-#define BLOWFISH_H
+#ifndef CATACOMB_BLOWFISH_H
+#define CATACOMB_BLOWFISH_H
 
 #ifdef __cplusplus
   extern "C" {
@@ -60,9 +52,11 @@
 /*----- Magical numbers ---------------------------------------------------*/
 
 #define BLOWFISH_BLKSZ 8
-#define BLOWFISH_KEYSZ 0
+#define BLOWFISH_KEYSZ 32
 #define BLOWFISH_CLASS (N, B, 64)
 
+extern const octet blowfish_keysz[];
+
 /*----- Data structures ---------------------------------------------------*/
 
 typedef struct blowfish_ctx {