X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-sha1-test.c;h=44e8225c2cba310ad1043c13cc3abba12da5b11c;hb=44bd9d38e15d4b03486f4cf52dd9bbf2f97e6e17;hp=d1d819e3e49de2e9d2385adb18c1a43a5375ce9e;hpb=7b5401ab9ce23a5da1de8b6c7de3a1aa20ac4cf8;p=avr-crypto-lib.git

diff --git a/test_src/main-sha1-test.c b/test_src/main-sha1-test.c
index d1d819e..44e8225 100644
--- a/test_src/main-sha1-test.c
+++ b/test_src/main-sha1-test.c
@@ -28,20 +28,20 @@
 
 #include "sha1.h"
 #include "nessie_hash_test.h"
-#include "hfal/hfal_sha1.h"
-#include "hfal/hfal-performance.h"
+#include "hfal_sha1.h"
+#include "hfal-performance.h"
 
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
 #include "cli.h"
 #include "shavs.h"
-#include "hfal/hfal_sha1.h"
+#include "hfal_sha1.h"
 #include "dump.h"
 
 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);
@@ -194,7 +194,7 @@ 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},