X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=blobdiff_plain;f=test_src%2Fnessie_common.c;h=0bdcdda4923f106674c7db9988b64f28b360c970;hp=ff087bffac4bba605be85efc77e621b541d1529b;hb=4b5da1dc27a791b5c448274a3db09cd035b33493;hpb=cf1c79ef3fa4bb22f0cab28b2b6e958293aca739 diff --git a/test_src/nessie_common.c b/test_src/nessie_common.c index ff087bf..0bdcdda 100644 --- a/test_src/nessie_common.c +++ b/test_src/nessie_common.c @@ -1,7 +1,7 @@ /* nessie_common.c */ /* - This file is part of the Crypto-avr-lib/microcrypt-lib. - Copyright (C) 2008 Daniel Otte (daniel.otte@rub.de) + This file is part of the AVR-Crypto-Lib. + 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 * * common function for nessie-tests @@ -28,54 +28,69 @@ #include #include +#include #include -#include /* utoa() */ -#include "uart.h" - -void nessie_print_block(uint8_t* block, uint16_t blocksize_bit){ - char tab [] = {'0', '1', '2', '3', - '4', '5', '6', '7', - '8', '9', 'A', 'B', - 'C', 'D', 'E', 'F'}; +#include "nessie_common.h" +#include "hexdigit_tab.h" + +#define nessie_out_file stdout + +void nessie_set_output_stream(FILE *out_stream){ + nessie_out_file = out_stream; +} + + +#ifdef NESSIE_ALIVE +void nessie_send_alive(void){ + putc(NESSIE_ALIVE_CHAR, nessie_out_file); +} + +void nessie_send_alive_a(uint16_t i){ + if((i&31)==0) + putc(NESSIE_ALIVE_CHAR, nessie_out_file); +} +#endif + +void nessie_print_block(uint8_t *block, uint16_t blocksize_bit){ uint16_t i; for(i=0; i<(blocksize_bit+7)/8; ++i){ - uart_putc(tab[(block[i])>>4]); - uart_putc(tab[(block[i])&0xf]); + putc(pgm_read_byte(hexdigit_tab_uc_P + ((block[i]) >> 4)), nessie_out_file); + putc(pgm_read_byte(hexdigit_tab_uc_P + ((block[i]) & 0xf)), nessie_out_file); } } #define SPACES 31 #define BYTESPERLINE 16 -void nessie_print_item(char* name, uint8_t* buffer, uint16_t size_B){ +void nessie_print_item(const char *name, uint8_t *buffer, uint16_t size_B){ uint8_t name_len; uint8_t i; - name_len=strlen(name); - if(name_len>SPACES-1){ - uart_putstr_P(PSTR("\r\n!!! formatting error !!!\r\n")); + name_len = strlen(name); + if(name_len > SPACES - 1){ + fputs_P(PSTR("\n!!! formatting error !!!\n"), nessie_out_file); return; } - uart_putstr_P(PSTR("\r\n")); - for(i=0; i 0){ - uart_putstr_P(PSTR("\r\n")); - for(i=0; iBYTESPERLINE)?BYTESPERLINE:toprint)*8); + nessie_print_block(buffer, ((toprint > BYTESPERLINE) ? BYTESPERLINE : toprint) * 8); buffer += BYTESPERLINE; toprint -= BYTESPERLINE; } @@ -84,14 +99,7 @@ void nessie_print_item(char* name, uint8_t* buffer, uint16_t size_B){ void nessie_print_set_vector(uint8_t set, uint16_t vector){ - uart_putstr_P(PSTR("\r\n\r\nSet ")); - uart_putc('0'+set%10); - uart_putstr_P(PSTR(", vector#")); - uart_putc((vector<1000)?' ':'0'+vector/1000); - uart_putc((vector<100)?' ':'0'+(vector/100)%10); - uart_putc((vector<10 )?' ':'0'+(vector/10)%10); - uart_putc('0'+vector%10); - uart_putc(':'); + fprintf_P(nessie_out_file, PSTR("\n\nSet %"PRIu8", vector#%4"PRIu16":"), set, vector); } /* example: @@ -99,9 +107,7 @@ Test vectors -- set 3 ===================== */ void nessie_print_setheader(uint8_t set){ - uart_putstr_P(PSTR("\r\n\r\nTest vectors -- set ")); - uart_putc('0'+set%10); - uart_putstr_P(PSTR("\r\n=====================")); + fprintf_P(nessie_out_file, PSTR("\r\n\r\nTest vectors -- set %"PRIu8"\n====================="), set); } /* example: @@ -115,65 +121,47 @@ Key size: 256 bits Block size: 128 bits */ -void nessie_print_header(char* name, +void nessie_print_header(const char *name, uint16_t keysize_b, uint16_t blocksize_b, uint16_t hashsize_b, uint16_t macsize_b, uint16_t ivsize_b ){ uint16_t i; - uart_putstr_P(PSTR("\r\n\r\n" - "********************************************************************************\r\n" - "* micro-crypt - crypto primitives for microcontrolles by Daniel Otte *\r\n" - "********************************************************************************\r\n" - "\r\n")); - uart_putstr_P(PSTR("Primitive Name: ")); - uart_putstr(name); - uart_putstr_P(PSTR("\r\n")); + fputs_P(PSTR("\n\n" + "********************************************************************************\n" + "* AVR-Crypto-Lib - crypto primitives for AVR microcontrollers by Daniel Otte *\n" + "********************************************************************************\n\n"), + nessie_out_file); + fprintf_P(nessie_out_file, PSTR("Primitive Name: %s\n"), name); /* underline */ for(i=0; i<16+strlen(name); ++i){ - uart_putc('='); + putc('=', nessie_out_file); } - char str[6]; /* must catch numbers up to 65535 + terminatin \0 */ if(keysize_b){ - uart_putstr_P(PSTR("\r\nKey size: ")); - utoa(keysize_b, str, 10); - uart_putstr(str); - uart_putstr_P(PSTR(" bits")); + fprintf_P(nessie_out_file, PSTR("\nKey size: %"PRIu16" bits"), keysize_b); } if(blocksize_b){ - uart_putstr_P(PSTR("\r\nBlock size: ")); - utoa(blocksize_b, str, 10); - uart_putstr(str); - uart_putstr_P(PSTR(" bits")); + fprintf_P(nessie_out_file, PSTR("\nBlock size: %"PRIu16" bits"), blocksize_b); } if(hashsize_b){ - uart_putstr_P(PSTR("\r\nHash size: ")); - utoa(hashsize_b, str, 10); - uart_putstr(str); - uart_putstr_P(PSTR(" bits")); + fprintf_P(nessie_out_file, PSTR("\nHash size: %"PRIu16" bits"), hashsize_b); + } if(macsize_b){ - uart_putstr_P(PSTR("\r\nMac size: ")); - utoa(macsize_b, str, 10); - uart_putstr(str); - uart_putstr_P(PSTR(" bits")); + fprintf_P(nessie_out_file, PSTR("\nMac size: %"PRIu16" bits"), macsize_b); } if(ivsize_b){ if(ivsize_b==(uint16_t)-1){ - uart_putstr_P(PSTR("\r\nNo initial value (IV) mode")); - } - { - uart_putstr_P(PSTR("\r\nIV size: ")); - utoa(ivsize_b, str, 10); - uart_putstr(str); - uart_putstr_P(PSTR(" bits")); + fputs_P(PSTR("\nNo initial value (IV) mode"), stdout); + }else{ + fprintf_P(nessie_out_file, PSTR("\nIV size: %"PRIu16" bits"), ivsize_b); } } - uart_putstr_P(PSTR("\r\n")); + putc('\n', nessie_out_file); } void nessie_print_footer(void){ - uart_putstr_P(PSTR("\r\n\r\n\r\n\r\nEnd of test vectors\r\n\r\n")); + puts_P(PSTR("\n\n\n\nEnd of test vectors\n\n")); }