]> git.cryptolib.org Git - avr-crypto-lib.git/blobdiff - test_src/main-cast5-test.c
fixing E-Mail-Address & Copyright
[avr-crypto-lib.git] / test_src / main-cast5-test.c
index 3cdb70355ac5665f59679c4f05cf7e8f2a9ae178..6c0af07665d368066c64db3d8a3a4823d897d367 100644 (file)
@@ -1,7 +1,7 @@
 /* main-cast5-test.c */
 /*
-    This file is part of the This file is part of the AVR-Crypto-Lib.
-    Copyright (C) 2008  Daniel Otte (daniel.otte@rub.de)
+    This file is part of the AVR-Crypto-Lib.
+    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 <cast5.h>
-#include "nessie_bc_test.h"
 #include "performance_test.h"
-#include "cli.h"
+#include "bcal-performance.h"
+#include "bcal-nessie.h"
+#include "bcal_cast5.h"
 
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
+char *algo_name = "cast-128 (cast5)";
 
-char* cipher_name = "cast-128 (cast5)";
+const bcdesc_t *const algolist[] PROGMEM = {
+       (bcdesc_t*)&cast5_desc,
+       NULL
+};
 
 /*****************************************************************************
  *  additional validation-functions                                                                                     *
  *****************************************************************************/
 
 void testrun_nessie_cast5(void){
-       nessie_bc_ctx.blocksize_B =   8;
-       nessie_bc_ctx.keysize_b   = 128;
-       nessie_bc_ctx.name        = cipher_name;
-       nessie_bc_ctx.ctx_size_B  = sizeof(cast5_ctx_t);
-       nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)cast5_enc;
-       nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)cast5_dec;
-       nessie_bc_ctx.cipher_genctx  = (nessie_bc_gen_fpt)cast5_init;
-       
-       nessie_bc_run();
+       bcal_nessie_multiple(algolist);
 }
 
 /*****************************************************************************
@@ -59,18 +50,18 @@ void testrun_nessie_cast5(void){
 
 void cast5_ctx_dump(cast5_ctx_t *s){
        uint8_t i;
-       uart_putstr("\r\n==== cast5_ctx_dump ====\r\n shortkey: ");
-       uart_putstr(s->shortkey?"yes":"no");
+       cli_putstr("\r\n==== cast5_ctx_dump ====\r\n shortkey: ");
+       cli_putstr(s->shortkey?"yes":"no");
        for(i=0;i<16;++i){
                uint8_t r;
-               uart_putstr("\r\n Km"); uart_hexdump(&i, 1); uart_putc(':');
-               uart_hexdump(&(s->mask[i]), 4);
-               uart_putstr("\r\n Kr"); uart_hexdump(&i, 1); uart_putc(':');
+               cli_putstr("\r\n Km"); cli_hexdump(&i, 1); cli_putc(':');
+               cli_hexdump(&(s->mask[i]), 4);
+               cli_putstr("\r\n Kr"); cli_hexdump(&i, 1); cli_putc(':');
                r = (s->rotl[i/2]);
                if (i&0x01) r >>= 4;
                r &= 0xf;
                r += (s->roth[i>>3]&(1<<(i&0x7)))?0x10:0x00;
-               uart_hexdump(&r, 1);
+               cli_hexdump(&r, 1);
        }
 }
 
@@ -78,32 +69,32 @@ void cast5_ctx_dump(cast5_ctx_t *s){
 void test_encrypt(uint8_t *block, uint8_t *key, uint8_t keylength, bool print){
        cast5_ctx_t s;
        if (print){
-               uart_putstr("\r\nCAST5:\r\n key:\t");
-               uart_hexdump(key, keylength/8);
-               uart_putstr("\r\n plaintext:\t");
-               uart_hexdump(block, 8);
+               cli_putstr("\r\nCAST5:\r\n key:\t");
+               cli_hexdump(key, keylength/8);
+               cli_putstr("\r\n plaintext:\t");
+               cli_hexdump(block, 8);
        }
        cast5_init(key, keylength, &s);
        cast5_enc(block, &s);
        if (print){
-               uart_putstr("\r\n ciphertext:\t");
-               uart_hexdump(block, 8);
+               cli_putstr("\r\n ciphertext:\t");
+               cli_hexdump(block, 8);
        }
 } 
 
 void test_decrypt(uint8_t *block, uint8_t *key, uint8_t keylength, bool print){
        cast5_ctx_t s;
        if (print){
-               uart_putstr("\r\nCAST5:\r\n key:\t");
-               uart_hexdump(key, keylength/8);
-               uart_putstr("\r\n ciphertext:\t");
-               uart_hexdump(block, 8);
+               cli_putstr("\r\nCAST5:\r\n key:\t");
+               cli_hexdump(key, keylength/8);
+               cli_putstr("\r\n ciphertext:\t");
+               cli_hexdump(block, 8);
        }
        cast5_init(key, keylength, &s);
        cast5_dec(block, &s);
        if (print){
-               uart_putstr("\r\n plaintext:\t");
-               uart_hexdump(block, 8);
+               cli_putstr("\r\n plaintext:\t");
+               cli_hexdump(block, 8);
        }
 } 
 
@@ -126,7 +117,7 @@ void testrun_cast5(void){
        test_decrypt(block, key, 40, true);
        
 /**** long test *****/
