new document describing blockcipher usage

[avr-crypto-lib.git] / main-seed-test.c

diff --git a/main-seed-test.c b/main-seed-test.c
index 1dc4259b8be8daa6b280aa936771aac1f8dde9d3..678d132a48828ef36cb2a47f8e9e79a25a0ee9ba 100644 (file)
--- a/main-seed-test.c
+++ b/main-seed-test.c
@@ -54,8 +54,8 @@ void testrun_nessie_seed(void){
        nessie_bc_ctx.keysize_b   = 128;
        nessie_bc_ctx.name        = cipher_name;
        nessie_bc_ctx.ctx_size_B  = sizeof(seed_ctx_t);
-       nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)seed_encrypt;
-       nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)seed_decrypt;
+       nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)seed_enc;
+       nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)seed_dec;
        nessie_bc_ctx.cipher_genctx  = (nessie_bc_gen_fpt)seed_genctx_dummy;
        
        nessie_bc_run();
@@ -64,21 +64,13 @@ void testrun_nessie_seed(void){
 
 
 void testrun_performance_seed(void){
-       uint16_t i,c;
        uint64_t t;
        char str[16];
        uint8_t key[16], data[16];
        seed_ctx_t ctx;
        
        calibrateTimer();
-       getOverhead(&c, &i);
-       uart_putstr_P(PSTR("\r\n\r\n=== benchmark ==="));
-       utoa(c, str, 10);
-       uart_putstr_P(PSTR("\r\n\tconst overhead:     "));
-       uart_putstr(str);
-       utoa(i, str, 10);
-       uart_putstr_P(PSTR("\r\n\tinterrupt overhead: "));
-       uart_putstr(str);
+       print_overhead();
        
        memset(key,  0, 16);
        memset(data, 0, 16);
@@ -92,7 +84,7 @@ void testrun_performance_seed(void){
        
        
        startTimer(1);
-       seed_encrypt(data, &ctx);
+       seed_enc(data, &ctx);
        t = stopTimer();
        uart_putstr_P(PSTR("\r\n\tencrypt time: "));
        ultoa((unsigned long)t, str, 10);
@@ -100,7 +92,7 @@ void testrun_performance_seed(void){
        
        
        startTimer(1);
-       seed_decrypt(data, &ctx);
+       seed_dec(data, &ctx);
        t = stopTimer();
        uart_putstr_P(PSTR("\r\n\tdecrypt time: "));
        ultoa((unsigned long)t, str, 10);
@@ -120,7 +112,7 @@ void testencrypt(uint8_t* block, uint8_t* key){
        seed_init(key, &ctx);
        uart_putstr("\r\n plain: ");
        uart_hexdump(block,16);
-       seed_encrypt(block, &ctx);
+       seed_enc(block, &ctx);
        uart_putstr("\r\n crypt: ");
        uart_hexdump(block,16);
 }
@@ -132,7 +124,7 @@ void testdecrypt(uint8_t* block, uint8_t* key){
        seed_init(key, &ctx);
        uart_putstr("\r\n crypt: ");
        uart_hexdump(block,16);
-       seed_decrypt(block, &ctx);
+       seed_dec(block, &ctx);
        uart_putstr("\r\n plain: ");
        uart_hexdump(block,16);
 }