X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=cast5%2Fcast5.c;h=6118aeeba5c98d966159664df2f00d3d7f401caf;hb=b3cf9d2f35e428cae278fffb8a8f5820d40c833b;hp=6d7f42fff5b3d323cb7950e2ca1af65154baf077;hpb=d32eba56ce10ea6b9eff123b50d9842673b38f2b;p=avr-crypto-lib.git

diff --git a/cast5/cast5.c b/cast5/cast5.c
index 6d7f42f..6118aee 100644
--- a/cast5/cast5.c
+++ b/cast5/cast5.c
@@ -27,17 +27,16 @@
  * 
  */
  
- #include <stdint.h>
- #include <string.h>
- #include "cast5.h"
- #include "config.h"
- #include "debug.h"
- 
- #undef DEBUG
+#include <stdint.h>
+#include <string.h>
+#include "cast5.h"
+#include <avr/pgmspace.h> 
+
+#undef DEBUG
  
- #ifdef DEBUG
-  #include "cli.h"
- #endif
+#ifdef DEBUG
+ #include "cli.h"
+#endif
  
 #include "cast5-sbox.h"
 
@@ -130,7 +129,7 @@ void cast5_init_rM(uint8_t *klo, uint8_t *khi, uint8_t offset, uint8_t *src, boo
 
 
 
-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){
  	 /* we migth return if the key is valid and if setup was successful */
 	uint32_t x[4], z[4];
 	#define BPX ((uint8_t*)&(x[0]))
@@ -292,10 +291,10 @@ uint32_t cast5_f3(uint32_t d, uint32_t m, uint8_t r){
 
 /******************************************************************************/
 
-void cast5_enc(void* block, const cast5_ctx_t *s){
+void cast5_enc(void *block, const cast5_ctx_t *s){
 	uint32_t l,r, x, y;
 	uint8_t i;
-	cast5_f_t* f[]={cast5_f1,cast5_f2,cast5_f3};
+	cast5_f_t *f[]={cast5_f1,cast5_f2,cast5_f3};
 	l=((uint32_t*)block)[0];
 	r=((uint32_t*)block)[1];
 //	cli_putstr("\r\n round[-1] = ");
@@ -316,10 +315,10 @@ void cast5_enc(void* block, const cast5_ctx_t *s){
 
 /******************************************************************************/
 
-void cast5_dec(void* block, const cast5_ctx_t *s){
+void cast5_dec(void *block, const cast5_ctx_t *s){
 	uint32_t l,r, x, y;
 	int8_t i, rounds;
-	cast5_f_t* f[]={cast5_f1,cast5_f2,cast5_f3};
+	cast5_f_t *f[]={cast5_f1,cast5_f2,cast5_f3};
 	l=((uint32_t*)block)[0];
 	r=((uint32_t*)block)[1];
 	rounds = (s->shortkey?12:16);