small update (integrating NOEKEON_OMAC and SEED_C)

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

diff --git a/cast5.c b/cast5.c
index 8a71e6dda5f731757cd98a8037b4331438fb5466..a7984d489861f1ac9246348a47efe90b3c69c890 100644 (file)
--- a/cast5.c
+++ b/cast5.c
@@ -107,13 +107,8 @@ 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(uint8_t* key, uint8_t keylength_b, cast5_ctx_t* s){
+
+void cast5_init(const 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]))
@@ -203,8 +198,10 @@ uint32_t cast5_f1(uint32_t d, uint32_t m, uint8_t r){
 
 #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
 }
@@ -232,8 +229,8 @@ 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]]) ) 
+       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]]) );
 
@@ -262,20 +259,17 @@ uint32_t cast5_f3(uint32_t d, uint32_t m, uint8_t r){
        uart_putstr("\r\n\tID="); uart_hexdump(&id, 4);
        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
 }
 
 /*************************************************************************/
 
-/**
- * \brief encrypts a datablock with cast5
- * @param block Pointer to datablock
- * @param s Pointer to cast5 roundkeys (context)
- */
-void cast5_enc(void* block, 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};
@@ -299,12 +293,7 @@ void cast5_enc(void* block, cast5_ctx_t *s){
 
 /*************************************************************************/
 
-/**
- * \brief decrypts a datablock with cast5
- * @param block Pointer to datablock
- * @param s Pointer to cast5 roundkeys (context)
- */
-void cast5_dec(void* block, 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};