+A5/1

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

diff --git a/cast5.c b/cast5.c
index 34c5a78e3dc5a674ad3afabb0cb15293391ec6bb..bab5c065cb7c430c09b3a93b5d3f72156bc1816c 100644 (file)
--- a/cast5.c
+++ b/cast5.c
@@ -102,7 +102,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 +213,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
 }