X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fnessie_mac_test.c;h=90704872c071af80da120d2a18931e380ee3d543;hb=170835f03e35ac53d7930d42590ad525e763999c;hp=90e33de553d9ffcb14e3c2c551ee7d2485ef3f39;hpb=e5a49deb52521f019e37779d6e9d81ec4f02aba4;p=avr-crypto-lib.git

diff --git a/test_src/nessie_mac_test.c b/test_src/nessie_mac_test.c
index 90e33de..9070487 100644
--- a/test_src/nessie_mac_test.c
+++ b/test_src/nessie_mac_test.c
@@ -27,6 +27,7 @@
  * */
 #include <stdint.h>
 #include <string.h>
+#include <stdlib.h>
 #include "nessie_mac_test.h"
 #include "nessie_common.h"
 #include "uart.h"
@@ -48,14 +49,14 @@ void ascii_mac(char* data, char* desc, uint8_t* key){
 	NESSIE_PUTSTR_P(PSTR("\r\n                       message="));
 	NESSIE_PUTSTR(desc);
 	PRINTKEY;
-	nessie_mac_ctx.mac_init(key, nessie_mac_ctx.keysize_b, ctx);
+	nessie_mac_ctx.mac_init(ctx, key, nessie_mac_ctx.keysize_b);
 	sl = strlen(data);
 	while(sl>nessie_mac_ctx.blocksize_B){
-		nessie_mac_ctx.mac_next(data, ctx);
+		nessie_mac_ctx.mac_next(ctx, data);
 		data += nessie_mac_ctx.blocksize_B;
 		sl   -= nessie_mac_ctx.blocksize_B;
 	}
-	nessie_mac_ctx.mac_last(data, sl*8, key, nessie_mac_ctx.keysize_b, ctx);
+	nessie_mac_ctx.mac_last(ctx, data, sl*8);
 	nessie_mac_ctx.mac_conv(mac, ctx);
 	PRINTMAC;
 }
@@ -75,13 +76,13 @@ void amillion_mac(uint8_t* key){
 	PRINTKEY;
 	
 	memset(block, 'a', nessie_mac_ctx.blocksize_B);
-	nessie_mac_ctx.mac_init(key, nessie_mac_ctx.keysize_b, ctx);
-	while(n>nessie_mac_ctx.blocksize_B){
-		nessie_mac_ctx.mac_next(block, ctx);
+	nessie_mac_ctx.mac_init(ctx, key, nessie_mac_ctx.keysize_b);
+	while(n>=nessie_mac_ctx.blocksize_B){
+		nessie_mac_ctx.mac_next(ctx, block);
 		n    -= nessie_mac_ctx.blocksize_B;
 		NESSIE_SEND_ALIVE_A(i++);
 	}
-	nessie_mac_ctx.mac_last(block, n*8, key, nessie_mac_ctx.keysize_b, ctx);
+	nessie_mac_ctx.mac_last(ctx, block, n*8);
 	nessie_mac_ctx.mac_conv(mac, ctx);
 	PRINTMAC;
 }
@@ -107,12 +108,12 @@ void zero_mac(uint16_t n, uint8_t* key){
 	PRINTKEY;
 	
 	memset(block, 0, nessie_mac_ctx.blocksize_B); 
-	nessie_mac_ctx.mac_init(key, nessie_mac_ctx.keysize_b,ctx);;
+	nessie_mac_ctx.mac_init(ctx, key, nessie_mac_ctx.keysize_b);
 	while(n>nessie_mac_ctx.blocksize_B*8){
-		nessie_mac_ctx.mac_next(block, ctx);
+		nessie_mac_ctx.mac_next(ctx, block);
 		n   -= nessie_mac_ctx.blocksize_B*8;
 	}
-	nessie_mac_ctx.mac_last(block, n, key, nessie_mac_ctx.keysize_b, ctx);
+	nessie_mac_ctx.mac_last(ctx, block, n);
 	nessie_mac_ctx.mac_conv(mac, ctx);
 	PRINTMAC;
 }
@@ -152,42 +153,54 @@ void one_in512_mac(uint16_t pos, uint8_t* key){
 	block[pos>>3] = 0x80>>(pos&0x7);
 	uint8_t* bp;
 	bp = block;
-	nessie_mac_ctx.mac_init(key, nessie_mac_ctx.keysize_b, ctx);
+	nessie_mac_ctx.mac_init(ctx, key, nessie_mac_ctx.keysize_b);
 	while(n>nessie_mac_ctx.blocksize_B*8){
-		nessie_mac_ctx.mac_next(bp, ctx);
+		nessie_mac_ctx.mac_next(ctx, bp);
 		n   -= nessie_mac_ctx.blocksize_B*8;
 		bp  += nessie_mac_ctx.blocksize_B;
 	}
-	nessie_mac_ctx.mac_last(bp, n, key, nessie_mac_ctx.keysize_b, ctx);
+	nessie_mac_ctx.mac_last(ctx, bp, n);
 	nessie_mac_ctx.mac_conv(mac, ctx);
 	PRINTMAC;
 }
 
 static
-void tv4_mac(uint8_t* key){
+void tv4_mac(void){
 	uint8_t ctx[nessie_mac_ctx.ctx_size_B];
 	uint8_t mac[MACSIZE_B];
-	uint8_t block[256/8];
-	uint16_t n=256;
+	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="));
-	NESSIE_PUTSTR(PSTR("256 zero bits"));
-	memset(block, 0, 256/8);
-	
-	nessie_mac_ctx.mac_init(key, nessie_mac_ctx.keysize_b, ctx);;
+	utoa(MACSIZE_B*8, str, 10);
+	NESSIE_PUTSTR(str);
+	NESSIE_PUTSTR_P(PSTR(" zero bits"));
+	memset(block, 0, MACSIZE_B);
+	for(i=0; i<KEYSIZE_B; ++i)
+		key[i] = core_key[i%(3*8)];
+	nessie_print_item("key", key, KEYSIZE_B);
+	nessie_mac_ctx.mac_init(ctx, key, nessie_mac_ctx.keysize_b);
 	while(n>nessie_mac_ctx.blocksize_B*8){
-		nessie_mac_ctx.mac_next(block, ctx);
+		nessie_mac_ctx.mac_next(ctx, block);
 		n    -= nessie_mac_ctx.blocksize_B*8;
 	}
-	nessie_mac_ctx.mac_last(block, n, key, nessie_mac_ctx.keysize_b, ctx);
+	nessie_mac_ctx.mac_last(ctx, block, n);
 	nessie_mac_ctx.mac_conv(mac, ctx);
 	PRINTMAC;
 	for(i=1; i<100000L; ++i){ /* this assumes BLOCKSIZE >= HASHSIZE */
-		nessie_mac_ctx.mac_init(key, nessie_mac_ctx.keysize_b, ctx);;
-		nessie_mac_ctx.mac_last(mac, nessie_mac_ctx.macsize_b, key, nessie_mac_ctx.keysize_b, ctx);
+		nessie_mac_ctx.mac_init(ctx, key, nessie_mac_ctx.keysize_b);
+		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);
 }
@@ -265,8 +278,10 @@ void nessie_mac_run(void){
 	nessie_print_setheader(set);
 	/* we use the same key as above */
 	nessie_print_set_vector(set, 0);
-	tv4_mac(key);
+	tv4_mac();
 	/* test set 5 */
+	set=5;
+	nessie_print_setheader(set);
 	for(i=0; i<nessie_mac_ctx.keysize_b; ++i){
 		nessie_print_set_vector(set, i);
 		memset(key, 0, KEYSIZE_B);