X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=blake%2Fblake_large.c;h=916970e6d254f7ca0e836f1cd56c1e503786afe8;hb=3a9f9d918fb95474996af535c225a7e187d88372;hp=b0b6cebf1c4df679d6d24168066a70d9fa3488ef;hpb=22b608111d32de8b0c8fa34f35bd0d8892df2285;p=avr-crypto-lib.git

diff --git a/blake/blake_large.c b/blake/blake_large.c
index b0b6ceb..916970e 100644
--- a/blake/blake_large.c
+++ b/blake/blake_large.c
@@ -33,7 +33,7 @@
 #include "blake_common.h"
 
 static
-uint64_t pgm_read_qword(void* p){
+uint64_t pgm_read_qword(const void *p){
 	union{
 		uint64_t v64;
 		uint32_t v32[2];
@@ -44,7 +44,7 @@ uint64_t pgm_read_qword(void* p){
 }
 
 static
-uint64_t blake_c[] PROGMEM = {
+const uint64_t blake_c[] PROGMEM = {
    0x243F6A8885A308D3LL, 0x13198A2E03707344LL,
    0xA4093822299F31D0LL, 0x082EFA98EC4E6C89LL,
    0x452821E638D01377LL, 0xBE5466CF34E90C6CLL,
@@ -65,7 +65,7 @@ uint64_t blake_c[] PROGMEM = {
 						    (a)>>24 )
 
 static
-void blake_large_expand(uint64_t* v, const blake_large_ctx_t* ctx){
+void blake_large_expand(uint64_t *v, const blake_large_ctx_t *ctx){
 	uint8_t i;
 	memcpy(v, ctx->h, 8*8);
 	for(i=0; i<8; ++i){
@@ -76,7 +76,7 @@ void blake_large_expand(uint64_t* v, const blake_large_ctx_t* ctx){
 }
 
 static
-void blake_large_changeendian(void* dest, const void* src){
+void blake_large_changeendian(void *dest, const void *src){
 	uint8_t i;
 	uint32_t tmp;
 	for(i=0; i<32; i+=2){
@@ -87,7 +87,7 @@ void blake_large_changeendian(void* dest, const void* src){
 }
 
 static
-void blake_large_compress(uint64_t* v,const void* m){
+void blake_large_compress(uint64_t *v,const void *m){
 	uint8_t r,i;
 	uint8_t a,b,c,d, s0, s1, sigma_idx=0;
 	for(r=0; r<16; ++r){
@@ -116,14 +116,14 @@ void blake_large_compress(uint64_t* v,const void* m){
 }
 
 static
-void blake_large_collapse(blake_large_ctx_t* ctx, uint64_t* v){
+void blake_large_collapse(blake_large_ctx_t *ctx, uint64_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_large_nextBlock(blake_large_ctx_t* ctx, const void* msg){
+void blake_large_nextBlock(blake_large_ctx_t *ctx, const void *msg){
 	uint64_t v[16];
 	uint64_t m[16];
 	union {
@@ -140,27 +140,30 @@ void blake_large_nextBlock(blake_large_ctx_t* ctx, const void* msg){
 	blake_large_collapse(ctx, v);
 }
 
-void blake_large_lastBlock(blake_large_ctx_t* ctx, const void* msg, uint16_t length_b){
+void blake_large_lastBlock(blake_large_ctx_t *ctx, const void *msg, uint16_t length_b){
 	while(length_b>=BLAKE_LARGE_BLOCKSIZE){
 		blake_large_nextBlock(ctx, msg);
 		msg = (uint8_t*)msg + BLAKE_LARGE_BLOCKSIZE_B;
 		length_b -= BLAKE_LARGE_BLOCKSIZE;
 	}
-	uint8_t buffer[128];
+	union {
+		uint8_t   v8[128];
+		uint64_t v64[ 16];
+	} buffer;
 	uint64_t v[16];
 	uint64_t ctr;
 	ctr = ctx->counter*1024+length_b;
-	memset(buffer, 0, 128);
-	memcpy(buffer, msg, (length_b+7)/8);
-	buffer[length_b/8] |= 0x80 >> (length_b&0x7);
-	blake_large_changeendian(buffer, buffer);
+	memset(buffer.v8, 0, 128);
+	memcpy(buffer.v8, msg, (length_b+7)/8);
+	buffer.v8[length_b/8] |= 0x80 >> (length_b&0x7);
+	blake_large_changeendian(buffer.v8, buffer.v8);
 	blake_large_expand(v, ctx);
 	if(length_b>1024-128-2){
 		v[12] ^= ctr;
 		v[13] ^= ctr;
-		blake_large_compress(v, buffer);
+		blake_large_compress(v, buffer.v8);
 		blake_large_collapse(ctx, v);
-		memset(buffer, 0, 128-8);
+		memset(buffer.v8, 0, 128-8);
 		blake_large_expand(v, ctx);
 	} else {
 		if(length_b){
@@ -169,21 +172,21 @@ void blake_large_lastBlock(blake_large_ctx_t* ctx, const void* msg, uint16_t len
 		}
 	}
 	if(ctx->appendone)
-		buffer[128-16-8] |= 0x01;
-	*((uint64_t*)(&(buffer[128-8]))) = ctr;
-	blake_large_compress(v, buffer);
+		buffer.v8[128-16-8] |= 0x01;
+	buffer.v64[15] = ctr;
+	blake_large_compress(v, buffer.v8);
 	blake_large_collapse(ctx, v);
 
 }
 
-uint64_t blake512_iv[] PROGMEM = {
+const uint64_t blake512_iv[] PROGMEM = {
     0x6A09E667F3BCC908LL, 0xBB67AE8584CAA73BLL,
     0x3C6EF372FE94F82BLL, 0xA54FF53A5F1D36F1LL,
     0x510E527FADE682D1LL, 0x9B05688C2B3E6C1FLL,
     0x1F83D9ABFB41BD6BLL, 0x5BE0CD19137E2179LL
 };
 
-void blake512_init(blake512_ctx_t* ctx){
+void blake512_init(blake512_ctx_t *ctx){
 	uint8_t i;
 	for(i=0; i<8; ++i){
 		ctx->h[i] = pgm_read_qword(&(blake512_iv[i]));
@@ -193,14 +196,14 @@ void blake512_init(blake512_ctx_t* ctx){
 	ctx->appendone = 1;
 }
 
-uint64_t blake384_iv[] PROGMEM = {
+const uint64_t blake384_iv[] PROGMEM = {
     0xCBBB9D5DC1059ED8LL, 0x629A292A367CD507LL,
     0x9159015A3070DD17LL, 0x152FECD8F70E5939LL,
     0x67332667FFC00B31LL, 0x8EB44A8768581511LL,
     0xDB0C2E0D64F98FA7LL, 0x47B5481DBEFA4FA4LL
 };
 
-void blake384_init(blake384_ctx_t* ctx){
+void blake384_init(blake384_ctx_t *ctx){
 	uint8_t i;
 	for(i=0; i<8; ++i){
 		ctx->h[i] = pgm_read_qword(&(blake384_iv[i]));
@@ -210,7 +213,7 @@ void blake384_init(blake384_ctx_t* ctx){
 	ctx->appendone = 0;
 }
 
-void blake512_ctx2hash(void* dest, const blake512_ctx_t* ctx){
+void blake512_ctx2hash(void *dest, const blake512_ctx_t *ctx){
 	uint8_t i;
 	for(i=0; i<8; ++i){
 		((uint32_t*)dest)[2*i+0] = CHANGE_ENDIAN32((ctx->h[i])>>32);
@@ -218,7 +221,7 @@ void blake512_ctx2hash(void* dest, const blake512_ctx_t* ctx){
 	}
 }
 
-void blake384_ctx2hash(void* dest, const blake384_ctx_t* ctx){
+void blake384_ctx2hash(void *dest, const blake384_ctx_t *ctx){
 	uint8_t i;
 	for(i=0; i<6; ++i){
 		((uint32_t*)dest)[2*i+0] = CHANGE_ENDIAN32((ctx->h[i])>>32);
@@ -226,23 +229,23 @@ void blake384_ctx2hash(void* dest, const blake384_ctx_t* ctx){
 	}
 }
 
-void blake512_nextBlock(blake512_ctx_t* ctx, const void* block){
+void blake512_nextBlock(blake512_ctx_t *ctx, const void *block){
 	blake_large_nextBlock(ctx, block);
 }
 
-void blake384_nextBlock(blake384_ctx_t* ctx, const void* block){
+void blake384_nextBlock(blake384_ctx_t *ctx, const void *block){
 	blake_large_nextBlock(ctx, block);
 }
 
-void blake512_lastBlock(blake512_ctx_t* ctx, const void* block, uint16_t length_b){
+void blake512_lastBlock(blake512_ctx_t *ctx, const void *block, uint16_t length_b){
 	blake_large_lastBlock(ctx, block, length_b);
 }
 
-void blake384_lastBlock(blake384_ctx_t* ctx, const void* block, uint16_t length_b){
+void blake384_lastBlock(blake384_ctx_t *ctx, const void *block, uint16_t length_b){
 	blake_large_lastBlock(ctx, block, length_b);
 }
 
-void blake512(void* dest, const void* msg, uint32_t length_b){
+void blake512(void *dest, const void *msg, uint32_t length_b){
 	blake_large_ctx_t ctx;
 	blake512_init(&ctx);
 	while(length_b>=BLAKE_LARGE_BLOCKSIZE){
@@ -254,7 +257,7 @@ void blake512(void* dest, const void* msg, uint32_t length_b){
 	blake512_ctx2hash(dest, &ctx);
 }
 
-void blake384(void* dest, const void* msg, uint32_t length_b){
+void blake384(void *dest, const void *msg, uint32_t length_b){
 	blake_large_ctx_t ctx;
 	blake384_init(&ctx);
 	while(length_b>=BLAKE_LARGE_BLOCKSIZE){