speed variant of bmw384/512

This commit is contained in:
bg 2010-05-08 18:34:44 +02:00
parent b84f1a234d
commit e0fbef3e36
4 changed files with 500 additions and 16 deletions

477
bmw/bmw_large_speed.c Normal file
View File

@ -0,0 +1,477 @@
/* bmw_large_speed.c */
/*
This file is part of the ARM-Crypto-Lib.
Copyright (C) 2006-2010 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 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 <http://www.gnu.org/licenses/>.
*/
/*
* \file bmw_large.c
* \author Daniel Otte
* \email daniel.otte@rub.de
* \date 2009-04-27
* \license GPLv3 or later
*
*/
#include <stdint.h>
#include <string.h>
#include "bmw_large.h"
#define SHL64(a,n) ((a)<<(n))
#define SHR64(a,n) ((a)>>(n))
#define ROTL64(a,n) (((a)<<(n))|((a)>>(64-(n))))
#define ROTR64(a,n) (((a)>>(n))|((a)<<(64-(n))))
#define TWEAK 1
#define BUG24 0
#define F0_HACK 0
#define DEBUG 0
#if DEBUG
#include "cli.h"
void ctx_dump(const bmw_large_ctx_t* ctx){
uint8_t i;
cli_putstr("\r\n==== ctx dump ====");
for(i=0; i<16;++i){
cli_putstr("\r\n h[");
cli_hexdump(&i, 1);
cli_putstr("] = ");
cli_hexdump_rev(&(ctx->h[i]), 8);
}
cli_putstr("\r\n counter = ");
cli_hexdump(&(ctx->counter), 4);
}
void dump_x(const uint64_t* q, uint8_t elements, char x){
uint8_t i;
cli_putstr("\r\n==== ");
cli_putc(x);
cli_putstr(" dump ====");
for(i=0; i<elements;++i){
cli_putstr("\r\n ");
cli_putc(x);
cli_putstr("[");
cli_hexdump(&i, 1);
cli_putstr("] = ");
cli_hexdump_rev(&(q[i]), 8);
}
}
#else
#define ctx_dump(x)
#define dump_x(a,b,c)
#endif
#define S64_0(x) ( (SHR64((x), 1)) ^ \
(SHL64((x), 3)) ^ \
(ROTL64((x), 4)) ^ \
(ROTR64((x), 27)) )
#define S64_1(x) ( (SHR64((x), 1)) ^ \
(SHL64((x), 2)) ^ \
(ROTL64((x), 13)) ^ \
(ROTR64((x), 21)) )
#define S64_2(x) ( (SHR64((x), 2)) ^ \
(SHL64((x), 1)) ^ \
(ROTL64((x), 19)) ^ \
(ROTR64((x), 11)) )
#define S64_3(x) ( (SHR64((x), 2)) ^ \
(SHL64((x), 2)) ^ \
(ROTL64((x), 28)) ^ \
(ROTR64((x), 5)) )
#define S64_4(x) ( (SHR64((x), 1)) ^ x)
#define S64_5(x) ( (SHR64((x), 2)) ^ x)
#define R64_1(x) (ROTL64((x), 5))
#define R64_2(x) (ROTL64((x), 11))
#define R64_3(x) (ROTL64((x), 27))
#define R64_4(x) (ROTL64((x), 32))
#define R64_5(x) (ROTR64((x), 27))
#define R64_6(x) (ROTR64((x), 21))
#define R64_7(x) (ROTR64((x), 11))
/*
#define K 0x0555555555555555LL
#define MASK 0xFFFFFFFFFFFFFFFFLL
static
uint64_t k_lut[] PROGMEM = {
16LL*K, 17LL*K, 18LL*K, 19LL*K,
20LL*K, 21LL*K, 22LL*K, 23LL*K,
24LL*K, 25LL*K, 26LL*K, 27LL*K,
28LL*K, 29LL*K, 30LL*K, 31LL*K };
*/
/* the same as above but precomputed to avoid compiler warnings */
static const
uint64_t k_lut[] = {
0x5555555555555550LL, 0x5aaaaaaaaaaaaaa5LL, 0x5ffffffffffffffaLL,
0x655555555555554fLL, 0x6aaaaaaaaaaaaaa4LL, 0x6ffffffffffffff9LL,
0x755555555555554eLL, 0x7aaaaaaaaaaaaaa3LL, 0x7ffffffffffffff8LL,
0x855555555555554dLL, 0x8aaaaaaaaaaaaaa2LL, 0x8ffffffffffffff7LL,
0x955555555555554cLL, 0x9aaaaaaaaaaaaaa1LL, 0x9ffffffffffffff6LL,
0xa55555555555554bLL };
static
uint64_t bmw_large_expand1(uint8_t j, const uint64_t* q, const void* m, const void* h){
uint64_t r;
/* r = 0x0555555555555555LL*(j+16); */
r = ( ROTL64(((uint64_t*)m)[(j)&0xf], ((j+ 0)&0xf)+1)
+ ROTL64(((uint64_t*)m)[(j+3)&0xf], ((j+ 3)&0xf)+1)
+ k_lut[j]
- ROTL64(((uint64_t*)m)[(j+10)&0xf],((j+10)&0xf)+1)
) ^ ((uint64_t*)h)[(j+7)&0xf];
r += S64_1(q[j+ 0]) + S64_2(q[j+ 1]) + S64_3(q[j+ 2]) + S64_0(q[j+ 3]) +
S64_1(q[j+ 4]) + S64_2(q[j+ 5]) + S64_3(q[j+ 6]) + S64_0(q[j+ 7]) +
S64_1(q[j+ 8]) + S64_2(q[j+ 9]) + S64_3(q[j+10]) + S64_0(q[j+11]) +
S64_1(q[j+12]) + S64_2(q[j+13]) + S64_3(q[j+14]) + S64_0(q[j+15]);
return r;
}
static
uint64_t bmw_large_expand2(uint8_t j, const uint64_t* q, const void* m, const void* h){
uint64_t r=0;
r = ( ROTL64(((uint64_t*)m)[(j)&0xf], ((j+ 0)&0xf)+1)
+ ROTL64(((uint64_t*)m)[(j+3)&0xf], ((j+ 3)&0xf)+1)
+ k_lut[j]
- ROTL64(((uint64_t*)m)[(j+10)&0xf],((j+10)&0xf)+1)
) ^ ((uint64_t*)h)[(j+7)&0xf];
r += (q[j+ 0]) + R64_1(q[j+ 1]) + (q[j+ 2]) + R64_2(q[j+ 3]) +
(q[j+ 4]) + R64_3(q[j+ 5]) + (q[j+ 6]) + R64_4(q[j+ 7]) +
(q[j+ 8]) + R64_5(q[j+ 9]) + (q[j+10]) + R64_6(q[j+11]) +
(q[j+12]) + R64_7(q[j+13]) + S64_4(q[j+14]) + S64_5(q[j+15]);
return r;
}
#if F0_HACK==2
/* to understand this implementation take a look at f0-opt-table.txt */
static uint16_t hack_table[5] = { 0x0311, 0xDDB3, 0x2A79, 0x07AA, 0x51C2 };
static uint8_t offset_table[5] = { 4+16, 6+16, 9+16, 12+16, 13+16 };
static
void bmw_large_f0(uint64_t* q, const uint64_t* h, const void* m){
uint16_t hack_reg;
uint8_t i,j,c;
uint64_t(*s[])(uint64_t)={ bmw_large_s0, bmw_large_s1, bmw_large_s2,
bmw_large_s3, bmw_large_s4 };
for(i=0; i<16; ++i){
((uint64_t*)h)[i] ^= ((uint64_t*)m)[i];
}
dump_x(h, 16, 'T');
memset(q, 0, 8*16);
c=4;
do{
i=15;
j = offset_table[c];
hack_reg = hack_table[c];
do{
if(hack_reg&1){
q[i]-= h[j&15];
}else{
q[i]+= h[j&15];
}
--j;
hack_reg>>= 1;
}while(i--!=0);
}while(c--!=0);
dump_x(q, 16, 'W');
for(i=0; i<16; ++i){
q[i] = s[i%5](q[i]);
}
#if TWEAK
for(i=0; i<16; ++i){
((uint64_t*)h)[i] ^= ((uint64_t*)m)[i];
}
for(i=0; i<16; ++i){
q[i] += h[(i+1)&0xf];
}
#endif /* TWEAK */
}
#endif /* F0_HACK==2 */
#if F0_HACK==1
static
uint8_t f0_lut[] PROGMEM ={
5<<1, ( 7<<1)+1, (10<<1)+0, (13<<1)+0, (14<<1)+0,
6<<1, ( 8<<1)+1, (11<<1)+0, (14<<1)+0, (15<<1)+1,
0<<1, ( 7<<1)+0, ( 9<<1)+0, (12<<1)+1, (15<<1)+0,
0<<1, ( 1<<1)+1, ( 8<<1)+0, (10<<1)+1, (13<<1)+0,
1<<1, ( 2<<1)+0, ( 9<<1)+0, (11<<1)+1, (14<<1)+1,
3<<1, ( 2<<1)+1, (10<<1)+0, (12<<1)+1, (15<<1)+0,
4<<1, ( 0<<1)+1, ( 3<<1)+1, (11<<1)+1, (13<<1)+0,
1<<1, ( 4<<1)+1, ( 5<<1)+1, (12<<1)+1, (14<<1)+1,
2<<1, ( 5<<1)+1, ( 6<<1)+1, (13<<1)+0, (15<<1)+1,
0<<1, ( 3<<1)+1, ( 6<<1)+0, ( 7<<1)+1, (14<<1)+0,
8<<1, ( 1<<1)+1, ( 4<<1)+1, ( 7<<1)+1, (15<<1)+0,
8<<1, ( 0<<1)+1, ( 2<<1)+1, ( 5<<1)+1, ( 9<<1)+0,
1<<1, ( 3<<1)+0, ( 6<<1)+1, ( 9<<1)+1, (10<<1)+0,
2<<1, ( 4<<1)+0, ( 7<<1)+0, (10<<1)+0, (11<<1)+0,
3<<1, ( 5<<1)+1, ( 8<<1)+0, (11<<1)+1, (12<<1)+1,
12<<1, ( 4<<1)+1, ( 6<<1)+1, ( 9<<1)+1, (13<<1)+0
};
static
void bmw_large_f0(uint64_t* q, const uint64_t* h, const void* m){
uint8_t i,j=-1,v,sign,l=0;
uint64_t(*s[])(uint64_t)={ bmw_large_s0, bmw_large_s1, bmw_large_s2,
bmw_large_s3, bmw_large_s4 };
for(i=0; i<16; ++i){
((uint64_t*)h)[i] ^= ((uint64_t*)m)[i];
}
dump_x(h, 16, 'T');
// memset(q, 0, 4*16);
for(i=0; i<5*16; ++i){
v = pgm_read_byte(f0_lut+i);
sign = v&1;
v >>=1;
if(i==l){
j++;
l+=5;
q[j] = h[v];
continue;
}
if(sign){
q[j] -= h[v];
}else{
q[j] += h[v];
}
}
dump_x(q, 16, 'W');
for(i=0; i<16; ++i){
q[i] = s[i%5](q[i]);
}
#if TWEAK
for(i=0; i<16; ++i){
((uint64_t*)h)[i] ^= ((uint64_t*)m)[i];
}
for(i=0; i<16; ++i){
q[i] += h[(i+1)&0xf];
}
#endif /* TWEAK */
}
#endif /* F0_HACK==1 */
#if F0_HACK==0
static
void bmw_large_f0(uint64_t* q, const uint64_t* h, const void* m){
uint8_t i;
for(i=0; i<16; ++i){
((uint64_t*)h)[i] ^= ((uint64_t*)m)[i];
}
// dump_x(t, 16, 'T');
q[ 0] = (h[ 5] - h[ 7] + h[10] + h[13] + h[14]);
q[ 1] = (h[ 6] - h[ 8] + h[11] + h[14] - h[15]);
q[ 2] = (h[ 0] + h[ 7] + h[ 9] - h[12] + h[15]);
q[ 3] = (h[ 0] - h[ 1] + h[ 8] - h[10] + h[13]);
q[ 4] = (h[ 1] + h[ 2] + h[ 9] - h[11] - h[14]);
q[ 5] = (h[ 3] - h[ 2] + h[10] - h[12] + h[15]);
q[ 6] = (h[ 4] - h[ 0] - h[ 3] - h[11] + h[13]);
q[ 7] = (h[ 1] - h[ 4] - h[ 5] - h[12] - h[14]);
q[ 8] = (h[ 2] - h[ 5] - h[ 6] + h[13] - h[15]);
q[ 9] = (h[ 0] - h[ 3] + h[ 6] - h[ 7] + h[14]);
q[10] = (h[ 8] - h[ 1] - h[ 4] - h[ 7] + h[15]);
q[11] = (h[ 8] - h[ 0] - h[ 2] - h[ 5] + h[ 9]);
q[12] = (h[ 1] + h[ 3] - h[ 6] - h[ 9] + h[10]);
q[13] = (h[ 2] + h[ 4] + h[ 7] + h[10] + h[11]);
q[14] = (h[ 3] - h[ 5] + h[ 8] - h[11] - h[12]);
q[15] = (h[12] - h[ 4] - h[ 6] - h[ 9] + h[13]);
dump_x(q, 16, 'W');
q[ 0] = S64_0(q[ 0]); q[ 1] = S64_1(q[ 1]); q[ 2] = S64_2(q[ 2]); q[ 3] = S64_3(q[ 3]); q[ 4] = S64_4(q[ 4]);
q[ 5] = S64_0(q[ 5]); q[ 6] = S64_1(q[ 6]); q[ 7] = S64_2(q[ 7]); q[ 8] = S64_3(q[ 8]); q[ 9] = S64_4(q[ 9]);
q[10] = S64_0(q[10]); q[11] = S64_1(q[11]); q[12] = S64_2(q[12]); q[13] = S64_3(q[13]); q[14] = S64_4(q[14]);
q[15] = S64_0(q[15]);
for(i=0; i<16; ++i){
((uint64_t*)h)[i] ^= ((uint64_t*)m)[i];
}
for(i=0; i<16; ++i){
q[i] += h[(i+1)&0xf];
}
}
#endif /* F0_HACK==0 */
static
void bmw_large_f1(uint64_t* q, const void* m, const uint64_t* h){
uint8_t i;
q[16] = bmw_large_expand1(0, q, m, h);
q[17] = bmw_large_expand1(1, q, m, h);
for(i=2; i<16; ++i){
q[16+i] = bmw_large_expand2(i, q, m, h);
}
}
static
void bmw_large_f2(uint64_t* h, const uint64_t* q, const void* m){
uint64_t xl=0, xh;
uint8_t i;
for(i=16;i<24;++i){
xl ^= q[i];
}
xh = xl;
for(i=24;i<32;++i){
xh ^= q[i];
}
#if DEBUG
cli_putstr("\r\n XL = ");
cli_hexdump_rev(&xl, 4);
cli_putstr("\r\n XH = ");
cli_hexdump_rev(&xh, 4);
#endif
memcpy(h, m, 16*8);
h[0] ^= SHL64(xh, 5) ^ SHR64(q[16], 5);
h[1] ^= SHR64(xh, 7) ^ SHL64(q[17], 8);
h[2] ^= SHR64(xh, 5) ^ SHL64(q[18], 5);
h[3] ^= SHR64(xh, 1) ^ SHL64(q[19], 5);
h[4] ^= SHR64(xh, 3) ^ q[20];
h[5] ^= SHL64(xh, 6) ^ SHR64(q[21], 6);
h[6] ^= SHR64(xh, 4) ^ SHL64(q[22], 6);
h[7] ^= SHR64(xh,11) ^ SHL64(q[23], 2);
for(i=0; i<8; ++i){
h[i] += xl ^ q[24+i] ^ q[i];
}
for(i=0; i<8; ++i){
h[8+i] ^= xh ^ q[24+i];
h[8+i] += ROTL64(h[(4+i)%8],i+9);
}
h[ 8] += SHL64(xl, 8) ^ q[23] ^ q[ 8];
h[ 9] += SHR64(xl, 6) ^ q[16] ^ q[ 9];
h[10] += SHL64(xl, 6) ^ q[17] ^ q[10];
h[11] += SHL64(xl, 4) ^ q[18] ^ q[11];
h[12] += SHR64(xl, 3) ^ q[19] ^ q[12];
h[13] += SHR64(xl, 4) ^ q[20] ^ q[13];
h[14] += SHR64(xl, 7) ^ q[21] ^ q[14];
h[15] += SHR64(xl, 2) ^ q[22] ^ q[15];
}
void bmw_large_nextBlock(bmw_large_ctx_t* ctx, const void* block){
uint64_t q[32];
dump_x(block, 16, 'M');
bmw_large_f0(q, ctx->h, block);
dump_x(q, 16, 'Q');
bmw_large_f1(q, block, ctx->h);
dump_x(q, 32, 'Q');
bmw_large_f2(ctx->h, q, block);
ctx->counter += 1;
ctx_dump(ctx);
}
void bmw_large_lastBlock(bmw_large_ctx_t* ctx, const void* block, uint16_t length_b){
uint8_t buffer[128];
while(length_b >= BMW_LARGE_BLOCKSIZE){
bmw_large_nextBlock(ctx, block);
length_b -= BMW_LARGE_BLOCKSIZE;
block = (uint8_t*)block + BMW_LARGE_BLOCKSIZE_B;
}
memset(buffer, 0, 128);
memcpy(buffer, block, (length_b+7)/8);
buffer[length_b>>3] |= 0x80 >> (length_b&0x07);
if(length_b+1>128*8-64){
bmw_large_nextBlock(ctx, buffer);
memset(buffer, 0, 128-8);
ctx->counter -= 1;
}
*((uint64_t*)&(buffer[128-8])) = (uint64_t)(ctx->counter*1024LL)+(uint64_t)length_b;
bmw_large_nextBlock(ctx, buffer);
#if TWEAK
uint8_t i;
uint64_t q[32];
memset(buffer, 0xaa, 128);
for(i=0; i<16; ++i){
buffer[8*i] = i + 0xa0;
}
bmw_large_f0(q, (uint64_t*)buffer, ctx->h);
bmw_large_f1(q, ctx->h, (uint64_t*)buffer);
bmw_large_f2((uint64_t*)buffer, q, ctx->h);
memcpy(ctx->h, buffer, 128);
#endif
}
void bmw384_init(bmw384_ctx_t* ctx){
uint8_t i;
ctx->h[0] = 0x0001020304050607LL;
for(i=1; i<16; ++i){
ctx->h[i] = ctx->h[i-1]+ 0x0808080808080808LL;
}
#if BUG24
ctx->h[6] = 0x3031323324353637LL;
#endif
ctx->counter=0;
ctx_dump(ctx);
}
void bmw512_init(bmw512_ctx_t* ctx){
uint8_t i;
ctx->h[0] = 0x8081828384858687LL;
for(i=1; i<16; ++i){
ctx->h[i] = ctx->h[i-1]+ 0x0808080808080808LL;
}
ctx->counter=0;
ctx_dump(ctx);
}
void bmw384_nextBlock(bmw384_ctx_t* ctx, const void* block){
bmw_large_nextBlock(ctx, block);
}
void bmw512_nextBlock(bmw512_ctx_t* ctx, const void* block){
bmw_large_nextBlock(ctx, block);
}
void bmw384_lastBlock(bmw384_ctx_t* ctx, const void* block, uint16_t length_b){
bmw_large_lastBlock(ctx, block, length_b);
}
void bmw512_lastBlock(bmw512_ctx_t* ctx, const void* block, uint16_t length_b){
bmw_large_lastBlock(ctx, block, length_b);
}
void bmw384_ctx2hash(void* dest, const bmw384_ctx_t* ctx){
memcpy(dest, &(ctx->h[10]), 384/8);
}
void bmw512_ctx2hash(void* dest, const bmw512_ctx_t* ctx){
memcpy(dest, &(ctx->h[8]), 512/8);
}
void bmw384(void* dest, const void* msg, uint32_t length_b){
bmw_large_ctx_t ctx;
bmw384_init(&ctx);
while(length_b>=BMW_LARGE_BLOCKSIZE){
bmw_large_nextBlock(&ctx, msg);
length_b -= BMW_LARGE_BLOCKSIZE;
msg = (uint8_t*)msg + BMW_LARGE_BLOCKSIZE_B;
}
bmw_large_lastBlock(&ctx, msg, length_b);
bmw384_ctx2hash(dest, &ctx);
}
void bmw512(void* dest, const void* msg, uint32_t length_b){
bmw_large_ctx_t ctx;
bmw512_init(&ctx);
while(length_b>=BMW_LARGE_BLOCKSIZE){
bmw_large_nextBlock(&ctx, msg);
length_b -= BMW_LARGE_BLOCKSIZE;
msg = (uint8_t*)msg + BMW_LARGE_BLOCKSIZE_B;
}
bmw_large_lastBlock(&ctx, msg, length_b);
bmw512_ctx2hash(dest, &ctx);
}

