X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;ds=sidebyside;f=test_src%2Fnessie_common.c;h=9c4a6d7f8dfa3186a5fc0a8b50dd153f2b03b421;hb=2b0000dcd4848a3231831a79e2cd35c049909ec9;hp=41381edeaeca3f8c8f9859992133fbcb899feb2b;hpb=5f46191d2615ebe2caa6e111b478031a34f20b9e;p=arm-crypto-lib.git diff --git a/test_src/nessie_common.c b/test_src/nessie_common.c index 41381ed..9c4a6d7 100644 --- a/test_src/nessie_common.c +++ b/test_src/nessie_common.c @@ -34,6 +34,7 @@ #include "cli.h" #include "string-extras.h" + #ifdef NESSIE_ALIVE void nessie_send_alive(void){ cli_putc(NESSIE_ALIVE_CHAR); @@ -52,7 +53,7 @@ void nessie_print_block(uint8_t* block, uint16_t blocksize_bit){ #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); @@ -120,7 +121,7 @@ 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, @@ -129,9 +130,10 @@ void nessie_print_header(char* name, uint16_t i; cli_putstr("\r\n\r\n" "********************************************************************************\r\n" - "* ARM-Crypto-Lib - crypto primitives for ARM microcontrolles by Daniel Otte *\r\n" + "* ARM-Crypto-Lib - crypto primitives for ARM microcontrollers by Daniel Otte *\r\n" "********************************************************************************\r\n" "\r\n"); + cli_putstr("Primitive Name: "); cli_putstr(name); cli_putstr("\r\n"); @@ -139,7 +141,7 @@ void nessie_print_header(char* name, for(i=0; i<16+strlen(name); ++i){ cli_putc('='); } - char str[6]; /* must catch numbers up to 65535 + terminatin \0 */ + char str[6]; /* must catch numbers up to 65535 + terminating \0 */ if(keysize_b){ cli_putstr("\r\nKey size: "); ustoa(keysize_b, str, 10); @@ -158,6 +160,7 @@ void nessie_print_header(char* name, cli_putstr(str); cli_putstr(" bits"); } + if(macsize_b){ cli_putstr("\r\nMac size: "); ustoa(macsize_b, str, 10); @@ -167,8 +170,7 @@ void nessie_print_header(char* name, if(ivsize_b){ if(ivsize_b==(uint16_t)-1){ cli_putstr("\r\nNo initial value (IV) mode"); - } - { + }else{ cli_putstr("\r\nIV size: "); ustoa(ivsize_b, str, 10); cli_putstr(str);