X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=blobdiff_plain;f=blake%2Fblake_large.c;fp=blake%2Fblake_large.c;h=b6cf81f337d241c8da202d6c362843ee0c3bc237;hp=916970e6d254f7ca0e836f1cd56c1e503786afe8;hb=8d1970350aa1d7cdcb59cf79f7f60e385e2816e5;hpb=a30df60ac814350db243b270034ef188c8d02d5e
diff --git a/blake/blake_large.c b/blake/blake_large.c
index 916970e..b6cf81f 100644
--- a/blake/blake_large.c
+++ b/blake/blake_large.c
@@ -1,21 +1,21 @@
/* blake_large.c */
/*
- This file is part of the AVR-Crypto-Lib.
- Copyright (C) 2009 Daniel Otte (daniel.otte@rub.de)
+ This file is part of the AVR-Crypto-Lib.
+ Copyright (C) 2009 Daniel Otte (daniel.otte@rub.de)
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program. If not, see .
-*/
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+ */
/*
* \file blake_large.c
* \author Daniel Otte
@@ -32,31 +32,28 @@
#include "blake_large.h"
#include "blake_common.h"
-static
-uint64_t pgm_read_qword(const void *p){
- union{
- uint64_t v64;
- uint32_t v32[2];
- }r;
- r.v32[0] = pgm_read_dword(p);
- r.v32[1] = pgm_read_dword((uint8_t*)p+4);
- return r.v64;
+static uint64_t pgm_read_qword(const void *p)
+{
+ union {
+ uint64_t v64;
+ uint32_t v32[2];
+ } r;
+ r.v32[0] = pgm_read_dword(p);
+ r.v32[1] = pgm_read_dword((uint8_t* )p + 4);
+ return r.v64;
}
-static
-const uint64_t blake_c[] PROGMEM = {
- 0x243F6A8885A308D3LL, 0x13198A2E03707344LL,
- 0xA4093822299F31D0LL, 0x082EFA98EC4E6C89LL,
- 0x452821E638D01377LL, 0xBE5466CF34E90C6CLL,
- 0xC0AC29B7C97C50DDLL, 0x3F84D5B5B5470917LL,
- 0x9216D5D98979FB1BLL, 0xD1310BA698DFB5ACLL,
- 0x2FFD72DBD01ADFB7LL, 0xB8E1AFED6A267E96LL,
- 0xBA7C9045F12C7F99LL, 0x24A19947B3916CF7LL,
- 0x0801F2E2858EFC16LL, 0x636920D871574E69LL
+static const uint64_t blake_c[] PROGMEM = {
+ 0x243F6A8885A308D3LL, 0x13198A2E03707344LL,
+ 0xA4093822299F31D0LL, 0x082EFA98EC4E6C89LL,
+ 0x452821E638D01377LL, 0xBE5466CF34E90C6CLL,
+ 0xC0AC29B7C97C50DDLL, 0x3F84D5B5B5470917LL,
+ 0x9216D5D98979FB1BLL, 0xD1310BA698DFB5ACLL,
+ 0x2FFD72DBD01ADFB7LL, 0xB8E1AFED6A267E96LL,
+ 0xBA7C9045F12C7F99LL, 0x24A19947B3916CF7LL,
+ 0x0801F2E2858EFC16LL, 0x636920D871574E69LL
};
-
-
#define ROTL64(a, n) (((a)<<(n))|((a)>>(64-(n))))
#define ROTR64(a, n) (((a)>>(n))|((a)<<(64-(n))))
#define CHANGE_ENDIAN32(a) (((a)<<24)| \
@@ -65,206 +62,227 @@ const uint64_t blake_c[] PROGMEM = {
(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);
- for(i=0; i<8; ++i){
- v[8+i] = pgm_read_qword(&(blake_c[i]));
- }
- memxor((uint8_t*)v+8, ctx->s, 4*8);
+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) {
+ v[8 + i] = pgm_read_qword(&(blake_c[i]));
+ }
+ memxor((uint8_t*) v + 8, ctx->s, 4 * 8);
}
static
-void blake_large_changeendian(void *dest, const void *src){
- uint8_t i;
- uint32_t tmp;
- for(i=0; i<32; i+=2){
- tmp = CHANGE_ENDIAN32(((uint32_t*)src)[i]);
- ((uint32_t*)dest)[i] = CHANGE_ENDIAN32(((uint32_t*)src)[i+1]);
- ((uint32_t*)dest)[i+1] = tmp;
- }
+void blake_large_changeendian(void *dest, const void *src)
+{
+ uint8_t i;
+ uint32_t tmp;
+ for (i = 0; i < 32; i += 2) {
+ tmp = CHANGE_ENDIAN32(((uint32_t* )src)[i]);
+ ((uint32_t*) dest)[i] = CHANGE_ENDIAN32(((uint32_t* )src)[i + 1]);
+ ((uint32_t*) dest)[i + 1] = tmp;
+ }
}
static
-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){
- for(i=0; i<8; ++i){
- 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+sigma_idx);
- s1 = s0&0x0f;
- s0 >>= 4;
- ++sigma_idx;
- if(sigma_idx>=80){
- sigma_idx-=80;
- }
- v[a] += v[b] + (((uint64_t*)m)[s0] ^ pgm_read_qword(&(blake_c[s1])));
- v[d] = ROTR64(v[d]^v[a], 32);
- v[c] += v[d];
- v[b] = ROTR64(v[b]^v[c], 25);
- v[a] += v[b] + (((uint64_t*)m)[s1] ^ pgm_read_qword(&(blake_c[s0])));
- v[d] = ROTR64(v[d]^v[a], 16);
- v[c] += v[d];
- v[b] = ROTR64(v[b]^v[c], 11);
- }
- }
+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) {
+ for (i = 0; i < 8; ++i) {
+ 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 + sigma_idx);
+ s1 = s0 & 0x0f;
+ s0 >>= 4;
+ ++sigma_idx;
+ if (sigma_idx >= 80) {
+ sigma_idx -= 80;
+ }
+ v[a] += v[b]
+ + (((uint64_t*) m)[s0] ^ pgm_read_qword(&(blake_c[s1])));
+ v[d] = ROTR64(v[d] ^ v[a], 32);
+ v[c] += v[d];
+ v[b] = ROTR64(v[b] ^ v[c], 25);
+ v[a] += v[b]
+ + (((uint64_t*) m)[s1] ^ pgm_read_qword(&(blake_c[s0])));
+ v[d] = ROTR64(v[d] ^ v[a], 16);
+ v[c] += v[d];
+ v[b] = ROTR64(v[b] ^ v[c], 11);
+ }
+ }
}
static
-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_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){
- uint64_t v[16];
- uint64_t m[16];
- union {
- uint64_t v64;
- uint32_t v32[2];
- }ctr;
- blake_large_expand(v,ctx);
- ctx->counter++;
- ctr.v64 = ctx->counter*1024;
- v[12] ^= ctr.v64;
- v[13] ^= ctr.v64;
- blake_large_changeendian(m, msg);
- blake_large_compress(v, m);
- blake_large_collapse(ctx, v);
+void blake_large_nextBlock(blake_large_ctx_t *ctx, const void *msg)
+{
+ uint64_t v[16];
+ uint64_t m[16];
+ union {
+ uint64_t v64;
+ uint32_t v32[2];
+ } ctr;
+ blake_large_expand(v, ctx);
+ ctx->counter++;
+ ctr.v64 = ctx->counter * 1024;
+ v[12] ^= ctr.v64;
+ v[13] ^= ctr.v64;
+ blake_large_changeendian(m, msg);
+ blake_large_compress(v, m);
+ blake_large_collapse(ctx, v);
}
-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;
- }
- 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.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.v8);
- blake_large_collapse(ctx, v);
- memset(buffer.v8, 0, 128-8);
- blake_large_expand(v, ctx);
- } else {
- if(length_b){
- v[12] ^= ctr;
- v[13] ^= ctr;
- }
- }
- if(ctx->appendone)
- buffer.v8[128-16-8] |= 0x01;
- buffer.v64[15] = ctr;
- blake_large_compress(v, buffer.v8);
- blake_large_collapse(ctx, v);
+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;
+ }
+ 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.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.v8);
+ blake_large_collapse(ctx, v);
+ memset(buffer.v8, 0, 128 - 8);
+ blake_large_expand(v, ctx);
+ } else {
+ if (length_b) {
+ v[12] ^= ctr;
+ v[13] ^= ctr;
+ }
+ }
+ if (ctx->appendone)
+ buffer.v8[128 - 16 - 8] |= 0x01;
+ buffer.v64[15] = ctr;
+ blake_large_compress(v, buffer.v8);
+ blake_large_collapse(ctx, v);
}
const uint64_t blake512_iv[] PROGMEM = {
- 0x6A09E667F3BCC908LL, 0xBB67AE8584CAA73BLL,
- 0x3C6EF372FE94F82BLL, 0xA54FF53A5F1D36F1LL,
- 0x510E527FADE682D1LL, 0x9B05688C2B3E6C1FLL,
- 0x1F83D9ABFB41BD6BLL, 0x5BE0CD19137E2179LL
+ 0x6A09E667F3BCC908LL, 0xBB67AE8584CAA73BLL,
+ 0x3C6EF372FE94F82BLL, 0xA54FF53A5F1D36F1LL,
+ 0x510E527FADE682D1LL, 0x9B05688C2B3E6C1FLL,
+ 0x1F83D9ABFB41BD6BLL, 0x5BE0CD19137E2179LL
};
-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]));
- }
- memset(ctx->s, 0, 4*8);
- ctx->counter = 0;
- ctx->appendone = 1;
+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]));
+ }
+ memset(ctx->s, 0, 4 * 8);
+ ctx->counter = 0;
+ ctx->appendone = 1;
}
const uint64_t blake384_iv[] PROGMEM = {
- 0xCBBB9D5DC1059ED8LL, 0x629A292A367CD507LL,
- 0x9159015A3070DD17LL, 0x152FECD8F70E5939LL,
- 0x67332667FFC00B31LL, 0x8EB44A8768581511LL,
- 0xDB0C2E0D64F98FA7LL, 0x47B5481DBEFA4FA4LL
+ 0xCBBB9D5DC1059ED8LL, 0x629A292A367CD507LL,
+ 0x9159015A3070DD17LL, 0x152FECD8F70E5939LL,
+ 0x67332667FFC00B31LL, 0x8EB44A8768581511LL,
+ 0xDB0C2E0D64F98FA7LL, 0x47B5481DBEFA4FA4LL
};
-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]));
- }
- memset(ctx->s, 0, 4*8);
- ctx->counter = 0;
- ctx->appendone = 0;
+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]));
+ }
+ memset(ctx->s, 0, 4 * 8);
+ ctx->counter = 0;
+ ctx->appendone = 0;
}
-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);
- ((uint32_t*)dest)[2*i+1] = CHANGE_ENDIAN32((uint32_t)ctx->h[i]);
- }
+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);
+ ((uint32_t*) dest)[2 * i + 1] = CHANGE_ENDIAN32((uint32_t )ctx->h[i]);
+ }
}
-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);
- ((uint32_t*)dest)[2*i+1] = CHANGE_ENDIAN32((uint32_t)ctx->h[i]);
- }
+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);
+ ((uint32_t*) dest)[2 * i + 1] = CHANGE_ENDIAN32((uint32_t )ctx->h[i]);
+ }
}
-void blake512_nextBlock(blake512_ctx_t *ctx, const void *block){
- blake_large_nextBlock(ctx, 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){
- blake_large_nextBlock(ctx, 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){
- blake_large_lastBlock(ctx, block, 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){
- blake_large_lastBlock(ctx, block, 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){
- blake_large_ctx_t ctx;
- blake512_init(&ctx);
- while(length_b>=BLAKE_LARGE_BLOCKSIZE){
- blake_large_nextBlock(&ctx, msg);
- msg = (uint8_t*)msg + BLAKE_LARGE_BLOCKSIZE_B;
- length_b -= BLAKE_LARGE_BLOCKSIZE;
- }
- blake_large_lastBlock(&ctx, msg, length_b);
- blake512_ctx2hash(dest, &ctx);
+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) {
+ blake_large_nextBlock(&ctx, msg);
+ msg = (uint8_t*) msg + BLAKE_LARGE_BLOCKSIZE_B;
+ length_b -= BLAKE_LARGE_BLOCKSIZE;
+ }
+ blake_large_lastBlock(&ctx, msg, length_b);
+ blake512_ctx2hash(dest, &ctx);
}
-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){
- blake_large_nextBlock(&ctx, msg);
- msg = (uint8_t*)msg + BLAKE_LARGE_BLOCKSIZE_B;
- length_b -= BLAKE_LARGE_BLOCKSIZE;
- }
- blake_large_lastBlock(&ctx, msg, length_b);
- blake384_ctx2hash(dest, &ctx);
+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) {
+ blake_large_nextBlock(&ctx, msg);
+ msg = (uint8_t*) msg + BLAKE_LARGE_BLOCKSIZE_B;
+ length_b -= BLAKE_LARGE_BLOCKSIZE;
+ }
+ blake_large_lastBlock(&ctx, msg, length_b);
+ blake384_ctx2hash(dest, &ctx);
}