X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-hmac-sha1-test.c;h=33c06006bae780e4aee2abc6e69b621ca612e899;hb=27e7d731ffb22116dba8c67cead51829d8ebe137;hp=f84cfdf95cabfb76c22ab1088fc6f0c118afb704;hpb=83d0614d8b17eac97f891f7de2bb3ef265751dea;p=avr-crypto-lib.git

diff --git a/test_src/main-hmac-sha1-test.c b/test_src/main-hmac-sha1-test.c
index f84cfdf..33c0600 100644
--- a/test_src/main-hmac-sha1-test.c
+++ b/test_src/main-hmac-sha1-test.c
@@ -23,7 +23,7 @@
 
 #include "config.h"
 #include "serial-tools.h"
-#include "uart.h"
+#include "uart_i.h"
 #include "debug.h"
 
 #include "sha1.h"
@@ -40,35 +40,22 @@ char* algo_name = "HMAC-SHA1";
 /*****************************************************************************
  *  additional validation-functions											 *
  *****************************************************************************/
-void hmacsha1_next_dummy(void* buffer, void* ctx){
-	sha1_nextBlock(ctx, buffer);
-}
-
-void hmacsha1_init_dummy(void* key, uint16_t keysize_b, void* ctx){
-	hmac_sha1_init(ctx, key, keysize_b);
-}
-
-void hmacsha1_last_dummy(void* buffer, uint16_t size_b, void* key, uint16_t keysize_b, void* ctx){
-	sha1_lastBlock(ctx, buffer, size_b);
-	hmac_sha1_final(ctx, key, keysize_b);
-}
 
 void testrun_nessie_hmacsha1(void){
-	nessie_mac_ctx.macsize_b   = 160;
-	nessie_mac_ctx.keysize_b   = 512;
-	nessie_mac_ctx.blocksize_B = 512/8;
+	nessie_mac_ctx.macsize_b   = HMAC_SHA1_BITS;
+	nessie_mac_ctx.keysize_b   = HMAC_SHA1_BLOCK_BITS;
+	nessie_mac_ctx.blocksize_B = HMAC_SHA1_BLOCK_BYTES;
 	nessie_mac_ctx.ctx_size_B  = sizeof(hmac_sha1_ctx_t);
 	nessie_mac_ctx.name = algo_name;
-	nessie_mac_ctx.mac_init = (nessie_mac_init_fpt)hmacsha1_init_dummy;
-	nessie_mac_ctx.mac_next = (nessie_mac_next_fpt)hmacsha1_next_dummy;
-	nessie_mac_ctx.mac_last = (nessie_mac_last_fpt)hmacsha1_last_dummy;
-	nessie_mac_ctx.mac_conv = (nessie_mac_conv_fpt)sha1_ctx2hash;
+	nessie_mac_ctx.mac_init = (nessie_mac_init_fpt)hmac_sha1_init;
+	nessie_mac_ctx.mac_next = (nessie_mac_next_fpt)hmac_sha1_nextBlock;
+	nessie_mac_ctx.mac_last = (nessie_mac_last_fpt)hmac_sha1_lastBlock;
+	nessie_mac_ctx.mac_conv = (nessie_mac_conv_fpt)hmac_sha1_final;
 	
 	nessie_mac_run();
 }
 
 
-
 /*****************************************************************************
  *  main																	 *
  *****************************************************************************/
@@ -89,8 +76,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);