*
*/
-#include "config.h"
-#include "uart_i.h"
-#include "debug.h"
+#include "main-test-common.h"
#include "twister-small.h"
#include "twister-large.h"
#include "nessie_hash_test.h"
#include "performance_test.h"
-#include "hfal/hfal_twister224.h"
-#include "hfal/hfal_twister256.h"
-#include "hfal/hfal_twister384.h"
-#include "hfal/hfal_twister512.h"
-#include "hfal/hfal-nessie.h"
-#include "hfal/hfal-performance.h"
-#include "hfal/hfal-test.h"
+#include "hfal_twister224.h"
+#include "hfal_twister256.h"
+#include "hfal_twister384.h"
+#include "hfal_twister512.h"
+#include "hfal-nessie.h"
+#include "hfal-performance.h"
+#include "hfal-test.h"
#include "shavs.h"
-
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-#include "cli.h"
-
char* algo_name = "TWISTER";
-const hfdesc_t* algolist[] PROGMEM = {
+const hfdesc_t* const algolist[] PROGMEM = {
(hfdesc_t*)&twister224_desc,
(hfdesc_t*)&twister256_desc,
(hfdesc_t*)&twister384_desc,
const char shavs_set_str[] PROGMEM = "shavs_set";
const char shavs_test1_str[] PROGMEM = "shavs_test1";
-cmdlist_entry_t cmdlist[] PROGMEM = {
+const cmdlist_entry_t cmdlist[] PROGMEM = {
{ nessie_str, NULL, testrun_nessie_twister},
{ test_str, NULL, testrun_twister},
{ performance_str, NULL, testrun_performance_twister},
};
int main (void){
- DEBUG_INIT();
-
- cli_rx = (cli_rx_fpt)uart0_getc;
- cli_tx = (cli_tx_fpt)uart0_putc;
- shavs_algolist=(hfdesc_t**)algolist;
+ main_setup();
+
+ shavs_algolist=(hfdesc_t**)algolist;
shavs_algo=(hfdesc_t*)&twister256_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);
}
}