X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=blobdiff_plain;f=test_src%2Fmain-hmac-sha256-test.c;h=711facbcc8c41e17cd53ddbcd6272585e02b297b;hp=7b552374db8ad55816e6345276da50e15f3bdd24;hb=4b5da1dc27a791b5c448274a3db09cd035b33493;hpb=cf1c79ef3fa4bb22f0cab28b2b6e958293aca739

diff --git a/test_src/main-hmac-sha256-test.c b/test_src/main-hmac-sha256-test.c
index 7b55237..711facb 100644
--- a/test_src/main-hmac-sha256-test.c
+++ b/test_src/main-hmac-sha256-test.c
@@ -1,7 +1,7 @@
 /* main-hmac-sha256-test.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
@@ -21,48 +21,46 @@
  * 
 */
 
-#include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
-#include "debug.h"
+#include "main-test-common.h"
 
 #include "sha256.h"
 #include "hmac-sha256.h"
 
-#include "cli.h"
 #include "nessie_mac_test.h"
 
-#include <stdint.h>
-#include <string.h>
-
-char* algo_name = "HMAC-SHA256";
+char *algo_name = "HMAC-SHA256";
 
 /*****************************************************************************
  *  additional validation-functions											 *
  *****************************************************************************/
-void hmacsha256_next_dummy(void* buffer, void* ctx){
-	sha256_nextBlock(ctx, buffer);
-}
 
-void hmacsha256_init_dummy(void* key, uint16_t keysize_b, void* ctx){
-	hmac_sha256_init(ctx, key, keysize_b);
-}
-
-void hmacsha256_last_dummy(void* buffer, uint16_t size_b, void* key, uint16_t keysize_b, void* ctx){
-	sha256_lastBlock(ctx, buffer, size_b);
-	hmac_sha256_final(ctx, key, keysize_b);
+void testrun_hmacsha256(void){
+	uint8_t 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, 
+					  0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
+                      0x88, 0x99, 0xAA, 0xBB, 0xCC, 0xDD, 0xEE, 0xFF, 
+					  0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF,
+                      0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 
+					  0x88, 0x99, 0xAA, 0xBB, 0xCC, 0xDD, 0xEE, 0xFF };
+	uint8_t msg[] = { 0x00 };
+	uint8_t mac[HMAC_SHA256_BYTES];
+	hmac_sha256(mac, key, 512, msg, 0);
+	cli_putstr_P(PSTR("\r\n quick hmac = "));
+	cli_hexdump(mac, HMAC_SHA256_BYTES);
+	cli_putstr_P(PSTR("\r\n"));
 }
 
 void testrun_nessie_hmacsha256(void){
-	nessie_mac_ctx.macsize_b   = 256;
-	nessie_mac_ctx.keysize_b   = 512;
-	nessie_mac_ctx.blocksize_B = 512/8;
+	nessie_mac_ctx.macsize_b   = HMAC_SHA256_BITS;
+	nessie_mac_ctx.keysize_b   = HMAC_SHA256_BLOCK_BITS;
+	nessie_mac_ctx.blocksize_B = HMAC_SHA256_BLOCK_BYTES;
 	nessie_mac_ctx.ctx_size_B  = sizeof(hmac_sha256_ctx_t);
 	nessie_mac_ctx.name = algo_name;
-	nessie_mac_ctx.mac_init = (nessie_mac_init_fpt)hmacsha256_init_dummy;
-	nessie_mac_ctx.mac_next = (nessie_mac_next_fpt)hmacsha256_next_dummy;
-	nessie_mac_ctx.mac_last = (nessie_mac_last_fpt)hmacsha256_last_dummy;
-	nessie_mac_ctx.mac_conv = (nessie_mac_conv_fpt)sha256_ctx2hash;
+	nessie_mac_ctx.mac_init = (nessie_mac_init_fpt)hmac_sha256_init;
+	nessie_mac_ctx.mac_next = (nessie_mac_next_fpt)hmac_sha256_nextBlock;
+	nessie_mac_ctx.mac_last = (nessie_mac_last_fpt)hmac_sha256_lastBlock;
+	nessie_mac_ctx.mac_conv = (nessie_mac_conv_fpt)hmac_sha256_final;
 	
 	nessie_mac_run();
 }
@@ -73,27 +71,24 @@ void testrun_nessie_hmacsha256(void){
  *  main																	 *
  *****************************************************************************/
 
+const char nessie_str[]      PROGMEM = "nessie";
+const char test_str[]        PROGMEM = "test";
+/* const char performance_str[] PROGMEM = "performance"; */
+const char echo_str[]        PROGMEM = "echo";
+
+const cmdlist_entry_t cmdlist[] PROGMEM = {
+	{ nessie_str,      NULL, testrun_nessie_hmacsha256},
+	{ test_str,        NULL, testrun_hmacsha256},
+/*	{ performance_str, NULL, testrun_performance_hmacsha256}, */
+	{ echo_str,    (void*)1, (void_fpt)echo_ctrl},
+	{ NULL,            NULL, NULL}
+};
+
 int main (void){
-	char  str[20];
-	DEBUG_INIT();
-	uart_putstr("\r\n");
-
-	uart_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
-	uart_putstr(algo_name);
-	uart_putstr_P(PSTR(")\r\nloaded and running\r\n"));
-
-	PGM_P    u   = PSTR("nessie\0test\0");
-	void_fpt v[] = {testrun_nessie_hmacsha256, testrun_nessie_hmacsha256};
-
-	while(1){ 
-		if (!getnextwordn(str,20)){DEBUG_S("DBG: W1\r\n"); goto error;}
-		if(execcommand_d0_P(str, u, v)<0){
-			uart_putstr_P(PSTR("\r\nunknown command\r\n"));
-		}
-		continue;
-	error:
-		uart_putstr("ERROR\r\n");
+    main_setup();
+
+    for(;;){
+        welcome_msg(algo_name);
+        cmd_interface(cmdlist);
 	}
-	
 }
-