]> git.cryptolib.org Git - avr-crypto-lib.git/blobdiff - test_src/main-threefish-test.c
fixing E-Mail-Address & Copyright
[avr-crypto-lib.git] / test_src / main-threefish-test.c
index 7d05eb8decb211640a9edb14af0de7c33f5fe43c..af8544655f3ebea561f0d9221303d19f896ddada 100644 (file)
@@ -1,7 +1,7 @@
 /* main-threefish-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
  * 
 */
 
-#include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
-#include "debug.h"
+
+#include "main-test-common.h"
 
 #include "threefish.h"
-#include "nessie_bc_test.h"
-#include "cli.h"
 #include "performance_test.h"
-
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-
-char* algo_name = "Threefish";
-
+#include "bcal-performance.h"
+#include "bcal-nessie.h"
+#include "bcal_threefish256.h"
+#include "bcal_threefish512.h"
+#include "bcal_threefish1024.h"
+
+char *algo_name = "Threefish";
+
+const bcdesc_t *const algolist[] PROGMEM = {
+       (bcdesc_t*)&threefish256_desc,
+       (bcdesc_t*)&threefish512_desc,
+       (bcdesc_t*)&threefish1024_desc,
+       NULL
+};
 /*****************************************************************************
  *  additional validation-functions                                                                                     *
  *****************************************************************************/
 
