fixing bug introduced during transition to main-test-common.{c,h}

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

diff --git a/test_src/main-sha1-test.c b/test_src/main-sha1-test.c
index c68c759d452dcb877e9e56b3f58b42652d2486a8..44e8225c2cba310ad1043c13cc3abba12da5b11c 100644 (file)
--- a/test_src/main-sha1-test.c
+++ b/test_src/main-sha1-test.c
@@ -41,7 +41,7 @@
 
 char* algo_name = "SHA-1";
 
-const hfdesc_t* algolist[] PROGMEM = {
+const hfdesc_t* const algolist[] PROGMEM = {
        (hfdesc_t*)&sha1_desc,
        NULL
 };
@@ -77,10 +77,10 @@ void sha1_ctx_dump(sha1_ctx_t *s){
 }
 
 void testrun_sha1(void){
-       sha1_hash_t hash;
+       uint8_t hash[20];
        sha1(&hash,"abc",3*8);
        cli_putstr_P(PSTR("\r\nsha1(\"abc\") = \r\n\t"));
-       cli_hexdump(hash,SHA1_HASH_BITS/8);
+       cli_hexdump(hash, SHA1_HASH_BITS/8);
 
        sha1(&hash,"\0\0\0\0\0\0\0\0", 8*8);
        cli_putstr_P(PSTR("\r\nsha1(8 x 0x00) = \r\n\t"));
@@ -126,7 +126,7 @@ void testrun_sha1(void){
 
 void testrun_sha1_2(void){
        sha1_ctx_t ctx;
-       sha1_hash_t hash;
+       uint8_t hash[20];
        sha1(&hash,"",0);
        cli_putstr_P(PSTR("\r\nsha1(NULL) = \r\n\t"));
        cli_hexdump(hash,SHA1_HASH_BYTES);
@@ -159,7 +159,7 @@ void testrun_sha1_506(void){
                0x72, 0x22, 0x46, 0xb0, 0x14, 0xaf, 0x03, 0xef,
                0x3b, 0xa3, 0x13, 0x64, 0xfc, 0x73, 0x2a, 0x4a,
                0xb8, 0xf3, 0x85, 0x87 };
-       sha1_hash_t hash;
+       uint8_t hash[20];
        sha1(&hash,data,506);
        cli_putstr_P(PSTR("\r\nsha1(<tv506>) = \r\n\t"));
        cli_hexdump(hash,SHA1_HASH_BYTES);
@@ -190,10 +190,11 @@ const char echo_str[]        PROGMEM = "echo";
 const char shavs_list_str[]  PROGMEM = "shavs_list";
 const char shavs_set_str[]   PROGMEM = "shavs_set";
 const char shavs_test1_str[] PROGMEM = "shavs_test1";
+const char shavs_test2_str[] PROGMEM = "shavs_test2";
 const char dump_str[]        PROGMEM = "dump";
 
 
-cmdlist_entry_t cmdlist[] PROGMEM = {
+const cmdlist_entry_t cmdlist[] PROGMEM = {
        { nessie_str,          NULL, testrun_nessie_sha1},
        { test_str,            NULL, testrun_sha1},
        { test2_str,           NULL, testrun_sha1_2},
@@ -203,6 +204,7 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
        { shavs_list_str,      NULL, shavs_listalgos},
        { shavs_set_str,   (void*)1, (void_fpt)shavs_setalgo},
        { shavs_test1_str,     NULL, shavs_test1},
+       { shavs_test2_str,     NULL, shavs_test2},
        { dump_str,        (void*)1, (void_fpt)dump},
        { NULL,                NULL, NULL}
 };