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=2813a51b036dd99a1085e8affbb0dc47ca63308b;hb=4b5da1dc27a791b5c448274a3db09cd035b33493;hpb=701cee0d98aab48dd3192c8cc7c77eb42581bc56

diff --git a/test_src/nessie_mac_test.c b/test_src/nessie_mac_test.c
index 2813a51..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,6 +28,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <avr/pgmspace.h>
 #include "nessie_mac_test.h"
 #include "nessie_common.h"
@@ -49,14 +50,14 @@ const uint8_t keyproto[] PROGMEM = {
                           0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef };
 
 static
-void ascii_mac_P(PGM_P data, PGM_P 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_P(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_P(data);
@@ -75,15 +76,15 @@ void ascii_mac_P(PGM_P data, PGM_P 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);
@@ -100,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); 
@@ -130,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){
@@ -183,12 +161,10 @@ void tv4_mac(void){
 	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; i<KEYSIZE_B; ++i)
 		key[i] = pgm_read_byte(&(keyproto[i%(3*8)]));
@@ -218,7 +194,7 @@ void nessie_mac_run(void){
 	nessie_print_header(nessie_mac_ctx.name, nessie_mac_ctx.keysize_b, 0, 0,
 	                    nessie_mac_ctx.macsize_b, 0);
 	/* test set 1 */
-	const char* challange_dbz= PSTR(
+	const char *challange_dbz= PSTR(
 		  "\0"
 		"\"\" (empty string)\0"
 		  "a\0"