X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=blobdiff_plain;f=cast5%2Fcast5.h;h=d3cf02b08e26ef0d89c531cb0a0cd158039936b4;hp=b014f7c9e8d3174c3c7b9b7cac076b6e6960c7ee;hb=4b5da1dc27a791b5c448274a3db09cd035b33493;hpb=d32eba56ce10ea6b9eff123b50d9842673b38f2b

diff --git a/cast5/cast5.h b/cast5/cast5.h
index b014f7c..d3cf02b 100644
--- a/cast5/cast5.h
+++ b/cast5/cast5.h
@@ -1,21 +1,21 @@
 /* cast5.h */
 /*
-    This file is part of the AVR-Crypto-Lib.
-    Copyright (C) 2008  Daniel Otte (daniel.otte@rub.de)
+ This file is part of the AVR-Crypto-Lib.
+ Copyright (C) 2006-2015 Daniel Otte (bg@nerilex.org)
 
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
 
-    This program 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 General Public License for more details.
+ This program 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 General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 /** 
  * \file	cast5.h
  * \author	Daniel Otte
@@ -32,13 +32,15 @@
 
 #ifndef BOOL
 #define BOOL
- #ifndef __BOOL
- #define __BOOL
-  #ifndef __BOOL__
-  #define __BOOL__
-	typedef enum{false=0,true=1} bool;
-  #endif
- #endif
+#ifndef __BOOL
+#define __BOOL
+#ifndef __BOOL__
+#define __BOOL__
+typedef enum {
+    false = 0, true = 1
+} bool;
+#endif
+#endif
 #endif
 
 /** \typedef cast5_ctx_t
@@ -46,17 +48,16 @@
  * 
  * A variable of this type may hold a keyschedule for the CAST-5 cipher. 
  * This context is regulary generated by the 
- * cast5_init(uint8_t* key, uint8_t keylength_b, cast5_ctx_t* s) function.
+ * cast5_init(uint8_t *key, uint8_t keylength_b, cast5_ctx_t *s) function.
  */
-typedef struct cast5_ctx_st{
-	uint32_t	mask[16];
-	uint8_t		rotl[8];	/* 4 bit from every rotation key is stored here */
-	uint8_t		roth[2];	/* 1 bit from every rotation key is stored here */
-	bool		shortkey;
+typedef struct cast5_ctx_st {
+    uint32_t mask[16];
+    uint8_t rotl[8]; /* 4 bit from every rotation key is stored here */
+    uint8_t roth[2]; /* 1 bit from every rotation key is stored here */
+    bool shortkey;
 } cast5_ctx_t;
 
-
-/** \fn void cast5_init(const void* key, uint16_t keylength_b, cast5_ctx_t* s);
+/** \fn void cast5_init(const void *key, uint16_t keylength_b, cast5_ctx_t *s);
  * \brief generate keyschedule/contex for CAST-5
  * 
  * This function generates the keyschedule from the supplied key for the 
@@ -65,31 +66,29 @@ typedef struct cast5_ctx_st{
  * \param keylength_b length of the key in bits (maximum 128 bits)
  * \param s pointer to the context
  */
-void cast5_init(const void* key, uint16_t keylength_b, cast5_ctx_t* s);
+void cast5_init(const void *key, uint16_t keylength_b, cast5_ctx_t *s);
 
-/** \fn void cast5_enc(void* block, const cast5_ctx_t* s);
+/** \fn void cast5_enc(void *block, const cast5_ctx_t *s);
  * \brief encrypt a block with the CAST-5 algorithm
  * 
  * This function encrypts a block of 64 bits (8 bytes) with the CAST-5 algorithm.
  * It uses a keyschedule as generated by the 
- * cast5_init(void* key, uint8_t keylength_b, cast5_ctx_t* s) function.
+ * cast5_init(void *key, uint8_t keylength_b, cast5_ctx_t *s) function.
  * \param block pointer to the block which gets encrypted
  * \param s pointer to the keyschedule/context
  */
-void cast5_enc(void* block, const cast5_ctx_t* s);
+void cast5_enc(void *block, const cast5_ctx_t *s);
 
-/** \fn void cast5_dec(void* block, const cast5_ctx_t* s);
+/** \fn void cast5_dec(void *block, const cast5_ctx_t *s);
  * \brief decrypt a block with the CAST-5 algorithm
  * 
  * This function decrypts a block of 64 bits (8 bytes) with the CAST-5 algorithm.
  * It uses a keyschedule as generated by the 
- * cast5_init(void* key, uint8_t keylength_b, cast5_ctx_t* s) function.
+ * cast5_init(void *key, uint8_t keylength_b, cast5_ctx_t *s) function.
  * \param block pointer to the block which gets decrypted
  * \param s pointer to the keyschedule/context
  */
-void cast5_dec(void* block, const cast5_ctx_t* s);
-
-
+void cast5_dec(void *block, const cast5_ctx_t *s);
 
 #endif