integrated automatic testing scrips (1/2)

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

diff --git a/camellia.c b/camellia.c
index e0e21597d4433c6bb4e22682f7bf60f2c5e5c702..a6a88d2419c6f499052e0291b6ba7262ca9ea21a 100644 (file)
--- a/camellia.c
+++ b/camellia.c
@@ -82,7 +82,7 @@ void camellia128_ctx_dump(camellia128_ctx_t *s){
 /*****************************************************************************/
 /* extern prog_uint64_t camellia_sigma[6]; */
 
-void camellia128_init(camellia128_ctx_t* s, uint8_t* key){
+void camellia128_init(uint8_t* key, camellia128_ctx_t* s){
        uint8_t i;
        s->kll = 0; /* ((uint64_t*)key)[0]; */
        
@@ -134,14 +134,14 @@ void camellia_6rounds(camellia128_ctx_t* s, uint64_t* bl, uint64_t* br, uint8_t
 /*****************************************************************************/
 
 
-void camellia128_enc(camellia128_ctx_t* s, void* block){
+void camellia128_enc(void* block, camellia128_ctx_t* s){
 
        #define BL (((uint64_t*)block)[0])
        #define BR (((uint64_t*)block)[1])
        /* endian adjustment */
         /*BL*/
         /*     1 2 3 4 5 6 7 8
-         *             8 7 6 5 4 3 2 1
+         *     8 7 6 5 4 3 2 1
          */
         
        uint64_t temp64;
@@ -188,7 +188,7 @@ void camellia128_enc(camellia128_ctx_t* s, void* block){
 
 /*****************************************************************************/
 
-void camellia128_dec(camellia128_ctx_t* s, void* block){
+void camellia128_dec(void* block, camellia128_ctx_t* s){
 
        #define BL (((uint64_t*)block)[1])
        #define BR (((uint64_t*)block)[0])