*
*/
-#include "config.h"
-
-#include "uart_i.h"
-#include "debug.h"
+#include "main-test-common.h"
#include "cscipher.h"
-#include "nessie_bc_test.h"
-#include "cli.h"
+#include "bcal-nessie.h"
#include "performance_test.h"
#include "bcal-performance.h"
#include "bcal_cscipher.h"
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-
-char* algo_name = "CS-Cipher";
+char *algo_name = "CS-Cipher";
-const bcdesc_t* algolist[] PROGMEM = {
+const bcdesc_t *const algolist[] PROGMEM = {
(bcdesc_t*)&cscipher_desc,
NULL
};
* additional validation-functions *
*****************************************************************************/
-void cscipher_init_dummy(const uint8_t* key, uint16_t keysize_b, void* ctx){
+void cscipher_init_dummy(const uint8_t *key, uint16_t keysize_b, void *ctx){
cscipher_init(key, ctx);
}
void testrun_nessie_cscipher(void){
- nessie_bc_init();
- nessie_bc_ctx.blocksize_B = 8;
- nessie_bc_ctx.keysize_b = 128;
- nessie_bc_ctx.name = algo_name;
- nessie_bc_ctx.ctx_size_B = sizeof(cscipher_ctx_t);
- nessie_bc_ctx.cipher_enc = (nessie_bc_enc_fpt)cscipher_enc;
- nessie_bc_ctx.cipher_dec = (nessie_bc_dec_fpt)cscipher_dec;
- nessie_bc_ctx.cipher_free = (nessie_bc_free_fpt)NULL;
- nessie_bc_ctx.cipher_genctx = (nessie_bc_gen_fpt)cscipher_init_dummy;
-
- nessie_bc_run();
+ bcal_nessie(&cscipher_desc);
}
void testrun_cscipher(void){
const char performance_str[] PROGMEM = "performance";
const char echo_str[] PROGMEM = "echo";
-cmdlist_entry_t cmdlist[] PROGMEM = {
+const cmdlist_entry_t cmdlist[] PROGMEM = {
{ nessie_str, NULL, testrun_nessie_cscipher },
{ test_str, NULL, testrun_cscipher},
{ longtest_str, NULL, testrun_long_cscipher},
};
int main (void){
- DEBUG_INIT();
-
- cli_rx = (cli_rx_fpt)uart0_getc;
- cli_tx = (cli_tx_fpt)uart0_putc;
- 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);
+ main_setup();
+
+ for(;;){
+ welcome_msg(algo_name);
+ cmd_interface(cmdlist);
}
}