backporting uart_i and cli

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

diff --git a/test_src/main-groestl-test.c b/test_src/main-groestl-test.c
index a4deb454c39468bff2ac4972691718da33750e6c..545f4eb2eca48848ecd584117a2687a8a49cded9 100644 (file)
--- a/test_src/main-groestl-test.c
+++ b/test_src/main-groestl-test.c
@@ -23,13 +23,13 @@
 
 #include "config.h"
 #include "serial-tools.h"
-#include "uart.h"
+#include "uart_i.h"
 #include "debug.h"
 
 #include "groestl_small.h"
-//#include "groestl_large.h"
+#include "groestl_large.h"
 #include "hfal_groestl_small.h"
-//#include "hfal_groestl_large.h"
+#include "hfal_groestl_large.h"
 #include "hfal-nessie.h"
 #include "hfal-test.h"
 #include "hfal-performance.h"
@@ -48,8 +48,8 @@ char* algo_name = "Groestl";
 const hfdesc_t* algolist[] PROGMEM = {
        (hfdesc_t*)&groestl224_desc,
        (hfdesc_t*)&groestl256_desc,
-//     (hfdesc_t*)&groestl384_desc,
-//     (hfdesc_t*)&groestl512_desc,
+       (hfdesc_t*)&groestl384_desc,
+       (hfdesc_t*)&groestl512_desc,
        NULL
 };
 
@@ -67,7 +67,7 @@ void groestl224_test(void* msg, uint32_t length_b){
 void groestl256_test(void* msg, uint32_t length_b){
        hfal_test(&groestl256_desc, msg, length_b);
 }
-/*
+
 void groestl384_test(void* msg, uint32_t length_b){
        hfal_test(&groestl384_desc, msg, length_b);
 }
@@ -75,7 +75,7 @@ void groestl384_test(void* msg, uint32_t length_b){
 void groestl512_test(void* msg, uint32_t length_b){
        hfal_test(&groestl512_desc, msg, length_b);
 }
-*/
+
 
 void testrun_stdtest_groestl(void){
        uint8_t msg1[144]; 
@@ -84,12 +84,10 @@ void testrun_stdtest_groestl(void){
        groestl224_test(msg1, 576);
        groestl256_test("", 8);
        groestl256_test(msg1, 576);
-/*
        groestl384_test("", 8);
        groestl384_test(msg1, 1152);
        groestl512_test("", 8);
        groestl512_test(msg1, 1152);
-*/
 }
 
 void testshort(void){
@@ -97,7 +95,7 @@ void testshort(void){
 }
 
 void testlshort(void){
-//     groestl512_test("", 8);
+       groestl512_test("abc", 24);
 }
 
 
@@ -136,8 +134,8 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
 int main (void){
        DEBUG_INIT();
        
-       cli_rx = uart_getc;
-       cli_tx = uart_putc;             
+       cli_rx = (cli_rx_fpt)uart0_getc;
+       cli_tx = (cli_tx_fpt)uart0_putc;                
        shavs_algolist=(hfdesc_t**)algolist;
        shavs_algo=(hfdesc_t*)&groestl256_desc;
        for(;;){