clearing up inclusion structure for easier integration in supercop

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

diff --git a/blake/blake_large.c b/blake/blake_large.c
index b3d6dac5bd3cace105ec79da43cc68f78af24780..af967e2555eee61a45c9b8ba9261e2a595fab4de 100644 (file)
--- a/blake/blake_large.c
+++ b/blake/blake_large.c
@@ -32,11 +32,7 @@
 #include "blake_large.h"
 #include "blake_common.h"
 
-#include "cli.h"
-
-#define BUG_3 0 /* bug compatibility with reference code */
-#define BUG_4 0 /* bug compatibility with reference code */
-
+static
 uint64_t pgm_read_qword(void* p){
        union{
                uint64_t v64;
@@ -68,6 +64,7 @@ uint64_t blake_c[] PROGMEM = {
                                                    ((0x00ff0000&(a))>>8)| \
                                                    (a)>>24 )
 
+static
 void blake_large_expand(uint64_t* v, const blake_large_ctx_t* ctx){
        uint8_t i;
        memcpy(v, ctx->h, 8*8);
@@ -78,6 +75,7 @@ void blake_large_expand(uint64_t* v, const blake_large_ctx_t* ctx){
 
 }
 
+static
 void blake_large_changeendian(void* dest, const void* src){
        uint8_t i;
        uint32_t tmp;
@@ -88,14 +86,12 @@ void blake_large_changeendian(void* dest, const void* src){
        }
 }
 
+static
 void blake_large_compress(uint64_t* v,const void* m){
        uint8_t r,i;
        uint8_t a,b,c,d, s0, s1;
-//     cli_putstr_P(PSTR("\r\nblock:"));
-//     cli_hexdump_block(m, 128, 5, 8);
        for(r=0; r<14; ++r){
                for(i=0; i<8; ++i){
-       //              blake_large_g(r%10, i, v, (uint64_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);
@@ -111,18 +107,10 @@ void blake_large_compress(uint64_t* v,const void* m){
                        v[c] += v[d];
                        v[b]  = ROTR64(v[b]^v[c], 11);
                }
-/*
-               cli_putstr_P(PSTR("\r\nv:"));
-               for(i=0; i<16; ++i){
-                       if(i%4==0)
-                               cli_putstr_P(PSTR("\r\n    "));
-                       cli_hexdump_rev(&(v[i]), 8);
-                       cli_putc(' ');
-               }
-*/
        }
 }
 
+static
 void blake_large_collapse(blake_large_ctx_t* ctx, uint64_t* v){
        uint8_t i;
        for(i=0; i<8; ++i){
@@ -162,31 +150,18 @@ void blake_large_lastBlock(blake_large_ctx_t* ctx, const void* msg, uint16_t len
        buffer[length_b/8] |= 0x80 >> (length_b&0x7);
        blake_large_changeendian(buffer, buffer);
        blake_large_expand(v, ctx);
-#if BUG_3
-       uint8_t x=0;
-       if(length_b%1024<895 && length_b%8)
-               x=0x40;
-       v[12] ^= ctr + x;
-       v[13] ^= ctr + x;
-
-#else
-       if(length_b){
+       if(length_b>1024-128-2){
                v[12] ^= ctr;
                v[13] ^= ctr;
-       }
-#endif
-       if(length_b>1024-128-2){
-#if BUG_4
-               if(length_b<1017){
-                       blake_large_compress(v, buffer);
-                       blake_large_collapse(ctx, v);
-               }
-#else
                blake_large_compress(v, buffer);
                blake_large_collapse(ctx, v);
-#endif
                memset(buffer, 0, 128-8);
                blake_large_expand(v, ctx);
+       } else {
+               if(length_b){
+                       v[12] ^= ctr;
+                       v[13] ^= ctr;
+               }
        }
        if(ctx->appendone)
                buffer[128-16-8] |= 0x01;