-       uart_putstr("\r\nmaintance-test");
+       cli_putstr("\r\nmaintance-test");
        uint8_t a[16]= {0x01, 0x23, 0x45, 0x67, 0x12,
                                    0x34, 0x56, 0x78, 0x23, 0x45, 
                                    0x67, 0x89, 0x34, 0x56, 0x78, 
@@ -142,79 +133,41 @@ void testrun_cast5(void){
                test_encrypt(&(b[0]), &(a[0]), 128, false);
                test_encrypt(&(b[8]), &(a[0]), 128, false);
                if ((i&0x000000ff) == 0){
-                       uart_putstr("\r\n");
-                       uart_hexdump(&i, 4);
+                       
+                       cli_hexdump(&i, 4);
                }
        }
-       uart_putstr("\r\na = "); uart_hexdump(a, 16);
-       uart_putstr("\r\nb = "); uart_hexdump(b, 16);
+       cli_putstr("\r\na = "); cli_hexdump(a, 16);
+       cli_putstr("\r\nb = "); cli_hexdump(b, 16);
 
 }
 
 void testrun_performance_cast5(void){
-       uint64_t t;
-       char str[6];
-       uint8_t key[16], data[16];
-       cast5_ctx_t ctx;
-       
-       calibrateTimer();
-       print_overhead();
-       
-       memset(key,  0, 16);
-       memset(data, 0, 16);
-       
-       startTimer(1);
-       cast5_init(key, 128, &ctx);
-       t = stopTimer();
-       uart_putstr_P(PSTR("\r\n\tctx-gen time: "));
-       ultoa((unsigned long)t, str, 10);
-       uart_putstr(str);
-       
-       
-       startTimer(1);
-       cast5_enc(data, &ctx);
-       t = stopTimer();
-       uart_putstr_P(PSTR("\r\n\tencrypt time: "));
-       ultoa((unsigned long)t, str, 10);
-       uart_putstr(str);
-       
-       
-       startTimer(1);
-       cast5_dec(data, &ctx);
-       t = stopTimer();
-       uart_putstr_P(PSTR("\r\n\tdecrypt time: "));
-       ultoa((unsigned long)t, str, 10);
-       uart_putstr(str);
-       
-       uart_putstr_P(PSTR("\r\n"));
+       bcal_performance_multiple(algolist);
 }
 
 /*****************************************************************************
  *  main                                                                                                                                        *
  *****************************************************************************/
 
-int main (void){
-       char str[20];
+const char nessie_str[]      PROGMEM = "nessie";
+const char test_str[]        PROGMEM = "test";
+const char performance_str[] PROGMEM = "performance";
+const char echo_str[]        PROGMEM = "echo";
 
-       
-       DEBUG_INIT();
-       uart_putstr("\r\n");
+const cmdlist_entry_t cmdlist[] PROGMEM = {
+       { nessie_str,      NULL, testrun_nessie_cast5},
+       { test_str,        NULL, testrun_cast5},
+       { performance_str, NULL, testrun_performance_cast5},
+       { echo_str,    (void*)1, (void_fpt)echo_ctrl},
+       { NULL,            NULL, NULL}
+};
 
-       uart_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
-       uart_putstr(cipher_name);
-       uart_putstr_P(PSTR(")\r\nloaded and running\r\n"));
+int main (void){
+    main_setup();
 
-       PGM_P    u   = PSTR("nessie\0test\0performance\0");
-       void_fpt v[] = {testrun_nessie_cast5, testrun_cast5, testrun_performance_cast5};
-       
-       while(1){ 
-               if (!getnextwordn(str,20)){DEBUG_S("DBG: W1\r\n"); goto error;}
-               if(execcommand_d0_P(str, u, v)<0){
-                       uart_putstr_P(PSTR("\r\nunknown command\r\n"));
-               }
-               continue;
-       error:
-               uart_putstr("ERROR\r\n");
+    for(;;){
+        welcome_msg(algo_name);
+        cmd_interface(cmdlist);
        }
 }
-