View File

@ -166,21 +166,21 @@ void bmw_small_f0(uint32_t* q, uint32_t* h, const void* m){
}while(i--);
dump_x(h, 16, 'T');
q[ 0] = (h[ 5] - h[ 7] + h[10] + h[13] + h[14]);
q[ 1] = (h[ 6] - h[ 8] + h[11] + h[14] - h[15]);
q[ 2] = (h[ 0] + h[ 7] + h[ 9] - h[12] + h[15]);
q[ 3] = (h[ 0] - h[ 1] + h[ 8] - h[10] + h[13]);
q[ 4] = (h[ 1] + h[ 2] + h[ 9] - h[11] - h[14]);
q[ 5] = (h[ 3] - h[ 2] + h[10] - h[12] + h[15]);
q[ 6] = (h[ 4] - h[ 0] - h[ 3] - h[11] + h[13]);
q[ 7] = (h[ 1] - h[ 4] - h[ 5] - h[12] - h[14]);
q[ 8] = (h[ 2] - h[ 5] - h[ 6] + h[13] - h[15]);
q[ 9] = (h[ 0] - h[ 3] + h[ 6] - h[ 7] + h[14]);
q[10] = (h[ 8] - h[ 1] - h[ 4] - h[ 7] + h[15]);
q[11] = (h[ 8] - h[ 0] - h[ 2] - h[ 5] + h[ 9]);
q[12] = (h[ 1] + h[ 3] - h[ 6] - h[ 9] + h[10]);
q[13] = (h[ 2] + h[ 4] + h[ 7] + h[10] + h[11]);
q[14] = (h[ 3] - h[ 5] + h[ 8] - h[11] - h[12]);
q[15] = (h[12] - h[ 4] - h[ 6] - h[ 9] + h[13]);
q[ 2] = (h[ 0] + h[ 7] + h[ 9] - h[12] + h[15]);
q[ 5] = (h[ 3] - h[ 2] + h[10] - h[12] + h[15]);
q[ 8] = (h[ 2] - h[ 5] - h[ 6] + h[13] - h[15]);
q[11] = (h[ 8] - h[ 0] - h[ 2] - h[ 5] + h[ 9]);
q[14] = (h[ 3] - h[ 5] + h[ 8] - h[11] - h[12]);
q[ 1] = (h[ 6] - h[ 8] + h[11] + h[14] - h[15]);
q[ 4] = (h[ 1] + h[ 2] + h[ 9] - h[11] - h[14]);
q[ 7] = (h[ 1] - h[ 4] - h[ 5] - h[12] - h[14]);
q[10] = (h[ 8] - h[ 1] - h[ 4] - h[ 7] + h[15]);
q[13] = (h[ 2] + h[ 4] + h[ 7] + h[10] + h[11]);
dump_x(q, 16, 'W');
q[ 0] = S32_0(q[ 0]); q[ 1] = S32_1(q[ 1]); q[ 2] = S32_2(q[ 2]); q[ 3] = S32_3(q[ 3]); q[ 4] = S32_4(q[ 4]);
q[ 5] = S32_0(q[ 5]); q[ 6] = S32_1(q[ 6]); q[ 7] = S32_2(q[ 7]); q[ 8] = S32_3(q[ 8]); q[ 9] = S32_4(q[ 9]);