-void threefish256_dump(threefish256_ctx_tctx){
+void threefish256_dump(threefish256_ctx_t *ctx){
        uint8_t i;
        cli_putstr_P(PSTR("\r\n=== ctx dump (256) === \r\n k: "));
        for(i=0; i<5; ++i){
@@ -55,61 +58,8 @@ void threefish256_dump(threefish256_ctx_t* ctx){
        }
 }
 
-void threefish256_dummy_init(const uint8_t* key, uint16_t keysize_b, void* ctx){
-       threefish256_init(key, NULL, ctx);
-}
-
-void testrun_nessie_threefish256(void){
-       nessie_bc_ctx.keysize_b = 256;
-       nessie_bc_ctx.blocksize_B = 32;
-       nessie_bc_ctx.ctx_size_B = sizeof(threefish256_ctx_t);
-       nessie_bc_ctx.name = "Threefish256";
-       nessie_bc_ctx.cipher_genctx = threefish256_dummy_init;
-       nessie_bc_ctx.cipher_enc = (nessie_bc_enc_fpt)threefish256_enc;
-       nessie_bc_ctx.cipher_dec = (nessie_bc_dec_fpt)threefish256_dec;
-       nessie_bc_ctx.cipher_free = NULL;
-       
-       nessie_bc_run();
-}
-
-void threefish512_dummy_init(const uint8_t* key, uint16_t keysize_b, void* ctx){
-       threefish512_init(key, NULL, ctx);
-}
-
-void testrun_nessie_threefish512(void){
-       nessie_bc_ctx.keysize_b = 512;
-       nessie_bc_ctx.blocksize_B = 64;
-       nessie_bc_ctx.ctx_size_B = sizeof(threefish512_ctx_t);
-       nessie_bc_ctx.name = "Threefish512";
-       nessie_bc_ctx.cipher_genctx = threefish512_dummy_init;
-       nessie_bc_ctx.cipher_enc = (nessie_bc_enc_fpt)threefish512_enc;
-       nessie_bc_ctx.cipher_dec = (nessie_bc_dec_fpt)threefish512_dec;
-       nessie_bc_ctx.cipher_free = NULL;
-       
-       nessie_bc_run();
-}
-
-void threefish1024_dummy_init(const uint8_t* key, uint16_t keysize_b, void* ctx){
-       threefish1024_init(key, NULL, ctx);
-}
-
-void testrun_nessie_threefish1024(void){
-       nessie_bc_ctx.keysize_b = 1024;
-       nessie_bc_ctx.blocksize_B = 128;
-       nessie_bc_ctx.ctx_size_B = sizeof(threefish1024_ctx_t);
-       nessie_bc_ctx.name = "Threefish1024";
-       nessie_bc_ctx.cipher_genctx = threefish1024_dummy_init;
-       nessie_bc_ctx.cipher_enc = (nessie_bc_enc_fpt)threefish1024_enc;
-       nessie_bc_ctx.cipher_dec = (nessie_bc_dec_fpt)threefish1024_dec;
-       nessie_bc_ctx.cipher_free = NULL;
-       
-       nessie_bc_run();
-}
-
 void testrun_nessie_threefish(void){
-       testrun_nessie_threefish256();
-       testrun_nessie_threefish512();
-       testrun_nessie_threefish1024();
+       bcal_nessie_multiple(algolist);
 }
 
 void testrun_stdtest_threefish256(void){
@@ -267,129 +217,8 @@ void testrun_stdtest_threefish(void){
        testrun_stdtest_threefish1024();
 }
 
-void testrun_performance_threefish256(void){
-       uint64_t t;
-       char str[16];
-       uint8_t key[THREEFISH256_BLOCKSIZE_B];
-       uint8_t data[THREEFISH256_BLOCKSIZE_B];
-       uint8_t tweak[16];
-       threefish256_ctx_t ctx;
-       
-       cli_putstr_P(PSTR("\r\nThreefish-256 performance:"));
-       
-       calibrateTimer();
-       print_overhead();       
-       
-//     memset(key,  0, THREEFISH256_BLOCKSIZE_B);
-//     memset(tweak, 0, 16);
-       
-       startTimer(1);
-       threefish256_init(key, tweak, &ctx);
-       t = stopTimer();
-       cli_putstr_P(PSTR("\r\n\tctx-gen time: "));
-       ultoa((unsigned long)t, str, 10);
-       cli_putstr(str);        
-       
-       startTimer(1);
-       threefish256_enc(data, &ctx);
-       t = stopTimer();
-       cli_putstr_P(PSTR("\r\n\tencrypt time: "));
-       ultoa((unsigned long)t, str, 10);
-       cli_putstr(str);        
-       
-       startTimer(1);
-       threefish256_dec(data, &ctx);
-       t = stopTimer();
-       cli_putstr_P(PSTR("\r\n\tdecrypt time: "));
-       ultoa((unsigned long)t, str, 10);
-       cli_putstr(str);        
-       cli_putstr_P(PSTR("\r\n"));     
-}
-
-void testrun_performance_threefish512(void){
-       uint64_t t;
-       char str[16];
-       uint8_t key[THREEFISH512_BLOCKSIZE_B];
-       uint8_t data[THREEFISH512_BLOCKSIZE_B];
-       uint8_t tweak[16];
-       threefish512_ctx_t ctx;
-       
-       cli_putstr_P(PSTR("\r\nThreefish-512 performance:"));
-       
-       calibrateTimer();
-       print_overhead();       
-       
-//     memset(key,  0, THREEFISH512_BLOCKSIZE_B);
-//     memset(tweak, 0, 16);
-       
-       startTimer(1);
-       threefish512_init(key, tweak, &ctx);
-       t = stopTimer();
-       cli_putstr_P(PSTR("\r\n\tctx-gen time: "));
-       ultoa((unsigned long)t, str, 10);
-       cli_putstr(str);        
-       
-       startTimer(1);
-       threefish512_enc(data, &ctx);
-       t = stopTimer();
-       cli_putstr_P(PSTR("\r\n\tencrypt time: "));
-       ultoa((unsigned long)t, str, 10);
-       cli_putstr(str);        
-       
-       startTimer(1);
-       threefish512_dec(data, &ctx);
-       t = stopTimer();
-       cli_putstr_P(PSTR("\r\n\tdecrypt time: "));
-       ultoa((unsigned long)t, str, 10);
-       cli_putstr(str);        
-       
-       cli_putstr_P(PSTR("\r\n"));     
-}
-
-void testrun_performance_threefish1024(void){
-       uint64_t t;
-       char str[16];
-       uint8_t key[THREEFISH1024_BLOCKSIZE_B];
-       uint8_t data[THREEFISH1024_BLOCKSIZE_B];
-       uint8_t tweak[16];
-       threefish1024_ctx_t ctx;
-       
-       cli_putstr_P(PSTR("\r\nThreefish-1024 performance:"));
-       
-       calibrateTimer();
-       print_overhead();       
-       
-//     memset(key,  0, THREEFISH1024_BLOCKSIZE_B);
-//     memset(tweak, 0, 16);
-       
-       startTimer(1);
-       threefish1024_init(key, tweak, &ctx);
-       t = stopTimer();
-       cli_putstr_P(PSTR("\r\n\tctx-gen time: "));
-       ultoa((unsigned long)t, str, 10);
-       cli_putstr(str);        
-       
-       startTimer(1);
-       threefish1024_enc(data, &ctx);
-       t = stopTimer();
-       cli_putstr_P(PSTR("\r\n\tencrypt time: "));
-       ultoa((unsigned long)t, str, 10);
-       cli_putstr(str);        
-       
-       startTimer(1);
-       threefish1024_dec(data, &ctx);
-       t = stopTimer();
-       cli_putstr_P(PSTR("\r\n\tdecrypt time: "));
-       ultoa((unsigned long)t, str, 10);
-       cli_putstr(str);        
-       
-       cli_putstr_P(PSTR("\r\n"));     
-}
-
 void testrun_performance_threefish(void){
-       testrun_performance_threefish256();
-       testrun_performance_threefish512();
-       testrun_performance_threefish1024();
+       bcal_performance_multiple(algolist);
 }
 
 void init_test(void){
@@ -418,7 +247,7 @@ const char inittest_str[]    PROGMEM = "inittest";
 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_threefish},
        { test_str,        NULL, testrun_stdtest_threefish},
     { test256_str,     NULL, testrun_stdtest_threefish256},
@@ -431,14 +260,10 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
 };
 
 int main (void){
-       DEBUG_INIT();
-       
-       cli_rx = uart_getc;
-       cli_tx = uart_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);
        }
 }