X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=cast5.c;h=0ed3ddfdaa6fec6bcf32f3ac0925799e4ba902e8;hb=71a4c5f0a397c8a34211ca269356198a0e91da17;hp=a938bfb37118a4661a89dde1f09b09cdf947baba;hpb=96ebafd201c9e8441c7677577b24aa402c1defc6;p=avr-crypto-lib.git

diff --git a/cast5.c b/cast5.c
index a938bfb..0ed3ddf 100644
--- a/cast5.c
+++ b/cast5.c
@@ -19,9 +19,10 @@
 /* 
  * \file	cast5.c
  * \author	Daniel Otte
- * \date 	26.07.2006
+ * \email       daniel.otte@rub.de
+ * \date 	2006-07-26
  * \par License:
- *  GPL
+ *  GPLv3 or later
  * \brief Implementation of the CAST5 (aka CAST-128) cipher algorithm as described in RFC 2144
  * 
  */
@@ -106,23 +107,18 @@ void cast5_init_rM(uint8_t *klo, uint8_t *khi, uint8_t offset, uint8_t *src, boo
 
 
 
-/**
- * \brief sets up round keys (context) for cast5 en/decryption.
- * @param s Pointer to cast5 context.
- * @param key Pointer to binary key.
- * @param keylength length of keydata in bits.
- */
-void cast5_init(cast5_ctx_t* s, uint8_t* key, uint8_t keylength){
+
+void cast5_init(void* key, uint8_t keylength_b, cast5_ctx_t* s){
  	 /* we migth return if the key is valid and if setup was sucessfull */
 	uint32_t x[4], z[4];
 	#define BPX ((uint8_t*)&(x[0]))
 	#define BPZ ((uint8_t*)&(z[0]))
-	s->shortkey = (keylength<=80);
+	s->shortkey = (keylength_b<=80);
 	/* littel endian only! */
 	memset(&(x[0]), 0 ,16); /* set x to zero */
-	if(keylength > 128)
-		keylength=128;
-	memcpy(&(x[0]), key, (keylength+7)/8);
+	if(keylength_b > 128)
+		keylength_b=128;
+	memcpy(&(x[0]), key, (keylength_b+7)/8);
 	
 
 	/* todo: merge a and b and compress the whole stuff */
@@ -269,12 +265,7 @@ uint32_t cast5_f3(uint32_t d, uint32_t m, uint8_t r){
 
 /*************************************************************************/
 
-/**
- * \brief encrypts a datablock with cast5
- * @param s Pointer to cast5 roundkeys (context)
- * @param block Pointer to datablock
- */
-void cast5_enc(cast5_ctx_t *s, void* block){
+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};
@@ -298,12 +289,7 @@ void cast5_enc(cast5_ctx_t *s, void* block){
 
 /*************************************************************************/
 
-/**
- * \brief decrypts a datablock with cast5
- * @param s Pointer to cast5 roundkeys (context)
- * @param block Pointer to datablock
- */
-void cast5_dec(cast5_ctx_t *s, void* block){
+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};