View File

@ -111,9 +111,9 @@ def process_hashfunction(fin, name, impl)
stack = 0
end
size = get_size_string(impl, name)
printf("| %20s || %3s || %3s || %6d || %7d || %7d || %7d || %7d ||" +
printf("| %20s || %6s || %3s || %6d || %7d || %7d || %7d || %7d ||" +
" %7d || %7d || %9.2f || %7d || || || \n|-\n" ,
name, $lang, $lang, size, ctxsize, stack, hashsize, blocksize,
name, $variant, $lang, size, ctxsize, stack, hashsize, blocksize,
inittime, nextblocktime, nextblocktime.to_f/(blocksize/8),
lastblocktime+convtime)
end
@ -125,9 +125,16 @@ $handlers["hashfunction"] = 1 #process_hashfunction
def process_file(fname)
fin = File.open(fname, "r")
$lang = "asm"
$lang = "C" if fname.match(/_c.txt$/)
impl = fname.match(/([^.]*).txt$/)[1]
$lang = "asm"
$lang = "C" if impl.match(/^[^_]*_[cC]/)
$variant = $lang
if m=impl.match(/_([^_]*)$/)
$variant = m[1]
end
if $variant == 'c'
$variant = 'C'
end
begin
begin
if fin.eof()
@ -141,7 +148,7 @@ def process_file(fname)
type = m[1]
if $handlers[type] != 0
# handlers[type](fin, name)
# puts "DBG: process "+'-'+name+'-'+impl
# puts "DBG: process "fname+'-'+name+'-'+impl
process_hashfunction(fin, name, impl)
else
printf("ERROR: unsupported type: %s !\n", type)

View File

@ -5,7 +5,7 @@ ALGO_NAME := BMW_C_SPEED
HASHES += $(ALGO_NAME)
$(ALGO_NAME)_DIR := bmw/
$(ALGO_NAME)_OBJ := bmw_small_speed.o bmw_large.o memxor.o
$(ALGO_NAME)_OBJ := bmw_small_speed.o bmw_large_speed.o memxor.o
$(ALGO_NAME)_TEST_BIN := main-bmw-test.o hfal_bmw_small.o hfal_bmw_large.o $(CLI_STD) $(HFAL_STD)
$(ALGO_NAME)_NESSIE_TEST := test nessie
$(ALGO_NAME)_PERFORMANCE_TEST := performance