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 f4376dd549e7a09c193a855c2d9b793ac86f453c..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();
@@ -70,25 +68,25 @@ void testrun_nessie_sha1(void){
 
 void sha1_ctx_dump(sha1_ctx_t *s){
        uint8_t i;
-       uart_putstr("\r\n==== sha1_ctx_dump ====");
+       cli_putstr("\r\n==== sha1_ctx_dump ====");
        for(i=0;i<5;++i){
-               uart_putstr("\r\na["); uart_hexdump(&i, 1); uart_putstr("]: ");
-               uart_hexdump(&(s->h[i]), 4);
+               cli_putstr("\r\na["); cli_hexdump(&i, 1); cli_putstr("]: ");
+               cli_hexdump(&(s->h[i]), 4);
        }
-       uart_putstr("\r\nlength"); uart_hexdump(&i, 8);
+       cli_putstr("\r\nlength"); cli_hexdump(&i, 8);
 } 
 
 void testrun_sha1(void){
        sha1_hash_t hash;
        sha1(&hash,"abc",3*8);
-       uart_putstr("\r\nsha1(\"abc\") = \r\n\t");
-       uart_hexdump(hash,SHA1_HASH_BITS/8);
+       cli_putstr("\r\nsha1(\"abc\") = \r\n\t");
+       cli_hexdump(hash,SHA1_HASH_BITS/8);
        
        sha1(&hash,"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",448);
-       uart_putstr("\r\nsha1(\"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq\") = \r\n\t");
-       uart_hexdump(hash,SHA1_HASH_BITS/8);
+       cli_putstr("\r\nsha1(\"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq\") = \r\n\t");
+       cli_hexdump(hash,SHA1_HASH_BITS/8);
        
-       uart_putstr("\r\nsha1(1,000,000 * 'a') = \r\n\t");
+       cli_putstr("\r\nsha1(1,000,000 * 'a') = \r\n\t");
        {
                uint8_t block[SHA1_BLOCK_BITS/8];
                uint16_t i;
@@ -101,10 +99,10 @@ void testrun_sha1(void){
                sha1_lastBlock(&s,block,0);
                sha1_ctx2hash(&hash, &s);
        }
-       uart_hexdump(hash,SHA1_HASH_BITS/8);
+       cli_hexdump(hash,SHA1_HASH_BITS/8);
        
 
-       uart_putstr("\r\nx");
+       cli_putstr("\r\nx");
 }
 
 
@@ -112,54 +110,21 @@ void testrun_sha1_2(void){
        sha1_ctx_t ctx;
        sha1_hash_t hash;
        sha1(&hash,"",0);
-       uart_putstr("\r\nsha1(NULL) = \r\n\t");
-       uart_hexdump(hash,SHA1_HASH_BYTES);
+       cli_putstr("\r\nsha1(NULL) = \r\n\t");
+       cli_hexdump(hash,SHA1_HASH_BYTES);
 
        memset(hash, 0, SHA1_HASH_BYTES);
 
        sha1_init(&ctx);
        sha1_lastBlock(&ctx, "", 0);
        sha1_ctx2hash(&hash, &ctx); 
-       uart_putstr("\r\nsha1(NULL) = \r\n\t");
-       uart_hexdump(hash,SHA1_HASH_BYTES);
+       cli_putstr("\r\nsha1(NULL) = \r\n\t");
+       cli_hexdump(hash,SHA1_HASH_BYTES);
 }
 
 
 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();
-       uart_putstr_P(PSTR("\r\n\tctx-gen time: "));
-       ultoa((unsigned long)t, str, 10);
-       uart_putstr(str);
-       
-       
-       startTimer(1);
-       sha1_nextBlock(&ctx, data);
-       t = stopTimer();
-       uart_putstr_P(PSTR("\r\n\tone-block time: "));
-       ultoa((unsigned long)t, str, 10);
-       uart_putstr(str);
-       
-       
-       startTimer(1);
-       sha1_lastBlock(&ctx, data, 0);
-       t = stopTimer();
-       uart_putstr_P(PSTR("\r\n\tlast block time: "));
-       ultoa((unsigned long)t, str, 10);
-       uart_putstr(str);
-       
-       uart_putstr_P(PSTR("\r\n"));
+       hfal_performance_multiple(algolist);
 }
 
 
@@ -191,22 +156,17 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
        { NULL,                NULL, NULL}
 };
 
-const hfdesc_t* algolist[] PROGMEM = {
-       (hfdesc_t*)&sha1_desc,
-       NULL
-};
-
 int main (void){
        DEBUG_INIT();
-       uart_putstr("\r\n");
-       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(;;){
-               uart_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
-               uart_putstr(algo_name);
-               uart_putstr_P(PSTR(")\r\nloaded and running\r\n"));
+               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);
        }
 }