]> git.cryptolib.org Git - avr-crypto-lib.git/blobdiff - test_src/main-aes-test.c
fixing E-Mail-Address & Copyright
[avr-crypto-lib.git] / test_src / main-aes-test.c
index c4b9adc55441e253abdb10a0475ce04eac88bce4..6b20c582d244263fe3dab918d51cd1858b298fce 100644 (file)
@@ -1,7 +1,7 @@
 /* main-aes-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
  * AES test-suit
  *
 */
+#include "main-test-common.h"
+#include "aes.h"
 
-#include "config.h"
-
-#include "uart_i.h"
-#include "debug.h"
-
-#include "aes/aes.h"
-
-#include "nessie_bc_test.h"
-#include "cli.h"
 #include "performance_test.h"
 #include "dump.h"
 
 #include "bcal-ofb.h"
 #include "bcal-ctr.h"
 #include "bcal-cmac.h"
+#include "bcal-eax.h"
 #include "cmacvs.h"
+#include "bcal-performance.h"
+#include "bcal-nessie.h"
 
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-#include <avr/pgmspace.h>
-
-char* algo_name = "AES";
+const char *algo_name = "AES";
 
-const bcdesc_t* algolist[] PROGMEM = {
+const bcdesc_t *const const algolist[] PROGMEM = {
        (bcdesc_t*)&aes128_desc,
        (bcdesc_t*)&aes192_desc,
        (bcdesc_t*)&aes256_desc,
@@ -63,26 +54,7 @@ const bcdesc_t* algolist[] PROGMEM = {
  *****************************************************************************/
 
 void testrun_nessie_aes(void){
-       nessie_bc_ctx.blocksize_B =  16;
-       nessie_bc_ctx.keysize_b   = 128;
-       nessie_bc_ctx.name        = algo_name;
-       nessie_bc_ctx.ctx_size_B  = sizeof(aes128_ctx_t);
-       nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)aes128_enc;
-       nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)aes128_dec;
-       nessie_bc_ctx.cipher_genctx  = (nessie_bc_gen_fpt)aes_init;
-       nessie_bc_run();
-
-       nessie_bc_ctx.keysize_b   = 192;
-       nessie_bc_ctx.ctx_size_B  = sizeof(aes192_ctx_t);
-       nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)aes192_enc;
-       nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)aes192_dec;
-       nessie_bc_run();
-
-       nessie_bc_ctx.keysize_b   = 256;
-       nessie_bc_ctx.ctx_size_B  = sizeof(aes256_ctx_t);
-       nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)aes256_enc;
-       nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)aes256_dec;
-       nessie_bc_run();
+       bcal_nessie_multiple(algolist);
 }
 
 void testrun_test_aes(void){
@@ -194,23 +166,23 @@ void testrun_testkey_aes(void){
        testrun_testkey_aes256();
 }
 
-uint8_t modes_key[]   PROGMEM = {
+const uint8_t modes_key[]   PROGMEM = {
                0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6,
                0xab, 0xf7, 0x15, 0x88, 0x09, 0xcf, 0x4f, 0x3c,
                0x1f, 0x35, 0x2c, 0x07, 0x3b, 0x61, 0x08, 0xd7,
                0x2d, 0x98, 0x10, 0xa3, 0x09, 0x14, 0xdf, 0xf4
        };
-uint8_t modes_iv[]    PROGMEM = {
+const uint8_t modes_iv[]    PROGMEM = {
                0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
                0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f
     };
 
-uint8_t modes_ctriv[] PROGMEM = {
+const uint8_t modes_ctriv[] PROGMEM = {
                0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
                0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
        };
 
-uint8_t modes_plain[] PROGMEM = {
+const uint8_t modes_plain[] PROGMEM = {
                0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96,
                0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a,
                /* --- */
@@ -527,133 +499,152 @@ void testrun_aes192_cmac0(void){
        bcal_cmac_free(&ctx);
 }
 
-/*****************************************************************************/
-
-void testrun_performance_aes128(void){
-       uint64_t t;
-       char str[16];
-       uint8_t key[32], data[16];
-       aes128_ctx_t ctx;
-
-       calibrateTimer();
-       print_overhead();
-
-       memset(key,  0, 32);
-       memset(data, 0, 16);
-
-       startTimer(1);
-       aes128_init(key, &ctx);
-       t = stopTimer();
-       cli_putstr_P(PSTR("\r\n\tctx-gen time: "));
-       ultoa((unsigned long)t, str, 10);
-       cli_putstr(str);
-
-
-       startTimer(1);
-       aes128_enc(data, &ctx);
-       t = stopTimer();
-       cli_putstr_P(PSTR("\r\n\tencrypt time: "));
-       ultoa((unsigned long)t, str, 10);
-       cli_putstr(str);
-
-
-       startTimer(1);
-       aes128_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_aes192(void){
-       uint64_t t;
-       char str[16];
-       uint8_t key[32], data[16];
-       aes192_ctx_t ctx;
-
-       calibrateTimer();
-       print_overhead();
+const uint8_t eax_msg[] PROGMEM = {
+    0xF7, 0xFB,
+    0x1A, 0x47, 0xCB, 0x49, 0x33,
+    0x48, 0x1C, 0x9E, 0x39, 0xB1,
+    0x40, 0xD0, 0xC0, 0x7D, 0xA5, 0xE4,
+    0x4D, 0xE3, 0xB3, 0x5C, 0x3F, 0xC0, 0x39, 0x24, 0x5B, 0xD1, 0xFB, 0x7D,
+    0x8B, 0x0A, 0x79, 0x30, 0x6C, 0x9C, 0xE7, 0xED, 0x99, 0xDA, 0xE4, 0xF8, 0x7F, 0x8D, 0xD6, 0x16, 0x36,
+    0x1B, 0xDA, 0x12, 0x2B, 0xCE, 0x8A, 0x8D, 0xBA, 0xF1, 0x87, 0x7D, 0x96, 0x2B, 0x85, 0x92, 0xDD, 0x2D, 0x56,
+    0x6C, 0xF3, 0x67, 0x20, 0x87, 0x2B, 0x85, 0x13, 0xF6, 0xEA, 0xB1, 0xA8, 0xA4, 0x44, 0x38, 0xD5, 0xEF, 0x11,
+    0xCA, 0x40, 0xD7, 0x44, 0x6E, 0x54, 0x5F, 0xFA, 0xED, 0x3B, 0xD1, 0x2A, 0x74, 0x0A, 0x65, 0x9F, 0xFB, 0xBB, 0x3C, 0xEA, 0xB7
+};
 
-       memset(key,  0, 32);
-       memset(data, 0, 16);
+const uint8_t eax_msg_len[] PROGMEM =  {0, 2, 5, 5, 6, 12, 17, 18, 18, 21};
+
+const uint8_t eax_key[] PROGMEM = {
+       0x23, 0x39, 0x52, 0xDE, 0xE4, 0xD5, 0xED, 0x5F, 0x9B, 0x9C, 0x6D, 0x6F, 0xF8, 0x0F, 0xF4, 0x78,
+    0x91, 0x94, 0x5D, 0x3F, 0x4D, 0xCB, 0xEE, 0x0B, 0xF4, 0x5E, 0xF5, 0x22, 0x55, 0xF0, 0x95, 0xA4,
+    0x01, 0xF7, 0x4A, 0xD6, 0x40, 0x77, 0xF2, 0xE7, 0x04, 0xC0, 0xF6, 0x0A, 0xDA, 0x3D, 0xD5, 0x23,
+    0xD0, 0x7C, 0xF6, 0xCB, 0xB7, 0xF3, 0x13, 0xBD, 0xDE, 0x66, 0xB7, 0x27, 0xAF, 0xD3, 0xC5, 0xE8,
+    0x35, 0xB6, 0xD0, 0x58, 0x00, 0x05, 0xBB, 0xC1, 0x2B, 0x05, 0x87, 0x12, 0x45, 0x57, 0xD2, 0xC2,
+    0xBD, 0x8E, 0x6E, 0x11, 0x47, 0x5E, 0x60, 0xB2, 0x68, 0x78, 0x4C, 0x38, 0xC6, 0x2F, 0xEB, 0x22,
+    0x7C, 0x77, 0xD6, 0xE8, 0x13, 0xBE, 0xD5, 0xAC, 0x98, 0xBA, 0xA4, 0x17, 0x47, 0x7A, 0x2E, 0x7D,
+    0x5F, 0xFF, 0x20, 0xCA, 0xFA, 0xB1, 0x19, 0xCA, 0x2F, 0xC7, 0x35, 0x49, 0xE2, 0x0F, 0x5B, 0x0D,
+    0xA4, 0xA4, 0x78, 0x2B, 0xCF, 0xFD, 0x3E, 0xC5, 0xE7, 0xEF, 0x6D, 0x8C, 0x34, 0xA5, 0x61, 0x23,
+    0x83, 0x95, 0xFC, 0xF1, 0xE9, 0x5B, 0xEB, 0xD6, 0x97, 0xBD, 0x01, 0x0B, 0xC7, 0x66, 0xAA, 0xC3
+};
 
-       startTimer(1);
-       aes192_init(key, &ctx);
-       t = stopTimer();
-       cli_putstr_P(PSTR("\r\n\tctx-gen time: "));
-       ultoa((unsigned long)t, str, 10);
-       cli_putstr(str);
+const uint8_t eax_nonce[] PROGMEM = {
+    0x62, 0xEC, 0x67, 0xF9, 0xC3, 0xA4, 0xA4, 0x07, 0xFC, 0xB2, 0xA8, 0xC4, 0x90, 0x31, 0xA8, 0xB3,
+    0xBE, 0xCA, 0xF0, 0x43, 0xB0, 0xA2, 0x3D, 0x84, 0x31, 0x94, 0xBA, 0x97, 0x2C, 0x66, 0xDE, 0xBD,
+    0x70, 0xC3, 0xDB, 0x4F, 0x0D, 0x26, 0x36, 0x84, 0x00, 0xA1, 0x0E, 0xD0, 0x5D, 0x2B, 0xFF, 0x5E,
+    0x84, 0x08, 0xDF, 0xFF, 0x3C, 0x1A, 0x2B, 0x12, 0x92, 0xDC, 0x19, 0x9E, 0x46, 0xB7, 0xD6, 0x17,
+    0xFD, 0xB6, 0xB0, 0x66, 0x76, 0xEE, 0xDC, 0x5C, 0x61, 0xD7, 0x42, 0x76, 0xE1, 0xF8, 0xE8, 0x16,
+    0x6E, 0xAC, 0x5C, 0x93, 0x07, 0x2D, 0x8E, 0x85, 0x13, 0xF7, 0x50, 0x93, 0x5E, 0x46, 0xDA, 0x1B,
+    0x1A, 0x8C, 0x98, 0xDC, 0xD7, 0x3D, 0x38, 0x39, 0x3B, 0x2B, 0xF1, 0x56, 0x9D, 0xEE, 0xFC, 0x19,
+    0xDD, 0xE5, 0x9B, 0x97, 0xD7, 0x22, 0x15, 0x6D, 0x4D, 0x9A, 0xFF, 0x2B, 0xC7, 0x55, 0x98, 0x26,
+    0xB7, 0x81, 0xFC, 0xF2, 0xF7, 0x5F, 0xA5, 0xA8, 0xDE, 0x97, 0xA9, 0xCA, 0x48, 0xE5, 0x22, 0xEC,
+    0x22, 0xE7, 0xAD, 0xD9, 0x3C, 0xFC, 0x63, 0x93, 0xC5, 0x7E, 0xC0, 0xB3, 0xC1, 0x7D, 0x6B, 0x44
+};
 
+const uint8_t eax_header[] PROGMEM = {
+    0x6B, 0xFB, 0x91, 0x4F, 0xD0, 0x7E, 0xAE, 0x6B,
+    0xFA, 0x3B, 0xFD, 0x48, 0x06, 0xEB, 0x53, 0xFA,
+    0x23, 0x4A, 0x34, 0x63, 0xC1, 0x26, 0x4A, 0xC6,
+    0x33, 0xCC, 0xE2, 0xEA, 0xBF, 0xF5, 0xA7, 0x9D,
+    0xAE, 0xB9, 0x6E, 0xAE, 0xBE, 0x29, 0x70, 0xE9,
+    0xD4, 0x48, 0x2D, 0x1C, 0xA7, 0x8D, 0xCE, 0x0F,
+    0x65, 0xD2, 0x01, 0x79, 0x90, 0xD6, 0x25, 0x28,
+    0x54, 0xB9, 0xF0, 0x4E, 0x6A, 0x09, 0x18, 0x9A,
+    0x89, 0x9A, 0x17, 0x58, 0x97, 0x56, 0x1D, 0x7E,
+    0x12, 0x67, 0x35, 0xFC, 0xC3, 0x20, 0xD2, 0x5A
+};
 
-       startTimer(1);
-       aes192_enc(data, &ctx);
-       t = stopTimer();
-       cli_putstr_P(PSTR("\r\n\tencrypt time: "));
-       ultoa((unsigned long)t, str, 10);
-       cli_putstr(str);
+const uint8_t eax_cipher[] PROGMEM = {
+    0xE0, 0x37, 0x83, 0x0E, 0x83, 0x89, 0xF2, 0x7B, 0x02, 0x5A, 0x2D, 0x65, 0x27, 0xE7, 0x9D, 0x01,
+    0x19, 0xDD, 0x5C, 0x4C, 0x93, 0x31, 0x04, 0x9D, 0x0B, 0xDA, 0xB0, 0x27, 0x74, 0x08, 0xF6, 0x79, 0x67, 0xE5,
+    0xD8, 0x51, 0xD5, 0xBA, 0xE0, 0x3A, 0x59, 0xF2, 0x38, 0xA2, 0x3E, 0x39, 0x19, 0x9D, 0xC9, 0x26, 0x66, 0x26, 0xC4, 0x0F, 0x80,
+    0x63, 0x2A, 0x9D, 0x13, 0x1A, 0xD4, 0xC1, 0x68, 0xA4, 0x22, 0x5D, 0x8E, 0x1F, 0xF7, 0x55, 0x93, 0x99, 0x74, 0xA7, 0xBE, 0xDE,
+    0x07, 0x1D, 0xFE, 0x16, 0xC6, 0x75, 0xCB, 0x06, 0x77, 0xE5, 0x36, 0xF7, 0x3A, 0xFE, 0x6A, 0x14, 0xB7, 0x4E, 0xE4, 0x98, 0x44, 0xDD,
+    0x83, 0x5B, 0xB4, 0xF1, 0x5D, 0x74, 0x3E, 0x35, 0x0E, 0x72, 0x84, 0x14, 0xAB, 0xB8, 0x64, 0x4F, 0xD6, 0xCC, 0xB8, 0x69, 0x47, 0xC5, 0xE1, 0x05, 0x90, 0x21, 0x0A, 0x4F,
+    0x02, 0x08, 0x3E, 0x39, 0x79, 0xDA, 0x01, 0x48, 0x12, 0xF5, 0x9F, 0x11, 0xD5, 0x26, 0x30, 0xDA, 0x30, 0x13, 0x73, 0x27, 0xD1, 0x06, 0x49, 0xB0, 0xAA, 0x6E, 0x1C, 0x18, 0x1D, 0xB6, 0x17, 0xD7, 0xF2,
+    0x2E, 0xC4, 0x7B, 0x2C, 0x49, 0x54, 0xA4, 0x89, 0xAF, 0xC7, 0xBA, 0x48, 0x97, 0xED, 0xCD, 0xAE, 0x8C, 0xC3, 0x3B, 0x60, 0x45, 0x05, 0x99, 0xBD, 0x02, 0xC9, 0x63, 0x82, 0x90, 0x2A, 0xEF, 0x7F, 0x83, 0x2A,
+    0x0D, 0xE1, 0x8F, 0xD0, 0xFD, 0xD9, 0x1E, 0x7A, 0xF1, 0x9F, 0x1D, 0x8E, 0xE8, 0x73, 0x39, 0x38, 0xB1, 0xE8, 0xE7, 0xF6, 0xD2, 0x23, 0x16, 0x18, 0x10, 0x2F, 0xDB, 0x7F, 0xE5, 0x5F, 0xF1, 0x99, 0x17, 0x00,
+    0xCB, 0x89, 0x20, 0xF8, 0x7A, 0x6C, 0x75, 0xCF, 0xF3, 0x96, 0x27, 0xB5, 0x6E, 0x3E, 0xD1, 0x97, 0xC5, 0x52, 0xD2, 0x95, 0xA7, 0xCF, 0xC4, 0x6A, 0xFC, 0x25, 0x3B, 0x46, 0x52, 0xB1, 0xAF, 0x37, 0x95, 0xB1, 0x24, 0xAB, 0x6E
+};
 
+void testrun_aes128_eax(void){
+       uint8_t key[16];
+       uint8_t nonce[16];
+       uint8_t header[8];
+       uint8_t tag[16];
+       uint8_t msg[21];
+       uint8_t msg_len;
+       PGM_VOID_P msg_p;
+       PGM_VOID_P cipher_p;
+       uint8_t i, r;
+
+       bcal_eax_ctx_t ctx;
+
+       msg_p = eax_msg;
+       cipher_p = eax_cipher;
+       for(i=0; i<10; ++i){
+               cli_putstr_P(PSTR("\r\n\r\n** AES128-EAX-TEST #"));
+               cli_putc('0'+i);
+               cli_putstr_P(PSTR(" **"));
+
+               msg_len = pgm_read_byte(eax_msg_len+i);
+               memcpy_P(key, eax_key+16*i, 16);
+               memcpy_P(nonce, eax_nonce+16*i, 16);
+               memcpy_P(header, eax_header+8*i, 8);
+               memcpy_P(msg, msg_p, msg_len);
+               msg_p = (uint8_t*)msg_p+msg_len;
+
+               cli_putstr_P(PSTR("\r\n  key:     "));
+               cli_hexdump(key, 16);
+               cli_putstr_P(PSTR("\r\n  msg:     "));
+               if(msg_len){
+                       cli_hexdump(msg, msg_len);
+               }
+               cli_putstr_P(PSTR("\r\n  nonce:   "));
+               cli_hexdump(nonce, 16);
+               cli_putstr_P(PSTR("\r\n  header:  "));
+               cli_hexdump(header, 8);
+
+               r = bcal_eax_init(&aes128_desc, key, 128, &ctx);
+               cli_putstr_P(PSTR("\r\n  init = 0x"));
+               cli_hexdump(&r, 1);
+               if(r)
+                       return;
+               bcal_eax_loadNonce(nonce, 16*8, &ctx);
+               bcal_eax_addLastHeader(header, 8*8, &ctx);
+               bcal_eax_encLastBlock(msg, msg_len*8, &ctx);
+               bcal_eax_ctx2tag(tag, 128, &ctx);
 
-       startTimer(1);
-       aes192_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  cipher:  "));
+               cli_hexdump_block(msg, msg_len, 4, 16);
 
-       cli_putstr_P(PSTR("\r\n"));
+               cli_putstr_P(PSTR("\r\n  tag:     "));
+               cli_hexdump_block(tag, 16, 4, 16);
+
+               if(memcmp_P(msg, cipher_p, msg_len)){
+                       cli_putstr_P(PSTR("\r\n cipher:  [fail]\r\n  should: "));
+                       memcpy_P(msg, cipher_p, msg_len);
+                       cli_hexdump_block(msg, msg_len, 4, 16);
+               }else{
+                       cli_putstr_P(PSTR("\r\n cipher:  [pass]"));
+               }
+               cipher_p = ((uint8_t*)cipher_p)+msg_len;
+               // *
+               if(memcmp_P(tag, cipher_p, 16)){
+                       cli_putstr_P(PSTR("\r\n tag:     [fail]"));
+               }else{
+                       cli_putstr_P(PSTR("\r\n tag:     [pass]"));
+               }
+
+               cipher_p = ((uint8_t*)cipher_p)+16;
+               bcal_eax_free(&ctx);
+       }
 }
 
-
-void testrun_performance_aes256(void){
-       uint64_t t;
-       char str[16];
-       uint8_t key[32], data[16];
-       aes256_ctx_t ctx;
-
-       calibrateTimer();
-       print_overhead();
-
-       memset(key,  0, 32);
-       memset(data, 0, 16);
-
-       startTimer(1);
-       aes256_init(key, &ctx);
-       t = stopTimer();
-       cli_putstr_P(PSTR("\r\n\tctx-gen time: "));
-       ultoa((unsigned long)t, str, 10);
-       cli_putstr(str);
-
-
-       startTimer(1);
-       aes256_enc(data, &ctx);
-       t = stopTimer();
-       cli_putstr_P(PSTR("\r\n\tencrypt time: "));
-       ultoa((unsigned long)t, str, 10);
-       cli_putstr(str);
-
-
-       startTimer(1);
-       aes256_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_aes(void){
-       cli_putstr_P(PSTR("\r\n -=AES Performance Test=-\r\n"));
-       cli_putstr_P(PSTR("\r\n       AES-128\r\n"));
-       testrun_performance_aes128();
-       cli_putstr_P(PSTR("\r\n       AES-192\r\n"));
-       testrun_performance_aes192();
-       cli_putstr_P(PSTR("\r\n       AES-256\r\n"));
-       testrun_performance_aes256();
+       bcal_performance_multiple(algolist);
 }
+
 /*****************************************************************************
  *  main                                                                                                                                        *
  *****************************************************************************/
@@ -669,6 +660,7 @@ const char testctr_str[]      PROGMEM = "testctr";
 const char testcmac_str[]     PROGMEM = "testcmac";
 const char testcmac72_str[]   PROGMEM = "testcmac72";
 const char testcmac0_str[]    PROGMEM = "testcmac0";
+const char testeax_str[]      PROGMEM = "testeax";
 const char cmacvs_list_str[]  PROGMEM = "cmacvs_list";
 const char cmacvs_set_str[]   PROGMEM = "cmacvs_set";
 const char cmacvs_test1_str[] PROGMEM = "cmacvs_test1";
@@ -677,7 +669,7 @@ const char performance_str[]  PROGMEM = "performance";
 const char dump_str[]         PROGMEM = "dump";
 const char echo_str[]         PROGMEM = "echo";
 
-cmdlist_entry_t cmdlist[] PROGMEM = {
+const const cmdlist_entry_t cmdlist[] PROGMEM = {
        { nessie_str,          NULL, testrun_nessie_aes              },
        { test_str,            NULL, testrun_test_aes                },
        { testkey_str,         NULL, testrun_testkey_aes             },
@@ -689,6 +681,7 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
        { testcmac_str,        NULL, testrun_aes128_cmac             },
        { testcmac72_str,      NULL, testrun_aes128_cmac72           },
        { testcmac0_str,       NULL, testrun_aes192_cmac0            },
+       { testeax_str,         NULL, testrun_aes128_eax              },
        { cmacvs_list_str,     NULL, cmacvs_listalgos                },
        { cmacvs_set_str,  (void*)1, (void_fpt)cmacvs_setalgo        },
        { cmacvs_test1_str,    NULL, cmacvs_test1                    },
@@ -699,19 +692,16 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
        { NULL,                NULL, NULL                            }
 };
 
+int main(void) {
+       main_setup();
 
-int main (void){
-       DEBUG_INIT();
-
-       cli_rx = (cli_rx_fpt)uart0_getc;
-       cli_tx = (cli_tx_fpt)uart0_putc;
        cmacvs_algolist=(bcdesc_t**)algolist;
        cmacvs_algo=(bcdesc_t*)&aes128_desc;
+
        for(;;){
-               cli_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
-               cli_putstr(algo_name);
-               cli_putstr_P(PSTR(")\r\nloaded and running\r\n"));
+               welcome_msg(algo_name);
                cmd_interface(cmdlist);
-       }
+    }
+
 }