X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=blobdiff_plain;f=test_src%2Fnessie_mac_test.c;h=91b70073bea2fba1cfc620d49efe010f878ef6cc;hp=90704872c071af80da120d2a18931e380ee3d543;hb=4b5da1dc27a791b5c448274a3db09cd035b33493;hpb=53f8a8d7ca5c03120224128e1f8552c99f6af11e diff --git a/test_src/nessie_mac_test.c b/test_src/nessie_mac_test.c index 9070487..91b7007 100644 --- a/test_src/nessie_mac_test.c +++ b/test_src/nessie_mac_test.c @@ -1,7 +1,7 @@ /* nessie_mac_test.c */ /* This file is part of the AVR-Crypto-Lib. - Copyright (C) 2008 Daniel Otte (daniel.otte@rub.de) + Copyright (C) 2006-2015 Daniel Otte (bg@nerilex.org) 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 @@ -19,7 +19,7 @@ /** * * author: Daniel Otte - * email: daniel.otte@rub.de + * email: bg@nerilex.org * license: GPLv3 * * a suit for running the nessie-tests for MACs @@ -28,35 +28,47 @@ #include #include #include +#include +#include #include "nessie_mac_test.h" #include "nessie_common.h" -#include "uart.h" +#include "dbz_strings.h" nessie_mac_ctx_t nessie_mac_ctx; -#define KEYSIZE_B ((nessie_mac_ctx.keysize_b+7)/8) -#define MACSIZE_B ((nessie_mac_ctx.macsize_b+7)/8) +#define KEYSIZE_B ((nessie_mac_ctx.keysize_b+7)/8) +#define MACSIZE_B ((nessie_mac_ctx.macsize_b+7)/8) +#define BLOCKSIZE_B (nessie_mac_ctx.blocksize_B) #define PRINTKEY nessie_print_item("key", key, KEYSIZE_B) #define PRINTMAC nessie_print_item("MAC", mac, MACSIZE_B) + +const uint8_t keyproto[] PROGMEM = { + 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, + 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff, + 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef }; + static -void ascii_mac(char* data, char* desc, uint8_t* key){ +void ascii_mac_P(PGM_P data, PGM_P desc, uint8_t *key){ uint8_t ctx[nessie_mac_ctx.ctx_size_B]; uint8_t mac[MACSIZE_B]; uint16_t sl; + uint8_t buffer[BLOCKSIZE_B]; - NESSIE_PUTSTR_P(PSTR("\r\n message=")); - NESSIE_PUTSTR(desc); + fputs_P(PSTR("\r\n message="), stdout); + fputs_P(desc, stdout); PRINTKEY; nessie_mac_ctx.mac_init(ctx, key, nessie_mac_ctx.keysize_b); - sl = strlen(data); + sl = strlen_P(data); while(sl>nessie_mac_ctx.blocksize_B){ - nessie_mac_ctx.mac_next(ctx, data); - data += nessie_mac_ctx.blocksize_B; - sl -= nessie_mac_ctx.blocksize_B; + memcpy_P(buffer, data, BLOCKSIZE_B); + nessie_mac_ctx.mac_next(ctx, buffer); + data += BLOCKSIZE_B; + sl -= BLOCKSIZE_B; } - nessie_mac_ctx.mac_last(ctx, data, sl*8); + memcpy_P(buffer, data, sl); + nessie_mac_ctx.mac_last(ctx, buffer, sl*8); nessie_mac_ctx.mac_conv(mac, ctx); PRINTMAC; } @@ -64,15 +76,15 @@ void ascii_mac(char* data, char* desc, uint8_t* key){ // message=1 million times "a" static -void amillion_mac(uint8_t* key){ +void amillion_mac(uint8_t *key){ uint8_t ctx[nessie_mac_ctx.ctx_size_B]; uint8_t mac[MACSIZE_B]; uint8_t block[nessie_mac_ctx.blocksize_B]; uint32_t n=1000000LL; uint16_t i=0; - NESSIE_PUTSTR_P(PSTR("\r\n message=")); - NESSIE_PUTSTR_P(PSTR("1 million times \"a\"")); + fputs_P(PSTR("\r\n message="), stdout); + fputs_P(PSTR("1 million times \"a\""), stdout); PRINTKEY; memset(block, 'a', nessie_mac_ctx.blocksize_B); @@ -89,22 +101,13 @@ void amillion_mac(uint8_t* key){ static -void zero_mac(uint16_t n, uint8_t* key){ +void zero_mac(uint16_t n, uint8_t *key){ uint8_t ctx[nessie_mac_ctx.ctx_size_B]; uint8_t mac[MACSIZE_B]; uint8_t block[nessie_mac_ctx.blocksize_B]; - NESSIE_PUTSTR_P(PSTR("\r\n message=")); - if(n>=10000) - NESSIE_PUTC('0'+n/10000); - if(n>=1000) - NESSIE_PUTC('0'+(n/1000)%10); - if(n>=100) - NESSIE_PUTC('0'+(n/100)%10); - if(n>=10) - NESSIE_PUTC('0'+(n/10)%10); - NESSIE_PUTC('0'+n%10); - NESSIE_PUTSTR_P(PSTR(" zero bits")); + fputs_P(PSTR("\r\n message="), stdout); + fprintf_P(stdout, PSTR("%"PRIu16" zero bits"), n); PRINTKEY; memset(block, 0, nessie_mac_ctx.blocksize_B); @@ -119,39 +122,25 @@ void zero_mac(uint16_t n, uint8_t* key){ } static -void one_in512_mac(uint16_t pos, uint8_t* key){ +void one_in512_mac(uint16_t pos, uint8_t *key){ uint8_t ctx[nessie_mac_ctx.ctx_size_B]; uint8_t mac[MACSIZE_B]; uint8_t block[nessie_mac_ctx.blocksize_B]; uint16_t n=512; - char* tab[8]={"80", "40", "20", "10", - "08", "04", "02", "01" }; + char *tab[8] = { "80", "40", "20", "10", + "08", "04", "02", "01" }; pos&=511; - NESSIE_PUTSTR_P(PSTR("\r\n message=")); - NESSIE_PUTSTR_P(PSTR("512-bit string: ")); - if((pos/8) >=10){ - NESSIE_PUTC('0'+(pos/8/10)%10); - } else { - NESSIE_PUTC(' '); - } - NESSIE_PUTC('0'+(pos/8)%10); - NESSIE_PUTSTR_P(PSTR("*00,")); - NESSIE_PUTSTR(tab[pos&7]); - NESSIE_PUTC(','); - if(63-(pos/8) >=10){ - NESSIE_PUTC('0'+((63-pos/8)/10)%10); - } else { - NESSIE_PUTC(' '); - } - NESSIE_PUTC('0'+(63-pos/8)%10); - NESSIE_PUTSTR_P(PSTR("*00")); + fputs_P(PSTR("\r\n message="), stdout); + fputs_P(PSTR("512-bit string: "), stdout); + + fprintf_P(stdout, PSTR("%2"PRIu16"*00,%s,%2"PRIu16"*00"), pos / 8, tab[pos & 7], 63 - pos / 8); PRINTKEY; /* now the real stuff */ memset(block, 0, 512/8); block[pos>>3] = 0x80>>(pos&0x7); - uint8_t* bp; + uint8_t *bp; bp = block; nessie_mac_ctx.mac_init(ctx, key, nessie_mac_ctx.keysize_b); while(n>nessie_mac_ctx.blocksize_B*8){ @@ -169,23 +158,16 @@ void tv4_mac(void){ uint8_t ctx[nessie_mac_ctx.ctx_size_B]; uint8_t mac[MACSIZE_B]; 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]; - NESSIE_PUTSTR_P(PSTR("\r\n message=")); - utoa(MACSIZE_B*8, str, 10); - NESSIE_PUTSTR(str); - NESSIE_PUTSTR_P(PSTR(" zero bits")); + fputs_P(PSTR("\r\n message="), stdout); + fprintf_P(stdout, PSTR("%"PRIu16" zero bits"), nessie_mac_ctx.macsize_b); + memset(block, 0, MACSIZE_B); for(i=0; inessie_mac_ctx.blocksize_B*8){ @@ -200,65 +182,70 @@ void tv4_mac(void){ 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); } - void nessie_mac_run(void){ uint16_t i; uint8_t set; - uint8_t keyproto[] = {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]; nessie_print_header(nessie_mac_ctx.name, nessie_mac_ctx.keysize_b, 0, 0, nessie_mac_ctx.macsize_b, 0); /* test set 1 */ - char* challange[10][2]= { - {"", "\"\" (empty string)"}, - {"a", "\"a\""}, - {"abc", "\"abc\""}, - {"message digest", "\"message digest\""}, - {"abcdefghijklmnopqrstuvwxyz","\"abcdefghijklmnopqrstuvwxyz\""}, - {"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq", - "\"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq\""}, - {"ABCDEFGHIJKLMNOPQRSTUVWXYZ" - "abcdefghijklmnopqrstuvwxyz" - "0123456789" , "\"A...Za...z0...9\""}, - {"1234567890" "1234567890" "1234567890" "1234567890" - "1234567890" "1234567890" "1234567890" "1234567890", - "8 times \"1234567890\""}, - {"Now is the time for all ", "\"Now is the time for all \""}, - {"Now is the time for it", "\"Now is the time for it\""} - }; + const char *challange_dbz= PSTR( + "\0" + "\"\" (empty string)\0" + "a\0" + "\"a\"\0" + "abc\0" + "\"abc\"\0" + "message digest\0" + "\"message digest\"\0" + "abcdefghijklmnopqrstuvwxyz\0" + "\"abcdefghijklmnopqrstuvwxyz\"\0" + "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq\0" + "\"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq\"\0" + "ABCDEFGHIJKLMNOPQRSTUVWXYZ" + "abcdefghijklmnopqrstuvwxyz" + "0123456789\0" + "\"A...Za...z0...9\"\0" + "1234567890123456789012345678901234567890" + "1234567890123456789012345678901234567890\0" + "8 times \"1234567890\"\0" + "Now is the time for all \0" + "\"Now is the time for all \"\0" + "Now is the time for it\0" + "\"Now is the time for it\"\0" + ); set=1; nessie_print_setheader(set); for(i=0; i>3]=0x80>>(i&0x7); - ascii_mac("ABC", "\"ABC\"", key); + ascii_mac_P(PSTR("ABC"), PSTR("\"ABC\""), key); } nessie_print_footer(); }