X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-xtea-test.c;h=778d9cdce7bee6644fced7a79bcff54a5f3c8417;hb=b246a2a0589f234db6247255555df98f4c281c41;hp=c40046f0cdd9cf518c936eefca9ad7183ed542ac;hpb=6483e60140be5fe4ab60de85cdf679fc0518dc99;p=avr-crypto-lib.git

diff --git a/test_src/main-xtea-test.c b/test_src/main-xtea-test.c
index c40046f..778d9cd 100644
--- a/test_src/main-xtea-test.c
+++ b/test_src/main-xtea-test.c
@@ -30,6 +30,7 @@
 #include "nessie_bc_test.h"
 #include "performance_test.h"
 #include "bcal-performance.h"
+#include "bcal-nessie.h"
 #include "bcal_xtea.h"
 #include "cli.h"
 
@@ -45,34 +46,33 @@ const bcdesc_t* algolist[] PROGMEM = {
 
 /******************************************************************************/
 
-void xtea_genctx_dummy(uint8_t* key, uint16_t keysize, void* ctx){
-	memcpy(ctx, key, (keysize+7)/8);
-}
-
-void xtea_enc_dummy(uint8_t* buffer, void* ctx){
-	xtea_enc((uint32_t*)buffer, (uint32_t*)buffer, ctx);
-}
-
-void xtea_dec_dummy(uint8_t* buffer, void* ctx){
-	xtea_dec((uint32_t*)buffer, (uint32_t*)buffer, ctx);
-}
-
 void testrun_nessie_xtea(void){
-	nessie_bc_ctx.blocksize_B =   8;
-	nessie_bc_ctx.keysize_b   = 128;
-	nessie_bc_ctx.name        = algo_name;
-	nessie_bc_ctx.ctx_size_B  = 128/8;
-	nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)xtea_enc_dummy;
-	nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)xtea_dec_dummy;
-	nessie_bc_ctx.cipher_genctx  = (nessie_bc_gen_fpt)xtea_genctx_dummy;
-	
-	nessie_bc_run();	
+	bcal_nessie_multiple(algolist);
 }
 
 void testrun_performance_xtea(void){
 	bcal_performance_multiple(algolist);
 }
 
+void test_xtea(void){
+	uint8_t key[16];
+	uint8_t data[8];
+
+	memset(key, 0, 16);
+	key[0] = 0x80;
+	memset(data, 0, 8);
+	cli_putstr_P(PSTR("\r\n*** XTEA test ***\r\n key:   "));
+	cli_hexdump(key, 16);
+	cli_putstr_P(PSTR("\r\n plain: "));
+	cli_hexdump(data, 8);
+	xtea_enc(data, data, key);
+	cli_putstr_P(PSTR("\r\n crypt: "));
+	cli_hexdump(data, 8);
+	xtea_dec(data, data, key);
+	cli_putstr_P(PSTR("\r\n plain: "));
+	cli_hexdump(data, 8);
+}
+
 /*****************************************************************************
  *  main																	 *
  *****************************************************************************/
@@ -84,7 +84,7 @@ const char echo_str[]        PROGMEM = "echo";
 
 cmdlist_entry_t cmdlist[] PROGMEM = {
 	{ nessie_str,      NULL, testrun_nessie_xtea},
-	{ test_str,        NULL, testrun_nessie_xtea},
+	{ test_str,        NULL, test_xtea},
 	{ performance_str, NULL, testrun_performance_xtea},
 	{ echo_str,    (void*)1, (void_fpt)echo_ctrl},
 	{ NULL,            NULL, NULL}