clean up

[avr-crypto-lib.git] / blake / blake_small.c

diff --git a/blake/blake_small.c b/blake/blake_small.c
index 75a28374c4772d06105d1e60c325daffba8c9be8..8425ac001717b7904f4f6bfe949d5ca30b7d33e2 100644 (file)
--- a/blake/blake_small.c
+++ b/blake/blake_small.c
@@ -22,20 +22,17 @@
  * \email   daniel.otte@rub.de
  * \date    2009-05-04
  * \license GPLv3 or later
- * 
+ *
  */
 
 #include <stdint.h>
 #include <string.h>
 #include <avr/pgmspace.h>
-#include "memxor.h"
+#include "memxor/memxor.h"
 #include "blake_small.h"
 #include "blake_common.h"
 
-#define BUG_1 1 /* bug compatibility for zero length message */
-#define BUG_2 1 /* bug compatibility for messages of length%512=505...511 */
-
-
+static
 uint32_t blake_c[] PROGMEM = {
    0x243F6A88, 0x85A308D3,
    0x13198A2E, 0x03707344,
@@ -53,7 +50,7 @@ uint32_t blake_c[] PROGMEM = {
                             ((0x0000ff00&(a))<<8)| \
                                                    ((0x00ff0000&(a))>>8)| \
                                                    (a)>>24 )
-
+static
 void blake_small_expand(uint32_t* v, const blake_small_ctx_t* ctx){
        uint8_t i;
        memcpy(v, ctx->h, 8*4);
@@ -61,9 +58,10 @@ void blake_small_expand(uint32_t* v, const blake_small_ctx_t* ctx){
                v[8+i] = pgm_read_dword(&(blake_c[i]));
        }
        memxor((uint8_t*)v+8, ctx->s, 4*4);
-       
+
 }
 
+static
 void blake_small_changeendian(void* dest, const void* src){
        uint8_t i;
        for(i=0; i<16; ++i){
@@ -71,28 +69,29 @@ void blake_small_changeendian(void* dest, const void* src){
        }
 }
 
+static
 void blake_small_compress(uint32_t* v,const void* m){
        uint8_t r,i;
        uint8_t a,b,c,d, s0, s1;
        uint32_t lv[4];
        for(r=0; r<10; ++r){
                for(i=0; i<8; ++i){
-       //              blake_small_g(r, i, v, (uint32_t*)m);
                        a = pgm_read_byte(blake_index_lut+4*i+0);
                        b = pgm_read_byte(blake_index_lut+4*i+1);
                        c = pgm_read_byte(blake_index_lut+4*i+2);
                        d = pgm_read_byte(blake_index_lut+4*i+3);
                        s0 = pgm_read_byte(blake_sigma+16*r+2*i+0);
                        s1 = pgm_read_byte(blake_sigma+16*r+2*i+1);
+
                        lv[0] = v[a];
                        lv[1] = v[b];
                        lv[2] = v[c];
                        lv[3] = v[d];
-                       
+
                        lv[0] += lv[1] + (((uint32_t*)m)[s0] ^ pgm_read_dword(&(blake_c[s1])));
                        lv[3]  = ROTR32(lv[3]^lv[0], 16);
                        lv[2] += lv[3];
-                       lv[1]  = ROTR32(lv[1]^lv[2], 12);       
+                       lv[1]  = ROTR32(lv[1]^lv[2], 12);
                        lv[0] += lv[1] + (((uint32_t*)m)[s1] ^ pgm_read_dword(&(blake_c[s0])));
                        lv[3]  = ROTR32(lv[3]^lv[0], 8);
                        lv[2] += lv[3];
@@ -102,17 +101,17 @@ void blake_small_compress(uint32_t* v,const void* m){
                        v[b] = lv[1];
                        v[c] = lv[2];
                        v[d] = lv[3];
-
                }
        }
 }
 
+static
 void blake_small_collapse(blake_small_ctx_t* ctx, uint32_t* v){
        uint8_t i;
        for(i=0; i<8; ++i){
                ctx->h[i] ^= ctx->s[i%4] ^ v[i] ^ v[8+i];
        }
-}      
+}
 
 void blake_small_nextBlock(blake_small_ctx_t* ctx, const void* msg){
        uint32_t v[16];
@@ -141,53 +140,40 @@ void blake_small_lastBlock(blake_small_ctx_t* ctx, const void* msg, uint16_t len
        }
        uint8_t buffer[64];
        uint32_t v[16];
-#if BUG_2
-       uint32_t tmp=0;
-#endif
        union {
                uint64_t v64;
                uint32_t v32[2];
        }ctr;
        ctr.v64 = ctx->counter*512+length_b;
-#if BUG_2
-       if(length_b>=505){
-               tmp =ctr.v32[0];
-               ctr.v32[0] = ctx->counter*512;
-               ctr.v32[0] |= 0x40+length_b-504;
-       }
-#endif 
        memset(buffer, 0, 64);
        memcpy(buffer, msg, (length_b+7)/8);
-       buffer[length_b/8] |= 0x80 >> (length_b%8);
+       buffer[length_b/8] |= 0x80 >> (length_b&0x7);
        blake_small_changeendian(buffer, buffer);
        blake_small_expand(v, ctx);
-       v[12] ^= ctr.v32[0];
-       v[13] ^= ctr.v32[0];
-       v[14] ^= ctr.v32[1];
-       v[15] ^= ctr.v32[1];
-#if BUG_2
-       if(length_b>=505)
-               ctr.v32[0] = tmp;
-#endif
-#if BUG_1      
-       if(length_b==0 && ctx->counter==0){
-               v[14] ^= 1;
-               v[15] ^= 1;
-       }
-#endif 
        if(length_b>512-64-2){
+               v[12] ^= ctr.v32[0];
+               v[13] ^= ctr.v32[0];
+               v[14] ^= ctr.v32[1];
+               v[15] ^= ctr.v32[1];
                blake_small_compress(v, buffer);
                blake_small_collapse(ctx, v);
                memset(buffer, 0, 64-8);
                blake_small_expand(v, ctx);
+       }else{
+               if(length_b){
+                       v[12] ^= ctr.v32[0];
+                       v[13] ^= ctr.v32[0];
+                       v[14] ^= ctr.v32[1];
+                       v[15] ^= ctr.v32[1];
+               }
        }
        if(ctx->appendone)
-               buffer[64-8-4] |= 0x01; 
+               buffer[64-8-4] |= 0x01;
        *((uint32_t*)(&(buffer[64-8]))) = ctr.v32[1];
        *((uint32_t*)(&(buffer[64-4]))) = ctr.v32[0];
        blake_small_compress(v, buffer);
        blake_small_collapse(ctx, v);
-       
+
 }
 
 uint32_t blake32_iv[] PROGMEM = {