clean up

[avr-crypto-lib.git] / test_src / main-hmac-sha1-test.c

diff --git a/test_src/main-hmac-sha1-test.c b/test_src/main-hmac-sha1-test.c
index 4e248558de09784c49fbf82c1b84ad54e52ea441..2dc9fcc4ce259971e637d0c8967971bf4d4da2fc 100644 (file)
--- a/test_src/main-hmac-sha1-test.c
+++ b/test_src/main-hmac-sha1-test.c
@@ -1,6 +1,6 @@
 /* main-hmac-sha1-test.c */
 /*
-    This file is part of the This file is part of the AVR-Crypto-Lib.
+    This file is part of the AVR-Crypto-Lib.
     Copyright (C) 2008  Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
@@ -22,11 +22,11 @@
 */
 
 #include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
+
+#include "uart_i.h"
 #include "debug.h"
 
-#include "sha1.h"
+#include "sha1/sha1.h"
 #include "hmac-sha1.h"
 
 #include "nessie_mac_test.h"
@@ -40,61 +40,48 @@ 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                                                                                                                                        *
  *****************************************************************************/
 
+const char nessie_str[]      PROGMEM = "nessie";
+const char test_str[]        PROGMEM = "test";
+/* const char performance_str[] PROGMEM = "performance"; */
+const char echo_str[]        PROGMEM = "echo";
+
+cmdlist_entry_t cmdlist[] PROGMEM = {
+       { nessie_str,      NULL, testrun_nessie_hmacsha1},
+       { test_str,        NULL, testrun_nessie_hmacsha1},
+/*     { performance_str, NULL, testrun_performance_hmacsha1}, */
+       { 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_hmacsha1, testrun_nessie_hmacsha1};
-
-       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");
-       }
-       
        
+       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);
+               cli_putstr_P(PSTR(")\r\nloaded and running\r\n"));
+               cmd_interface(cmdlist);
+       }
 }
-