X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;ds=sidebyside;f=cast5.c;h=0ed3ddfdaa6fec6bcf32f3ac0925799e4ba902e8;hb=a1518b457d04b4d5819e6ce4d7815eab53f937da;hp=ebe1ce69d1bdb09d297b0945ae1225e048f36479;hpb=3c995d0a8faeb9d37927d48e20fc45d839e066ea;p=avr-crypto-lib.git
diff --git a/cast5.c b/cast5.c
index ebe1ce6..0ed3ddf 100644
--- a/cast5.c
+++ b/cast5.c
@@ -1,22 +1,44 @@
+/* cast5.c */
+/*
+ This file is part of the Crypto-avr-lib/microcrypt-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 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 .
+*/
/*
- * File: cast5.c
- * Author: Daniel Otte
- * Date: 26.07.2006
- * License: GPL
- * Description: Implementation of the CAST5 (aka CAST-128) cipher algorithm as described in RFC 2144
+ * \file cast5.c
+ * \author Daniel Otte
+ * \email daniel.otte@rub.de
+ * \date 2006-07-26
+ * \par License:
+ * GPLv3 or later
+ * \brief Implementation of the CAST5 (aka CAST-128) cipher algorithm as described in RFC 2144
*
*/
- //pgm_read_dword
#include
#include
#include "cast5.h"
#include "config.h"
- #include "uart.h"
#include "debug.h"
#undef DEBUG
+ #ifdef DEBUG
+ #include "uart.h"
+ #endif
+
#include "cast5-sbox.h"
@@ -86,15 +108,17 @@ void cast5_init_rM(uint8_t *klo, uint8_t *khi, uint8_t offset, uint8_t *src, boo
-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 */
- memcpy(&(x[0]), key, keylength/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 */
@@ -203,8 +227,10 @@ uint32_t cast5_f2(uint32_t d, uint32_t m, uint8_t r){
return (((ia - ib) + ic) ^ id);
#else
- return (((pgm_read_dword(&s1[((uint8_t*)&t)[IA]] ) - pgm_read_dword(&s2[((uint8_t*)&t)[IB]] ))
- + pgm_read_dword(&s3[((uint8_t*)&t)[IC]] )) ^ pgm_read_dword(&s4[((uint8_t*)&t)[ID]]));
+ return (((pgm_read_dword(&s1[((uint8_t*)&t)[IA]])
+ - pgm_read_dword(&s2[((uint8_t*)&t)[IB]]) )
+ + pgm_read_dword(&s3[((uint8_t*)&t)[IC]]) )
+ ^ pgm_read_dword(&s4[((uint8_t*)&t)[ID]]) );
#endif
}
@@ -237,9 +263,9 @@ uint32_t cast5_f3(uint32_t d, uint32_t m, uint8_t r){
#endif
}
+/*************************************************************************/
-
-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};
@@ -261,8 +287,9 @@ void cast5_enc(cast5_ctx_t *s, void* block){
((uint32_t*)block)[1]=l;
}
+/*************************************************************************/
-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};