* \email daniel.otte@rub.de
* \date 2009-05-04
* \license GPLv3 or later
- *
+ *
*/
#include <stdint.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 */
-
-
-uint32_t blake_c[] PROGMEM = {
+static
+const uint32_t blake_c[] PROGMEM = {
0x243F6A88, 0x85A308D3,
0x13198A2E, 0x03707344,
0xA4093822, 0x299F31D0,
((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);
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){
}
}
+static
void blake_small_compress(uint32_t* v,const void* m){
uint8_t r,i;
- uint8_t a,b,c,d, s0, s1;
+ uint8_t a,b,c,d, s0, s1, sigma_idx=0;
uint32_t lv[4];
- for(r=0; r<10; ++r){
+ for(r=0; r<14; ++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);
+ s0 = pgm_read_byte(blake_sigma+sigma_idx);
+ s1 = s0&0xf;
+ s0 >>= 4;++sigma_idx;
+ if(sigma_idx>=80){
+ sigma_idx-=80;
+ }
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];
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];
msg = (uint8_t*)msg + BLAKE_SMALL_BLOCKSIZE_B;
length_b -= BLAKE_SMALL_BLOCKSIZE;
}
- uint8_t buffer[64];
+ union {
+ uint8_t v8[64];
+ uint32_t v32[16];
+ } buffer;
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);
- blake_small_changeendian(buffer, buffer);
+ memset(buffer.v8, 0, 64);
+ memcpy(buffer.v8, msg, (length_b+7)/8);
+ buffer.v8[length_b/8] |= 0x80 >> (length_b&0x7);
+ blake_small_changeendian(buffer.v8, buffer.v8);
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){
- blake_small_compress(v, buffer);
+ 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.v8);
blake_small_collapse(ctx, v);
- memset(buffer, 0, 64-8);
+ memset(buffer.v8, 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;
- *((uint32_t*)(&(buffer[64-8]))) = ctr.v32[1];
- *((uint32_t*)(&(buffer[64-4]))) = ctr.v32[0];
- blake_small_compress(v, buffer);
+ buffer.v8[64-8-4] |= 0x01;
+ buffer.v32[14] = ctr.v32[1];
+ buffer.v32[15] = ctr.v32[0];
+ blake_small_compress(v, buffer.v8);
blake_small_collapse(ctx, v);
-
+
}
-uint32_t blake32_iv[] PROGMEM = {
+const uint32_t blake256_iv[] PROGMEM = {
0x6A09E667L, 0xBB67AE85,
0x3C6EF372L, 0xA54FF53A,
0x510E527FL, 0x9B05688C,
0x1F83D9ABL, 0x5BE0CD19
};
-void blake32_init(blake32_ctx_t* ctx){
+void blake256_init(blake256_ctx_t* ctx){
uint8_t i;
for(i=0; i<8; ++i){
- ctx->h[i] = pgm_read_dword(&(blake32_iv[i]));
+ ctx->h[i] = pgm_read_dword(&(blake256_iv[i]));
}
memset(ctx->s, 0, 4*4);
ctx->counter = 0;
ctx->appendone = 1;
}
-uint32_t blake28_iv[] PROGMEM = {
+const uint32_t blake224_iv[] PROGMEM = {
0xC1059ED8, 0x367CD507,
0x3070DD17, 0xF70E5939,
0xFFC00B31, 0x68581511,
0x64F98FA7, 0xBEFA4FA4
};
-void blake28_init(blake28_ctx_t* ctx){
+void blake224_init(blake224_ctx_t* ctx){
uint8_t i;
for(i=0; i<8; ++i){
- ctx->h[i] = pgm_read_dword(&(blake28_iv[i]));
+ ctx->h[i] = pgm_read_dword(&(blake224_iv[i]));
}
memset(ctx->s, 0, 4*4);
ctx->counter = 0;
ctx->appendone = 0;
}
-void blake32_ctx2hash(void* dest, const blake32_ctx_t* ctx){
+void blake256_ctx2hash(void* dest, const blake256_ctx_t* ctx){
uint8_t i;
for(i=0; i<8; ++i){
((uint32_t*)dest)[i] = CHANGE_ENDIAN32(ctx->h[i]);
}
}
-void blake28_ctx2hash(void* dest, const blake28_ctx_t* ctx){
+void blake224_ctx2hash(void* dest, const blake224_ctx_t* ctx){
uint8_t i;
for(i=0; i<7; ++i){
((uint32_t*)dest)[i] = CHANGE_ENDIAN32(ctx->h[i]);
}
}
-void blake32_nextBlock(blake32_ctx_t* ctx, const void* block){
+void blake256_nextBlock(blake256_ctx_t* ctx, const void* block){
blake_small_nextBlock(ctx, block);
}
-void blake28_nextBlock(blake28_ctx_t* ctx, const void* block){
+void blake224_nextBlock(blake224_ctx_t* ctx, const void* block){
blake_small_nextBlock(ctx, block);
}
-void blake32_lastBlock(blake32_ctx_t* ctx, const void* block, uint16_t length_b){
+void blake256_lastBlock(blake256_ctx_t* ctx, const void* block, uint16_t length_b){
blake_small_lastBlock(ctx, block, length_b);
}
-void blake28_lastBlock(blake28_ctx_t* ctx, const void* block, uint16_t length_b){
+void blake224_lastBlock(blake224_ctx_t* ctx, const void* block, uint16_t length_b){
blake_small_lastBlock(ctx, block, length_b);
}
-void blake32(void* dest, const void* msg, uint32_t length_b){
+void blake256(void* dest, const void* msg, uint32_t length_b){
blake_small_ctx_t ctx;
- blake32_init(&ctx);
+ blake256_init(&ctx);
while(length_b>=BLAKE_SMALL_BLOCKSIZE){
blake_small_nextBlock(&ctx, msg);
msg = (uint8_t*)msg + BLAKE_SMALL_BLOCKSIZE_B;
length_b -= BLAKE_SMALL_BLOCKSIZE;
}
blake_small_lastBlock(&ctx, msg, length_b);
- blake32_ctx2hash(dest, &ctx);
+ blake256_ctx2hash(dest, &ctx);
}
-void blake28(void* dest, const void* msg, uint32_t length_b){
+void blake224(void* dest, const void* msg, uint32_t length_b){
blake_small_ctx_t ctx;
- blake28_init(&ctx);
+ blake224_init(&ctx);
while(length_b>=BLAKE_SMALL_BLOCKSIZE){
blake_small_nextBlock(&ctx, msg);
msg = (uint8_t*)msg + BLAKE_SMALL_BLOCKSIZE_B;
length_b -= BLAKE_SMALL_BLOCKSIZE;
}
blake_small_lastBlock(&ctx, msg, length_b);
- blake28_ctx2hash(dest, &ctx);
+ blake224_ctx2hash(dest, &ctx);
}
projects / avr-crypto-lib.git / blobdiff