+RC6 +some forgotten files

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

diff --git a/rc6.c b/rc6.c
index 29889a20235573a20861cf100f2e177aa634638a..d35791b7b80a0be68feabae1eb088171da265ea1 100644 (file)
--- a/rc6.c
+++ b/rc6.c
@@ -10,30 +10,30 @@
  * THIS ONLY WORKS FOR LITTEL ENDIAN!!!
  */
  
- #include <stdint.h>
- #include <stdlib.h>
- #include "rc6.h"
- #include "config.h"
+#include <stdint.h>
+#include <stdlib.h>
+#include "rc6.h"
+#include "config.h"
  
- #define P32 0xB7E15163                /* e -2 */
- #define Q32 0x9E3779B9                /* Golden Ratio -1 */
+#define P32 0xB7E15163         /* e -2 */
+#define Q32 0x9E3779B9         /* Golden Ratio -1 */
  
 uint32_t rotl32(uint32_t a, uint8_t n){
        n &= 0x1f; /* higher rotates would not bring anything */
        return ( (a<<n)| (a>>(32-n)) );
- }
+}
 
 uint32_t rotr32(uint32_t a, uint8_t n){
        n &= 0x1f; /* higher rotates would not bring anything */
        return ( (a>>n)| (a<<(32-n)) );
- }
+}
  
- uint8_t rc6_init(rc6_ctx_t *s,void* key, uint16_t keylength){
-       return rc6_initl(s, key, keylength, 20);
- }
+uint8_t rc6_init(void* key, uint16_t keylength_b, rc6_ctx_t *s){
+       return rc6_initl(key, keylength_b, 20, s);
+}
  
  
- uint8_t rc6_initl(rc6_ctx_t *s,void* key, uint16_t keylength, uint8_t rounds){
+uint8_t rc6_initl(void* key, uint16_t keylength_b, uint8_t rounds, rc6_ctx_t *s){
        uint8_t i,j;
        uint16_t v,p,c;
        uint32_t a,b, l=0;
@@ -44,11 +44,11 @@ uint32_t rotr32(uint32_t a, uint8_t n){
        
        s->rounds=rounds;
        
-       c = keylength/32;
-       if (keylength%32){ 
+       c = keylength_b/32;
+       if (keylength_b%32){ 
                ++c;
-               j=(keylength%32)/8;
-               if(keylength%8)
+               j=(keylength_b%32)/8;
+               if(keylength_b%8)
                        ++j;
                for (i=0; i<j; ++i) 
                        ((uint8_t*)&l)[i] = ((uint8_t*)key)[(c-1)*4 + i];
@@ -74,19 +74,19 @@ uint32_t rotr32(uint32_t a, uint8_t n){
                j = (j+1) % c;
        }
        return 0;
- }
+}
  
- void rc6_free(rc6_ctx_t *s){
+void rc6_free(rc6_ctx_t *s){
        free(s->S);
- } 
+} 
  
- #define LG_W 5
- #define A (((uint32_t*)block)[0])
- #define B (((uint32_t*)block)[1])
- #define C (((uint32_t*)block)[2])
- #define D (((uint32_t*)block)[3])
+#define LG_W 5
+#define A (((uint32_t*)block)[0])
+#define B (((uint32_t*)block)[1])
+#define C (((uint32_t*)block)[2])
+#define D (((uint32_t*)block)[3])
  
- void rc6_enc(rc6_ctx_t *s, void* block){
+void rc6_enc(void* block, rc6_ctx_t *s){
        uint8_t i;
        uint32_t t,u,x; /* greetings to Linux? */
        B += s->S[0];
@@ -104,10 +104,9 @@ uint32_t rotr32(uint32_t a, uint8_t n){
        }
        A += s->S[2*s->rounds+2];
        C += s->S[2*s->rounds+3];
- }
+}
  
- void rc6_dec(rc6_ctx_t *s, void* block)
- {
+void rc6_dec(void* block, rc6_ctx_t *s){
        uint8_t i;
        uint32_t t,u,x; /* greetings to Linux? */
  
@@ -127,5 +126,5 @@ uint32_t rotr32(uint32_t a, uint8_t n){
        }
        D -= s->S[1];
        B -= s->S[0];
- }
+}