X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;ds=sidebyside;f=test_src%2Fmain-sha256-test.c;h=44ea153473b4ee59feddddadf4ed585c3a3ebd3c;hb=4b5da1dc27a791b5c448274a3db09cd035b33493;hp=f31656785cb5f6b620d874183283df4299bd08ea;hpb=e1cb3a050dbdb395e9d87f954d754046481b82f7;p=avr-crypto-lib.git

diff --git a/test_src/main-sha256-test.c b/test_src/main-sha256-test.c
index f316567..44ea153 100644
--- a/test_src/main-sha256-test.c
+++ b/test_src/main-sha256-test.c
@@ -1,7 +1,7 @@
 /* main-sha256-test.c */
 /*
     This file is part of the AVR-Crypto-Lib.
-    Copyright (C) 2008  Daniel Otte (daniel.otte@rub.de)
+    Copyright (C) 2006-2015 Daniel Otte (bg@nerilex.org)
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -21,10 +21,8 @@
  *
 */
 
-#include "config.h"
 
-#include "uart_i.h"
-#include "debug.h"
+#include "main-test-common.h"
 
 #include "sha256.h"
 #include "nessie_hash_test.h"
@@ -32,17 +30,14 @@
 #include "hfal-performance.h"
 #include "hfal-nessie.h"
 
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-#include "cli.h"
 #include "shavs.h"
 #include "hfal_sha256.h"
+
 #include "dump.h"
 
-char* algo_name = "SHA-256";
+char *algo_name = "SHA-256";
 
-const hfdesc_t* algolist[] PROGMEM = {
+const hfdesc_t *const algolist[] PROGMEM = {
 	(hfdesc_t*)&sha256_desc,
 	NULL
 };
@@ -88,10 +83,10 @@ void test_monte(void){
      0x38, 0xF0, 0xDF, 0x70, 0x1D, 0xA9, 0x3C, 0x3B,
      0xF2, 0xC9, 0xC8, 0x68, 0x96, 0xE7, 0xE6, 0xC7 };
    uint8_t hash[SHA256_HASH_BYTES];
-   sha256(hash, data1, 3*32*8);
+   sha256((sha256_hash_t*)hash, data1, 3*32*8);
    cli_putstr_P(PSTR("\r\n hash(data1) = "));
    cli_hexdump(hash, 32);
-   sha256(hash, data2, 3*32*8);
+   sha256((sha256_hash_t*)hash, data2, 3*32*8);
    cli_putstr_P(PSTR("\r\n hash(data2) = "));
    cli_hexdump(hash, 32);
 }
@@ -116,7 +111,7 @@ void test_monte2(void){
 	0x39, 0xd8, 0x35, 0xa7, 0x24, 0xe2, 0xfa, 0xe7 };
 
    uint8_t hash[SHA256_HASH_BYTES];
-   sha256(hash, data, 1024);
+   sha256((sha256_hash_t*)hash, data, 1024);
    cli_putstr_P(PSTR("\r\n hash(data) = "));
    cli_hexdump(hash, 32);
 }
@@ -138,33 +133,30 @@ const char shavs_test2_str[] PROGMEM = "shavs_test2";
 const char shavs_test3_str[] PROGMEM = "shavs_test3";
 const char dump_str[]        PROGMEM = "dump";
 
-cmdlist_entry_t cmdlist[] PROGMEM = {
-	{ nessie_str,          NULL, testrun_nessie_sha256},
-	{ test_str,            NULL, testrun_nessie_sha256},
-	{ monte_str,           NULL, test_monte},
-	{ monte2_str,          NULL, test_monte2},
-	{ performance_str,     NULL, testrun_performance_sha256},
-	{ echo_str,        (void*)1, (void_fpt)echo_ctrl},
-	{ shavs_list_str,      NULL, shavs_listalgos},
-	{ shavs_set_str,   (void*)1, (void_fpt)shavs_setalgo},
-	{ shavs_test1_str,     NULL, shavs_test1},
-	{ shavs_test2_str,     NULL, shavs_test2},
-	{ shavs_test3_str,     NULL, shavs_test3},
-	{ dump_str,        (void*)1, (void_fpt)dump},
-	{ NULL,                NULL, NULL}
+const cmdlist_entry_t cmdlist[] PROGMEM = {
+	{ nessie_str,          NULL, testrun_nessie_sha256          },
+	{ test_str,            NULL, testrun_nessie_sha256          },
+	{ monte_str,           NULL, test_monte                     },
+	{ monte2_str,          NULL, test_monte2                    },
+	{ performance_str,     NULL, testrun_performance_sha256     },
+	{ echo_str,        (void*)1, (void_fpt)echo_ctrl            },
+	{ shavs_list_str,      NULL, shavs_listalgos                },
+	{ shavs_set_str,   (void*)1, (void_fpt)shavs_setalgo        },
+	{ shavs_test1_str,     NULL, shavs_test1                    },
+	{ shavs_test2_str,     NULL, shavs_test2                    },
+	{ shavs_test3_str,     NULL, shavs_test3                    },
+	{ dump_str,        (void*)1, (void_fpt)dump                 },
+	{ NULL,                NULL, NULL                           }
 };
 
 int main (void){
-	DEBUG_INIT();
+    main_setup();
 
-	cli_rx = (cli_rx_fpt)uart0_getc;
-	cli_tx = (cli_tx_fpt)uart0_putc;
-	shavs_algolist=(hfdesc_t**)algolist;
+    shavs_algolist=(hfdesc_t**)algolist;
 	shavs_algo=(hfdesc_t*)&sha256_desc;
+
 	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);
+	    welcome_msg(algo_name);
+	    cmd_interface(cmdlist);
 	}
 }