+fix camellia-encrytion bug (state was modifyed by encryption routine)

+some code enhancements (remove of // comments, ...)

diff --git a/Makefile b/Makefile
index c2d824c51bfbcda5da1cc61fed6bdd0a867d40bd..ff74790e2a9f955136841e786276332cc1755a84 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,12 @@
-PRG        = rc6
+PRG        = camellia
 # camellia
 # cryptotest
-# OBJ      = main-camellia-test.o debug.o uart.o serial-tools.o camellia.o camellia-asm.o
+ OBJ       = main-camellia-test.o debug.o uart.o serial-tools.o camellia.o camellia-asm.o
 # main-skipjack-test.o debug.o uart.o serial-tools.o skipjack.o
 # main-sha1-test.o debug.o uart.o serial-tools.o sha1-asm.o
 # main-md5-test.o debug.o uart.o serial-tools.o md5.o
 # main-cast5-test.o debug.o uart.o serial-tools.o cast5.o
-OBJ = main-rc6-test.o debug.o uart.o serial-tools.o rc6.o
+# OBJ = main-rc6-test.o debug.o uart.o serial-tools.o rc6.o
 # main.o debug.o uart.o serial-tools.o sha256-asm.o xtea-asm.o arcfour-asm.o prng.o cast5.o
 MCU_TARGET     = atmega32
 OPTIMIZE       = -Os

diff --git a/camellia.c b/camellia.c
index d838c6bf8f5faacde3055e23491e5ad269846d44..01145d574b1fa441df088de79155cac9efe1d4fd 100644 (file)
--- a/camellia.c
+++ b/camellia.c
@@ -22,7 +22,7 @@ uint64_t camellia_fl_inv(uint64_t y, uint64_t k);
 /*****************************************************************************/
 void change_endian(void* data, uint8_t length);
 
-uint64_t camellia_sigma[6]={
+uint64_t PROGMEM camellia_sigma[6]={ /* 64 byte table */
        0xA09E667F3BCC908BLL,
        0xB67AE8584CAA73B2LL,
        0xC6EF372FE94F82BELL,
@@ -31,26 +31,31 @@ uint64_t camellia_sigma[6]={
        0xB05688C2B3E6C1FDLL
 };     
 
+/* an ugly macro to load an entry form the table above */
+#define SIGMA(p) (( ((uint64_t)(pgm_read_dword((prog_uint32_t*)camellia_sigma+2*(p)+1)))<<32) + \
+                                   ((uint64_t)(pgm_read_dword((prog_uint32_t*)camellia_sigma+2*(p)+0) )) )
+
+
+
 /*****************************************************************************/
 
 void camellia128_ctx_dump(camellia128_ctx_t *s){
-       uart_putstr("\r\n==State Dump==");
-       uart_putstr("\n\rKAl: "); uart_hexdump(&(s->kal), 8);
-       uart_putstr("\n\rKAr: "); uart_hexdump(&(s->kar), 8);
-       uart_putstr("\n\rKLl: "); uart_hexdump(&(s->kll), 8);
-       uart_putstr("\n\rKLr: "); uart_hexdump(&(s->klr), 8);   
+       uart_putstr_P(PSTR("\r\n==State Dump=="));
+       uart_putstr_P(PSTR("\n\rKAl: ")); uart_hexdump(&(s->kal), 8);
+       uart_putstr_P(PSTR("\n\rKAr: ")); uart_hexdump(&(s->kar), 8);
+       uart_putstr_P(PSTR("\n\rKLl: ")); uart_hexdump(&(s->kll), 8);
+       uart_putstr_P(PSTR("\n\rKLr: ")); uart_hexdump(&(s->klr), 8);   
        return;
 }
 
 /*****************************************************************************/
-//*
-//extern prog_uint64_t camellia_sigma[6];
+/* extern prog_uint64_t camellia_sigma[6]; */
 
 void camellia128_init(camellia128_ctx_t* s, uint8_t* key){
        uint8_t i;
-       s->kll = 0; //((uint64_t*)key)[0];
+       s->kll = 0; /* ((uint64_t*)key)[0]; */
        
-//     / * load the key, endian-adjusted, to kll,klr * /
+       /* load the key, endian-adjusted, to kll,klr */
        for(i=0; i<8; ++i){
                s->kll <<= 8;
                s->kll |= *key++;
@@ -59,22 +64,20 @@ void camellia128_init(camellia128_ctx_t* s, uint8_t* key){
                s->klr <<= 8;
                s->klr |= *key++;
        }
-       
+
        s->kal = s->kll;
        s->kar = s->klr;
        
-       s->kar ^= camellia_f(s->kal, camellia_sigma[0]);
-       s->kal ^= camellia_f(s->kar, camellia_sigma[1]);
+       s->kar ^= camellia_f(s->kal, SIGMA(0));
+       s->kal ^= camellia_f(s->kar, SIGMA(1));
        
        s->kal ^= s->kll;
        s->kar ^= s->klr;
        
-       s->kar ^= camellia_f(s->kal, camellia_sigma[2]);
-       s->kal ^= camellia_f(s->kar, camellia_sigma[3]);
-//     / ** /
-//     uart_putstr("\n\r----------------init finished--------------------");
+       s->kar ^= camellia_f(s->kal, SIGMA(2));
+       s->kal ^= camellia_f(s->kar, SIGMA(3));
 }
-//*/
+
 /*****************************************************************************/
 void camellia128_keyop(camellia128_ctx_t* s, int8_t q);
 /*****************************************************************************/