X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;ds=sidebyside;f=main-cast5-test.c;h=2cfb3d11b4a34fe3386fee51d1c03b887e5520f5;hb=94cad47618f03baf3d750d75c20860c89ac91dbe;hp=6f3b18a71228afd9061c4d1f75e72448226f21cf;hpb=158bb85c89631984291c93a9217ca84345349a46;p=avr-crypto-lib.git
diff --git a/main-cast5-test.c b/main-cast5-test.c
index 6f3b18a..2cfb3d1 100644
--- a/main-cast5-test.c
+++ b/main-cast5-test.c
@@ -1,3 +1,21 @@
+/* main-cast5-test.c */
+/*
+ This file is part of the Crypto-avr-lib/microcrypt-lib.
+ Copyright (C) 2008 Daniel Otte (daniel.otte@rub.de)
+
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+*/
/*
* cast5 test-suit
*
@@ -10,41 +28,27 @@
#include "cast5.h"
#include "nessie_bc_test.h"
+#include "performance_test.h"
+#include "cli.h"
#include
#include
+#include
char* cipher_name = "cast-128 (cast5)";
/*****************************************************************************
* additional validation-functions *
*****************************************************************************/
-/*
- void cast5_init(cast5_ctx_t* s, uint8_t* key, uint8_t keylength);
- void cast5_enc(cast5_ctx_t *s, void* block);
- void cast5_dec(cast5_ctx_t *s, void* block);
-*/
-void cast5_init_dummy(uint8_t* key, uint8_t keylength_b, cast5_ctx_t* ctx){
- cast5_init(ctx, key, keylength_b);
-}
-
-void cast5_enc_dummy(void* buffer, cast5_ctx_t* ctx){
- cast5_enc(ctx, buffer);
-}
-
-void cast5_dec_dummy(void* buffer, cast5_ctx_t* ctx){
- cast5_dec(ctx, buffer);
-}
-
-void test_nessie_cast5(void){
+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_dummy;
- nessie_bc_ctx.cipher_dec = (nessie_bc_dec_fpt)cast5_dec_dummy;
- nessie_bc_ctx.cipher_genctx = (nessie_bc_gen_fpt)cast5_init_dummy;
+ 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();
}
@@ -79,9 +83,8 @@ void test_encrypt(uint8_t *block, uint8_t *key, uint8_t keylength, bool print){
uart_putstr("\r\n plaintext:\t");
uart_hexdump(block, 8);
}
- cast5_init(&s, key, keylength);
-// cast5_ctx_dump(&s);
- cast5_enc(&s, block);
+ cast5_init(key, keylength, &s);
+ cast5_enc(block, &s);
if (print){
uart_putstr("\r\n ciphertext:\t");
uart_hexdump(block, 8);
@@ -96,9 +99,8 @@ void test_decrypt(uint8_t *block, uint8_t *key, uint8_t keylength, bool print){
uart_putstr("\r\n ciphertext:\t");
uart_hexdump(block, 8);
}
- cast5_init(&s, key, keylength);
-// cast5_ctx_dump(&s);
- cast5_dec(&s, block);
+ cast5_init(key, keylength, &s);
+ cast5_dec(block, &s);
if (print){
uart_putstr("\r\n plaintext:\t");
uart_hexdump(block, 8);
@@ -149,7 +151,43 @@ void testrun_cast5(void){
}
-
+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"));
+}
/*****************************************************************************
* main *
@@ -162,17 +200,21 @@ int main (void){
DEBUG_INIT();
uart_putstr("\r\n");
- uart_putstr("\r\n\r\nCrypto-VS\r\nloaded and running\r\n");
-restart:
+ uart_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
+ uart_putstr(cipher_name);
+ uart_putstr_P(PSTR(")\r\nloaded and running\r\n"));
+
+ 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 (strcmp(str, "nessie")) {DEBUG_S("DBG: 1b\r\n"); goto error;}
- // testrun_cast5();
- test_nessie_cast5();
- goto restart;
+ 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");
- } /* while (1) */
+ }
}