fixing some decryption bugs in GCM128

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

diff --git a/test_src/main-present-test.c b/test_src/main-present-test.c
index 442e14237d62f1954c13ba50abfdf630abd8def1..226fcf7a4d62c351d9f34be5854503d7791c3286 100644 (file)
--- a/test_src/main-present-test.c
+++ b/test_src/main-present-test.c
@@ -21,27 +21,19 @@
  * 
 */
 
-#include "config.h"
-
-#include "uart_i.h"
-#include "debug.h"
+#include "main-test-common.h"
 
 #include <present80.h>
 #include <present128.h>
-#include "cli.h"
 #include "performance_test.h"
 #include "bcal-performance.h"
 #include "bcal-nessie.h"
 #include "bcal_present80.h"
 #include "bcal_present128.h"
 
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
-
-char* algo_name = "Present";
+char *algo_name = "Present";
 
-const bcdesc_t* const algolist[] PROGMEM = {
+const bcdesc_t *const algolist[] PROGMEM = {
        (bcdesc_t*)&present80_desc,
        (bcdesc_t*)&present128_desc,
        NULL
@@ -53,7 +45,7 @@ void testrun_nessie_present(void){
        bcal_nessie_multiple(algolist);
 }
 
-void testrun_selfenc(uint8_t* key, uint8_t* buffer){
+void testrun_selfenc(uint8_t *key, uint8_t *buffer){
 
        present80_ctx_t ctx;
        cli_putstr_P(PSTR("\r\nkey   : "));
@@ -70,7 +62,7 @@ void testrun_selfenc(uint8_t* key, uint8_t* buffer){
        cli_putstr_P(PSTR("\r\n"));
 }
 
-void testrun_selfenc_128(uint8_t* key, uint8_t* buffer){
+void testrun_selfenc_128(uint8_t *key, uint8_t *buffer){
 
        present128_ctx_t ctx;
        cli_putstr_P(PSTR("\r\nkey   : "));
@@ -86,7 +78,7 @@ void testrun_selfenc_128(uint8_t* key, uint8_t* buffer){
        cli_hexdump(buffer, 8);
        cli_putstr_P(PSTR("\r\n"));
 }
-// void present_key_test(const uint8_t* key);
+// void present_key_test(const uint8_t *key);
 
 
 void testrun_self_present(void){
@@ -146,15 +138,12 @@ const cmdlist_entry_t cmdlist[] PROGMEM = {
        { NULL,            NULL, NULL}
 };
 
-int main (void){
-       DEBUG_INIT();
-       
-       cli_rx = (cli_rx_fpt)uart0_getc;
-       cli_tx = (cli_tx_fpt)uart0_putc;                
+int main(void) {
+       main_setup();
+
        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);
-       }
+    }
+
 }