a lot of fixes

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

diff --git a/cast6/cast6.c b/cast6/cast6.c
index c4922fc9465b2fc1f9c890ee8d03ddc31f0cf8a9..5fc7684cd01424d0a7067652b736a6ed36d72d19 100644 (file)
--- a/cast6/cast6.c
+++ b/cast6/cast6.c
@@ -11,7 +11,7 @@
 #include <string.h>
 #include <avr/pgmspace.h>
 #include "cast6.h"
-#include "cast6_sboxes.h"
+#include "cast6-sbox.h"
 
 #define CHANGE_ENDIAN32(x) (((x)<<24 | (x)>>24 | ((x)&0xff00)<<8 | ((x)&0xff0000)>>8)&0xffffffff)
 
@@ -255,10 +255,10 @@ void cast6_init(const void* key, uint16_t keysize_b, cast6_ctx_t* ctx){
                        ctx->km[j][1]=F;
                        ctx->km[j][2]=D;
                        ctx->km[j][3]=B;
-                       set_kr((uint8_t)A,j*4+0,ctx);
-                       set_kr((uint8_t)C,j*4+1,ctx);
-                       set_kr((uint8_t)E,j*4+2,ctx);
-                       set_kr((uint8_t)G,j*4+3,ctx);
+                       set_kr(buffer[0*4],j*4+0,ctx);
+                       set_kr(buffer[2*4],j*4+1,ctx);
+                       set_kr(buffer[4*4],j*4+2,ctx);
+                       set_kr(buffer[6*4],j*4+3,ctx);
                }
        }
 }