X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-hmac-sha256-test.c;h=b6ca3fab23057b8e42335389332580c6e0b649f9;hb=b022a029def51d63f330c12bf07156db294c8958;hp=66aafe6901e197904c1baacbefa442cb2e173683;hpb=83d0614d8b17eac97f891f7de2bb3ef265751dea;p=avr-crypto-lib.git

diff --git a/test_src/main-hmac-sha256-test.c b/test_src/main-hmac-sha256-test.c
index 66aafe6..b6ca3fa 100644
--- a/test_src/main-hmac-sha256-test.c
+++ b/test_src/main-hmac-sha256-test.c
@@ -22,8 +22,8 @@
 */
 
 #include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
+
+#include "uart_i.h"
 #include "debug.h"
 
 #include "sha256.h"
@@ -40,29 +40,34 @@ 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();
 }
@@ -80,7 +85,7 @@ const char echo_str[]        PROGMEM = "echo";
 
 cmdlist_entry_t cmdlist[] PROGMEM = {
 	{ nessie_str,      NULL, testrun_nessie_hmacsha256},
-	{ test_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}
@@ -89,8 +94,8 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
 int main (void){
 	DEBUG_INIT();
 	
-	cli_rx = uart_getc;
-	cli_tx = uart_putc;	 	
+	cli_rx = (cli_rx_fpt)uart0_getc;
+	cli_tx = (cli_tx_fpt)uart0_putc;	 	
 	for(;;){
 		cli_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
 		cli_putstr(algo_name);