some files were not adapted in the previous commit

This commit is contained in:
bg 2012-08-27 01:13:08 +02:00
parent a45c328791
commit cd6cc49401
2 changed files with 8 additions and 33 deletions

View File

@ -166,20 +166,12 @@ const cmdlist_entry_t cmdlist[] PROGMEM = {
};
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*)&echo256_desc;
for(;;){
cli_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
cli_putstr(algo_name);
cli_putstr_P(PSTR("; "));
cli_putstr(__DATE__);
cli_putstr_P(PSTR(" "));
cli_putstr(__TIME__);
cli_putstr_P(PSTR(")\r\nloaded and running\r\n"));
welcome_msg(algo_name);
cmd_interface(cmdlist);
}

View File

@ -21,16 +21,12 @@
*
*/
#include "config.h"
#include "uart_i.h"
#include "debug.h"
#include "main-test-common.h"
#include "skein.h"
#include "hfal_skein256.h"
#include "hfal_skein512.h"
#include "hfal_skein1024.h"
#include "cli.h"
#include "shavs.h"
#include "nessie_hash_test.h"
#include "performance_test.h"
@ -38,11 +34,6 @@
#include "hfal-nessie.h"
#include "hfal-basic.h"
#include <stdint.h>
#include <string.h>
#include <stdlib.h>
char* algo_name = "Skein";
const hfdesc_t* const algolist[] PROGMEM = {
@ -275,21 +266,13 @@ const cmdlist_entry_t cmdlist[] PROGMEM = {
};
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*)&skein256_256_desc;
for(;;){
cli_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
cli_putstr(algo_name);
cli_putstr_P(PSTR("; "));
cli_putstr(__DATE__);
cli_putstr_P(PSTR(" "));
cli_putstr(__TIME__);
cli_putstr_P(PSTR(")\r\nloaded and running\r\n"));
for(;;){
welcome_msg(algo_name);
cmd_interface(cmdlist);
}
}