X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fnessie_mac_test.c;h=90704872c071af80da120d2a18931e380ee3d543;hb=53f8a8d7ca5c03120224128e1f8552c99f6af11e;hp=ef4c0d82c383aae3daa74b8e191e593a0b42ab47;hpb=572b35bb7409fb362441e0812cb62eab9f2411f0;p=avr-crypto-lib.git diff --git a/test_src/nessie_mac_test.c b/test_src/nessie_mac_test.c index ef4c0d8..9070487 100644 --- a/test_src/nessie_mac_test.c +++ b/test_src/nessie_mac_test.c @@ -27,6 +27,7 @@ * */ #include #include +#include #include "nessie_mac_test.h" #include "nessie_common.h" #include "uart.h" @@ -45,17 +46,17 @@ void ascii_mac(char* data, char* desc, uint8_t* key){ uint8_t mac[MACSIZE_B]; uint16_t sl; - uart_putstr_P(PSTR("\r\n message=")); - uart_putstr(desc); + NESSIE_PUTSTR_P(PSTR("\r\n message=")); + NESSIE_PUTSTR(desc); PRINTKEY; - nessie_mac_ctx.mac_init(key, nessie_mac_ctx.keysize_b, ctx); + nessie_mac_ctx.mac_init(ctx, key, nessie_mac_ctx.keysize_b); sl = strlen(data); while(sl>nessie_mac_ctx.blocksize_B){ - nessie_mac_ctx.mac_next(data, ctx); + nessie_mac_ctx.mac_next(ctx, data); data += nessie_mac_ctx.blocksize_B; sl -= nessie_mac_ctx.blocksize_B; } - nessie_mac_ctx.mac_last(data, sl*8, key, nessie_mac_ctx.keysize_b, ctx); + nessie_mac_ctx.mac_last(ctx, data, sl*8); nessie_mac_ctx.mac_conv(mac, ctx); PRINTMAC; } @@ -68,18 +69,20 @@ void amillion_mac(uint8_t* key){ uint8_t mac[MACSIZE_B]; uint8_t block[nessie_mac_ctx.blocksize_B]; uint32_t n=1000000LL; + uint16_t i=0; - uart_putstr_P(PSTR("\r\n message=")); - uart_putstr_P(PSTR("1 million times \"a\"")); + NESSIE_PUTSTR_P(PSTR("\r\n message=")); + NESSIE_PUTSTR_P(PSTR("1 million times \"a\"")); PRINTKEY; memset(block, 'a', nessie_mac_ctx.blocksize_B); - nessie_mac_ctx.mac_init(key, nessie_mac_ctx.keysize_b, ctx); - while(n>nessie_mac_ctx.blocksize_B){ - nessie_mac_ctx.mac_next(block, ctx); + nessie_mac_ctx.mac_init(ctx, key, nessie_mac_ctx.keysize_b); + while(n>=nessie_mac_ctx.blocksize_B){ + nessie_mac_ctx.mac_next(ctx, block); n -= nessie_mac_ctx.blocksize_B; + NESSIE_SEND_ALIVE_A(i++); } - nessie_mac_ctx.mac_last(block, n*8, key, nessie_mac_ctx.keysize_b, ctx); + nessie_mac_ctx.mac_last(ctx, block, n*8); nessie_mac_ctx.mac_conv(mac, ctx); PRINTMAC; } @@ -91,26 +94,26 @@ void zero_mac(uint16_t n, uint8_t* key){ uint8_t mac[MACSIZE_B]; uint8_t block[nessie_mac_ctx.blocksize_B]; - uart_putstr_P(PSTR("\r\n message=")); + NESSIE_PUTSTR_P(PSTR("\r\n message=")); if(n>=10000) - uart_putc('0'+n/10000); + NESSIE_PUTC('0'+n/10000); if(n>=1000) - uart_putc('0'+(n/1000)%10); + NESSIE_PUTC('0'+(n/1000)%10); if(n>=100) - uart_putc('0'+(n/100)%10); + NESSIE_PUTC('0'+(n/100)%10); if(n>=10) - uart_putc('0'+(n/10)%10); - uart_putc('0'+n%10); - uart_putstr_P(PSTR(" zero bits")); + NESSIE_PUTC('0'+(n/10)%10); + NESSIE_PUTC('0'+n%10); + NESSIE_PUTSTR_P(PSTR(" zero bits")); PRINTKEY; memset(block, 0, nessie_mac_ctx.blocksize_B); - nessie_mac_ctx.mac_init(key, nessie_mac_ctx.keysize_b,ctx);; + nessie_mac_ctx.mac_init(ctx, key, nessie_mac_ctx.keysize_b); while(n>nessie_mac_ctx.blocksize_B*8){ - nessie_mac_ctx.mac_next(block, ctx); + nessie_mac_ctx.mac_next(ctx, block); n -= nessie_mac_ctx.blocksize_B*8; } - nessie_mac_ctx.mac_last(block, n, key, nessie_mac_ctx.keysize_b, ctx); + nessie_mac_ctx.mac_last(ctx, block, n); nessie_mac_ctx.mac_conv(mac, ctx); PRINTMAC; } @@ -125,24 +128,24 @@ void one_in512_mac(uint16_t pos, uint8_t* key){ "08", "04", "02", "01" }; pos&=511; - uart_putstr_P(PSTR("\r\n message=")); - uart_putstr_P(PSTR("512-bit string: ")); + NESSIE_PUTSTR_P(PSTR("\r\n message=")); + NESSIE_PUTSTR_P(PSTR("512-bit string: ")); if((pos/8) >=10){ - uart_putc('0'+(pos/8/10)%10); + NESSIE_PUTC('0'+(pos/8/10)%10); } else { - uart_putc(' '); + NESSIE_PUTC(' '); } - uart_putc('0'+(pos/8)%10); - uart_putstr_P(PSTR("*00,")); - uart_putstr(tab[pos&7]); - uart_putc(','); + NESSIE_PUTC('0'+(pos/8)%10); + NESSIE_PUTSTR_P(PSTR("*00,")); + NESSIE_PUTSTR(tab[pos&7]); + NESSIE_PUTC(','); if(63-(pos/8) >=10){ - uart_putc('0'+((63-pos/8)/10)%10); + NESSIE_PUTC('0'+((63-pos/8)/10)%10); } else { - uart_putc(' '); + NESSIE_PUTC(' '); } - uart_putc('0'+(63-pos/8)%10); - uart_putstr_P(PSTR("*00")); + NESSIE_PUTC('0'+(63-pos/8)%10); + NESSIE_PUTSTR_P(PSTR("*00")); PRINTKEY; /* now the real stuff */ @@ -150,41 +153,54 @@ void one_in512_mac(uint16_t pos, uint8_t* key){ block[pos>>3] = 0x80>>(pos&0x7); uint8_t* bp; bp = block; - nessie_mac_ctx.mac_init(key, nessie_mac_ctx.keysize_b, ctx); + nessie_mac_ctx.mac_init(ctx, key, nessie_mac_ctx.keysize_b); while(n>nessie_mac_ctx.blocksize_B*8){ - nessie_mac_ctx.mac_next(bp, ctx); + nessie_mac_ctx.mac_next(ctx, bp); n -= nessie_mac_ctx.blocksize_B*8; bp += nessie_mac_ctx.blocksize_B; } - nessie_mac_ctx.mac_last(bp, n, key, nessie_mac_ctx.keysize_b, ctx); + nessie_mac_ctx.mac_last(ctx, bp, n); nessie_mac_ctx.mac_conv(mac, ctx); PRINTMAC; } static -void tv4_mac(uint8_t* key){ +void tv4_mac(void){ uint8_t ctx[nessie_mac_ctx.ctx_size_B]; uint8_t mac[MACSIZE_B]; - uint8_t block[256/8]; - uint16_t n=256; + uint8_t block[MACSIZE_B]; + uint8_t core_key[] = { + 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, + 0x88, 0x99, 0xAA, 0xBB, 0xCC, 0xDD, 0xEE, 0xFF, + 0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF + }; + uint8_t key[KEYSIZE_B]; + uint16_t n=MACSIZE_B*8; uint32_t i; + char str[6]; - uart_putstr_P(PSTR("\r\n message=")); - uart_putstr(PSTR("256 zero bits")); - memset(block, 0, 256/8); - - nessie_mac_ctx.mac_init(key, nessie_mac_ctx.keysize_b, ctx);; + NESSIE_PUTSTR_P(PSTR("\r\n message=")); + utoa(MACSIZE_B*8, str, 10); + NESSIE_PUTSTR(str); + NESSIE_PUTSTR_P(PSTR(" zero bits")); + memset(block, 0, MACSIZE_B); + for(i=0; inessie_mac_ctx.blocksize_B*8){ - nessie_mac_ctx.mac_next(block, ctx); + nessie_mac_ctx.mac_next(ctx, block); n -= nessie_mac_ctx.blocksize_B*8; } - nessie_mac_ctx.mac_last(block, n, key, nessie_mac_ctx.keysize_b, ctx); + nessie_mac_ctx.mac_last(ctx, block, n); nessie_mac_ctx.mac_conv(mac, ctx); PRINTMAC; for(i=1; i<100000L; ++i){ /* this assumes BLOCKSIZE >= HASHSIZE */ - nessie_mac_ctx.mac_init(key, nessie_mac_ctx.keysize_b, ctx);; - nessie_mac_ctx.mac_last(mac, nessie_mac_ctx.macsize_b, key, nessie_mac_ctx.keysize_b, ctx); + nessie_mac_ctx.mac_init(ctx, key, nessie_mac_ctx.keysize_b); + nessie_mac_ctx.mac_last(ctx, mac, nessie_mac_ctx.macsize_b); nessie_mac_ctx.mac_conv(mac, ctx); + NESSIE_SEND_ALIVE_A(i); + NESSIE_SEND_ALIVE_A(i+32); } nessie_print_item("iterated 100000 times", mac, MACSIZE_B); } @@ -262,8 +278,10 @@ void nessie_mac_run(void){ nessie_print_setheader(set); /* we use the same key as above */ nessie_print_set_vector(set, 0); - tv4_mac(key); + tv4_mac(); /* test set 5 */ + set=5; + nessie_print_setheader(set); for(i=0; i