X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fnessie_common.c;h=8798dd2b51735464cfcdcaf60db1b609516b593f;hb=6cddae4d0fa8acf9d3bfd5e0f42c789c32f3a992;hp=6d66a1ceafe7394a89da79fd8fc9e7024c36cfab;hpb=e5a49deb52521f019e37779d6e9d81ec4f02aba4;p=avr-crypto-lib.git

diff --git a/test_src/nessie_common.c b/test_src/nessie_common.c
index 6d66a1c..8798dd2 100644
--- a/test_src/nessie_common.c
+++ b/test_src/nessie_common.c
@@ -31,7 +31,7 @@
 #include <avr/pgmspace.h>
 #include <stdlib.h> /* utoa() */
 #include "nessie_common.h"
-
+#include "hexdigit_tab.h"
 
 #ifdef NESSIE_ALIVE
 void nessie_send_alive(void){
@@ -39,20 +39,16 @@ void nessie_send_alive(void){
 }
 
 void nessie_send_alive_a(uint16_t i){
-	if((i&63)==63)
+	if((i&31)==0)
 		NESSIE_PUTC(NESSIE_ALIVE_CHAR);
 }
 #endif
 
 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'};
 	uint16_t i;
 	for(i=0; i<(blocksize_bit+7)/8; ++i){
-		NESSIE_PUTC(tab[(block[i])>>4]);
-		NESSIE_PUTC(tab[(block[i])&0xf]);
+		NESSIE_PUTC(pgm_read_byte(hexdigit_tab_uc_P+((block[i])>>4)));
+		NESSIE_PUTC(pgm_read_byte(hexdigit_tab_uc_P+((block[i])&0xf)));
 	}				   
 }
 
@@ -136,7 +132,7 @@ void nessie_print_header(char* name,
 	uint16_t i;
 	NESSIE_PUTSTR_P(PSTR("\r\n\r\n"
 	"********************************************************************************\r\n"
-	"* micro-crypt - crypto primitives for microcontrolles by Daniel Otte           *\r\n"
+	"* AVR-Crypto-Lib - crypto primitives for AVR microcontrolles by Daniel Otte    *\r\n"
 	"********************************************************************************\r\n"
 	"\r\n"));
 	NESSIE_PUTSTR_P(PSTR("Primitive Name: "));
@@ -174,8 +170,7 @@ void nessie_print_header(char* name,
 	if(ivsize_b){
 		if(ivsize_b==(uint16_t)-1){
 			NESSIE_PUTSTR_P(PSTR("\r\nNo initial value (IV) mode"));
-		}
-		{
+		}else{
 			NESSIE_PUTSTR_P(PSTR("\r\nIV size: "));
 			utoa(ivsize_b, str, 10);
 			NESSIE_PUTSTR(str);