bug fixing and support for malloc instead of stack memory (some functions)

[avr-crypto-lib.git] / cast5 / cast5.h

diff --git a/cast5/cast5.h b/cast5/cast5.h
index ea5ea9c8a1278d7120deede92c2c12366918306f..4d04e19403393e15dab060d2183f80cd9a585a27 100644 (file)
--- 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) 2008  Daniel Otte (daniel.otte@rub.de)
 
-    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
@@ -48,14 +50,13 @@
  * This context is regulary generated by the 
  * 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);
  * \brief generate keyschedule/contex for CAST-5
  * 
@@ -89,7 +90,5 @@ void cast5_enc(void *block, const cast5_ctx_t *s);
  */
 void cast5_dec(void *block, const cast5_ctx_t *s);
 
-
-
 #endif