X-Git-Url: https://git.distorted.org.uk/~mdw/become/blobdiff_plain/c4f2d992e4a0fc068281376d89ec38de56dc2f58..0b467be25069413b3790ab2c6447bb18f2b283cd:/src/blowfish.h

diff --git a/src/blowfish.h b/src/blowfish.h
index 23519a6..668a661 100644
--- a/src/blowfish.h
+++ b/src/blowfish.h
@@ -1,13 +1,13 @@
 /* -*-c-*-
  *
- * $Id: blowfish.h,v 1.1 1997/07/21 13:47:53 mdw Exp $
+ * $Id: blowfish.h,v 1.4 1997/09/26 09:14:57 mdw Exp $
  *
  * Blowfish encryption routines
  *
  * (c) 1997 Mark Wooding
  */
  
-/*----- Licencing notice --------------------------------------------------*
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of `become'
  *
@@ -22,14 +22,28 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with `become'; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * along with `become'; 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  1997/07/21 13:47:53  mdw
+ * Revision 1.4  1997/09/26 09:14:57  mdw
+ * Merged blowfish branch into trunk.
+ *
+ * Revision 1.3.2.1  1997/09/26 09:07:59  mdw
+ * Use the Blowfish encryption algorithm instead of IDEA.  This is partly
+ * because I prefer Blowfish (without any particularly strong evidence) but
+ * mainly because IDEA is patented and Blowfish isn't.
+ *
+ * Revision 1.3  1997/08/07 09:43:20  mdw
+ * Fix address of the FSF.
+ *
+ * Revision 1.2  1997/08/04 10:24:20  mdw
+ * Sources placed under CVS control.
+ *
+ * Revision 1.1  1997/07/21  13:47:53  mdw
  * Initial revision
  *
  */
@@ -41,6 +55,12 @@
   extern "C" {
 #endif
 
+/*----- Required headers --------------------------------------------------*/
+
+#ifndef CONFIG_H
+#  include "config.h"
+#endif
+
 /*----- Type definitions --------------------------------------------------*/
 
 /* --- A blowfish expanded key --- */
@@ -53,6 +73,10 @@ typedef struct blowfish_key {
   uint_32 s3[256];
 } blowfish_key;
 
+/* --- Size of a blowfish block --- */
+
+#define BLOWFISH_BLKSIZE (8u)
+
 /*----- Functions provided ------------------------------------------------*/
 
 /* --- @blowfish_encrypt@ --- *