X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=cast5.c;h=a938bfb37118a4661a89dde1f09b09cdf947baba;hb=96ebafd201c9e8441c7677577b24aa402c1defc6;hp=34c5a78e3dc5a674ad3afabb0cb15293391ec6bb;hpb=9b1bf59ca8d49db1a7495d95119c68d62b036c59;p=avr-crypto-lib.git

diff --git a/cast5.c b/cast5.c
index 34c5a78..a938bfb 100644
--- a/cast5.c
+++ b/cast5.c
@@ -1,3 +1,21 @@
+/* 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 <http://www.gnu.org/licenses/>.
+*/
 /* 
  * \file	cast5.c
  * \author	Daniel Otte
@@ -102,7 +120,9 @@ void cast5_init(cast5_ctx_t* s, uint8_t* key, uint8_t keylength){
 	s->shortkey = (keylength<=80);
 	/* littel endian only! */
 	memset(&(x[0]), 0 ,16); /* set x to zero */
-	memcpy(&(x[0]), key, keylength/8);
+	if(keylength > 128)
+		keylength=128;
+	memcpy(&(x[0]), key, (keylength+7)/8);
 	
 
 	/* todo: merge a and b and compress the whole stuff */
@@ -211,8 +231,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
 }