*
*/
-#include "config.h"
-#include "uart_i.h"
-#include "debug.h"
+#include "main-test-common.h"
#include "keccak.h"
-#include "cli.h"
#include "hfal_keccak.h"
#include "shavs.h"
#include "nessie_hash_test.h"
#include "hfal-performance.h"
#include "hfal-test.h"
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-
char* algo_name = "Keccak";
-const hfdesc_t* algolist[] PROGMEM = {
+const hfdesc_t* const algolist[] PROGMEM = {
(hfdesc_t*)&keccak224_desc,
(hfdesc_t*)&keccak256_desc,
(hfdesc_t*)&keccak384_desc,
* additional validation-functions *
*****************************************************************************/
void test_256(void){
- uint8_t data[] = {0x53, 0x58, 0x7B, 0xC8 };
uint8_t hash[32];
uint8_t null[KECCAK256_BLOCKSIZE_B];
memset(null, 0, KECCAK256_BLOCKSIZE_B);
keccak_ctx_t ctx;
keccak256_init(&ctx);
- keccak_lastBlock(&ctx, data, 29);
+ keccak_nextBlock(&ctx, null);
+ keccak_lastBlock(&ctx, null, 29);
keccak256_ctx2hash(hash, &ctx);
cli_putstr_P(PSTR("\r\n testhash: "));
cli_hexdump(hash, 32);
const char shavs_test1_str[] PROGMEM = "shavs_test1";
const char shavs_test3_str[] PROGMEM = "shavs_test3";
-cmdlist_entry_t cmdlist[] PROGMEM = {
+const cmdlist_entry_t cmdlist[] PROGMEM = {
{ nessie_str, NULL, testrun_nessie_keccak },
{ performance_str, NULL, performance_keccak },
{ test256_str, NULL, test_256 },
{ NULL, NULL, NULL }
};
-int main (void){
- DEBUG_INIT();
+int main(void){
+ 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*)&keccak256_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"));
-
- cmd_interface(cmdlist);
+ welcome_msg(algo_name);
+ cmd_interface(cmdlist);
}
}