now with rsassa-pkcs1v15 (old rsa signatures) + many new things

[arm-crypto-lib.git] / bmw / bmw_small.c

diff --git a/bmw/bmw_small.c b/bmw/bmw_small.c
index 74c6b9c238ad3edcd65281e441ad55d18501c610..d52f92ef49d145ca9d59eb1a423db6198ba2b1fa 100644 (file)
--- a/bmw/bmw_small.c
+++ b/bmw/bmw_small.c
@@ -401,38 +401,42 @@ void bmw_small_nextBlock(bmw_small_ctx_t* ctx, const void* block){
 }
 
 void bmw_small_lastBlock(bmw_small_ctx_t* ctx, const void* block, uint16_t length_b){
-       uint8_t buffer[64];
+       union {
+               uint8_t   v8[64];
+               uint32_t v32[16];
+               uint64_t v64[ 8];
+       } buffer;
        while(length_b >= BMW_SMALL_BLOCKSIZE){
                bmw_small_nextBlock(ctx, block);
                length_b -= BMW_SMALL_BLOCKSIZE;
                block = (uint8_t*)block + BMW_SMALL_BLOCKSIZE_B;
        }
-       memset(buffer, 0, 64);
-       memcpy(buffer, block, (length_b+7)/8);
-       buffer[length_b>>3] |= 0x80 >> (length_b&0x07);
+       memset(buffer.v8, 0, 64);
+       memcpy(buffer.v8, block, (length_b+7)/8);
+       buffer.v8[length_b>>3] |= 0x80 >> (length_b&0x07);
        if(length_b+1>64*8-64){
-               bmw_small_nextBlock(ctx, buffer);
-               memset(buffer, 0, 64-8);
+               bmw_small_nextBlock(ctx, buffer.v8);
+               memset(buffer.v8, 0, 64-8);
                ctx->counter -= 1;
        }
-       *((uint64_t*)&(buffer[64-8])) = (uint64_t)(ctx->counter*512LL)+(uint64_t)length_b;
-       bmw_small_nextBlock(ctx, buffer);
+       buffer.v64[7] = (uint64_t)(ctx->counter*512LL)+(uint64_t)length_b;
+       bmw_small_nextBlock(ctx, buffer.v8);
 #if TWEAK
        uint8_t i;
        uint32_t q[32];
-       memset(buffer, 0xaa, 64);
+       memset(buffer.v8, 0xaa, 64);
        for(i=0; i<16;++i){
-               buffer[i*4] = i+0xa0;
+               buffer.v8[i*4] = i+0xa0;
        }
-//     dump_x(buffer, 16, 'A');
+//     dump_x(buffer.v8, 16, 'A');
        dump_x(ctx->h, 16, 'M');
-       bmw_small_f0(q, (uint32_t*)buffer, ctx->h);
-       dump_x(buffer, 16, 'a');
+       bmw_small_f0(q, buffer.v32, ctx->h);
+       dump_x(buffer.v8, 16, 'a');
        dump_x(q, 16, 'Q');
-       bmw_small_f1(q, ctx->h, (uint32_t*)buffer);
+       bmw_small_f1(q, ctx->h, buffer.v32);
        dump_x(q, 32, 'Q');
-       bmw_small_f2((uint32_t*)buffer, q, ctx->h);
-       memcpy(ctx->h, buffer, 64);
+       bmw_small_f2(buffer.v32, q, ctx->h);
+       memcpy(ctx->h, buffer.v8, 64);
 #endif
 }