backporting uart_i and cli

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

diff --git a/test_src/main-sha1-test.c b/test_src/main-sha1-test.c
index 68534431ffb5d0144bd1c2abf158baaa3b04782a..311bb055b39f5c9a8f55d4c275ddd5c2fd19f23f 100644 (file)
--- a/test_src/main-sha1-test.c
+++ b/test_src/main-sha1-test.c
@@ -23,12 +23,13 @@
 
 #include "config.h"
 #include "serial-tools.h"
-#include "uart.h"
+#include "uart_i.h"
 #include "debug.h"
 
 #include "sha1.h"
 #include "nessie_hash_test.h"
-#include "performance_test.h"
+#include "hfal_sha1.h"
+#include "hfal-performance.h"
 
 #include <stdint.h>
 #include <string.h>
@@ -40,16 +41,13 @@
 
 char* algo_name = "SHA-1";
 
+const hfdesc_t* algolist[] PROGMEM = {
+       (hfdesc_t*)&sha1_desc,
+       NULL
+};
 /*****************************************************************************
  *  additional validation-functions                                                                                     *
  *****************************************************************************/
-void sha1_next_dummy(void* buffer, void* ctx){
-       sha1_nextBlock(ctx, buffer);
-}
-
-void sha1_last_dummy(void* buffer, uint16_t size_b, void* ctx){
-       sha1_lastBlock(ctx, buffer, size_b);
-}
 
 void testrun_nessie_sha1(void){
        nessie_hash_ctx.hashsize_b  = 160;
@@ -57,8 +55,8 @@ void testrun_nessie_sha1(void){
        nessie_hash_ctx.ctx_size_B  = sizeof(sha1_ctx_t);
        nessie_hash_ctx.name = algo_name;
        nessie_hash_ctx.hash_init = (nessie_hash_init_fpt)sha1_init;
-       nessie_hash_ctx.hash_next = (nessie_hash_next_fpt)sha1_next_dummy;
-       nessie_hash_ctx.hash_last = (nessie_hash_last_fpt)sha1_last_dummy;
+       nessie_hash_ctx.hash_next = (nessie_hash_next_fpt)sha1_nextBlock;
+       nessie_hash_ctx.hash_last = (nessie_hash_last_fpt)sha1_lastBlock;
        nessie_hash_ctx.hash_conv = (nessie_hash_conv_fpt)sha1_ctx2hash;
        
        nessie_hash_run();
@@ -126,40 +124,7 @@ void testrun_sha1_2(void){
 
 
 void testrun_performance_sha1(void){
-       uint64_t t;
-       char str[16];
-       uint8_t data[32];
-       sha1_ctx_t ctx;
-       
-       calibrateTimer();
-       print_overhead();
-       
-       memset(data, 0, 32);
-       
-       startTimer(1);
-       sha1_init(&ctx);
-       t = stopTimer();
-       cli_putstr_P(PSTR("\r\n\tctx-gen time: "));
-       ultoa((unsigned long)t, str, 10);
-       cli_putstr(str);
-       
-       
-       startTimer(1);
-       sha1_nextBlock(&ctx, data);
-       t = stopTimer();
-       cli_putstr_P(PSTR("\r\n\tone-block time: "));
-       ultoa((unsigned long)t, str, 10);
-       cli_putstr(str);
-       
-       
-       startTimer(1);
-       sha1_lastBlock(&ctx, data, 0);
-       t = stopTimer();
-       cli_putstr_P(PSTR("\r\n\tlast block time: "));
-       ultoa((unsigned long)t, str, 10);
-       cli_putstr(str);
-       
-       cli_putstr_P(PSTR("\r\n"));
+       hfal_performance_multiple(algolist);
 }
 
 
@@ -191,16 +156,11 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
        { NULL,                NULL, NULL}
 };
 
-const hfdesc_t* algolist[] PROGMEM = {
-       (hfdesc_t*)&sha1_desc,
-       NULL
-};
-
 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;         
        shavs_algolist=(hfdesc_t**)algolist;
        shavs_algo=(hfdesc_t*)&sha1_desc;       
        for(;;){