X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/ffd4d6a38b97c6aebbaec731c9c847b4983ae0c3..351bdbb15a6542300462a9c4676d08642dac054d:/xtea.h

diff --git a/xtea.h b/xtea.h
index 94f8d2c..9e40b1e 100644
--- a/xtea.h
+++ b/xtea.h
@@ -1,13 +1,13 @@
 /* -*-c-*-
  *
- * $Id: xtea.h,v 1.2 2000/07/15 13:47:14 mdw Exp $
+ * $Id: xtea.h,v 1.4 2004/04/08 01:36:15 mdw Exp $
  *
  * The Extended Tiny Encryption Algorithm
  *
  * (c) 2000 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of Catacomb.
  *
@@ -15,29 +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: xtea.h,v $
- * Revision 1.2  2000/07/15 13:47:14  mdw
- * Whoops.  Fix the purpose comment.
- *
- * Revision 1.1  2000/07/15 13:44:31  mdw
- * New ciphers.
- *
- */
-
 /*----- Notes on the Tiny Encryption Algorithm ----------------------------*
  *
  * XTEA is an amazingly simple 64-round Feistel network.  It's tiny, fairly
@@ -72,6 +61,7 @@ extern const octet xtea_keysz[];
 /*----- Data structures ---------------------------------------------------*/
 
 typedef struct xtea_ctx {
+  unsigned r;
   uint32 k[4];
 } xtea_ctx;
 
@@ -79,13 +69,13 @@ typedef struct xtea_ctx {
 
 /* --- @xtea_init@ --- *
  *
- * Arguments:   @xtea_ctx *k@ = pointer to key block
- *              @const void *buf@ = pointer to key buffer
- *              @size_t sz@ = size of key material
+ * Arguments:	@xtea_ctx *k@ = pointer to key block
+ *		@const void *buf@ = pointer to key buffer
+ *		@size_t sz@ = size of key material
  *
- * Returns:     ---
+ * Returns:	---
  *
- * Use:         Initializes an XTEA key buffer.  The key buffer may be up to
+ * Use:		Initializes an XTEA key buffer.  The key buffer may be up to
  *		16 bytes long.
  */
 
@@ -93,13 +83,13 @@ extern void xtea_init(xtea_ctx */*k*/, const void */*buf*/, size_t /*sz*/);
 
 /* --- @xtea_eblk@, @xtea_dblk@ --- *
  *
- * Arguments:   @const xtea_ctx *k@ = pointer to key block
- *              @const uint32 s[2]@ = pointer to source block
- *              @uint32 d[2]@ = pointer to xteatination block
+ * Arguments:	@const xtea_ctx *k@ = pointer to key block
+ *		@const uint32 s[2]@ = pointer to source block
+ *		@uint32 d[2]@ = pointer to xteatination block
  *
- * Returns:     ---
+ * Returns:	---
  *
- * Use:         Low-level block encryption and decryption.
+ * Use:		Low-level block encryption and decryption.
  */
 
 extern void xtea_eblk(const xtea_ctx */*k*/,