X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=blobdiff_plain;f=test_src%2Fmain-blake-test.c;h=3efab31f4e66c40bbc4cfb5ac52f620336e702d4;hp=316d1a074ca6fc2f9ec50de894b7bcc8f0d954e3;hb=4b5da1dc27a791b5c448274a3db09cd035b33493;hpb=ed07adb6f2aeaf61da0e482cec328120bfeb860e diff --git a/test_src/main-blake-test.c b/test_src/main-blake-test.c index 316d1a0..3efab31 100644 --- a/test_src/main-blake-test.c +++ b/test_src/main-blake-test.c @@ -1,7 +1,7 @@ /* main-blake-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 @@ -18,13 +18,10 @@ */ /* * blake test-suit - * + * */ -#include "config.h" -#include "serial-tools.h" -#include "uart.h" -#include "debug.h" +#include "main-test-common.h" #include "blake_small.h" #include "blake_large.h" @@ -34,22 +31,16 @@ #include "hfal-test.h" #include "hfal-performance.h" #include "shavs.h" -#include "cli.h" #include "nessie_hash_test.h" #include "performance_test.h" -#include -#include -#include +char *algo_name = "Blake"; -char* algo_name = "Blake"; - - -const hfdesc_t* algolist[] PROGMEM = { - (hfdesc_t*)&blake28_desc, - (hfdesc_t*)&blake32_desc, - (hfdesc_t*)&blake48_desc, - (hfdesc_t*)&blake64_desc, +const hfdesc_t *const algolist[] PROGMEM = { + (hfdesc_t*)&blake224_desc, + (hfdesc_t*)&blake256_desc, + (hfdesc_t*)&blake384_desc, + (hfdesc_t*)&blake512_desc, NULL }; @@ -60,42 +51,57 @@ const hfdesc_t* algolist[] PROGMEM = { void testrun_nessie_blake(void){ hfal_nessie_multiple(algolist); } -void blake28_test(void* msg, uint32_t length_b){ - hfal_test(&blake28_desc, msg, length_b); +void blake224_test(void *msg, uint32_t length_b){ + hfal_test(&blake224_desc, msg, length_b); } -void blake32_test(void* msg, uint32_t length_b){ - hfal_test(&blake32_desc, msg, length_b); +void blake256_test(void *msg, uint32_t length_b){ + hfal_test(&blake256_desc, msg, length_b); } -void blake48_test(void* msg, uint32_t length_b){ - hfal_test(&blake48_desc, msg, length_b); +void blake384_test(void *msg, uint32_t length_b){ + hfal_test(&blake384_desc, msg, length_b); } -void blake64_test(void* msg, uint32_t length_b){ - hfal_test(&blake64_desc, msg, length_b); +void blake512_test(void *msg, uint32_t length_b){ + hfal_test(&blake512_desc, msg, length_b); } void testrun_stdtest_blake(void){ - uint8_t msg1[144]; + uint8_t msg1[144]; memset(msg1, 0, 144); - blake28_test("", 8); - blake28_test(msg1, 576); - blake32_test("", 8); - blake32_test(msg1, 576); - blake48_test("", 8); - blake48_test(msg1, 1152); - blake64_test("", 8); - blake64_test(msg1, 1152); + blake224_test("", 0); + blake224_test("", 8); + blake224_test(msg1, 576); + blake256_test("", 0); + blake256_test("", 8); + blake256_test(msg1, 576); + blake384_test("", 0); + blake384_test("", 8); + blake384_test(msg1, 1152); + blake512_test("", 0); + blake512_test("", 8); + blake512_test(msg1, 1152); } void testshort(void){ - blake32_test("", 8); + blake256_test("", 8); } void testlshort(void){ - blake64_test("", 8); + blake512_test("", 8); } +void test512_32(void){ + uint8_t d[] = { 0xE9, 0x26, 0xAE, 0x8B, 0x0A, 0xF6, 0xE5, 0x31, + 0x76, 0xDB, 0xFF, 0xCC, 0x2A, 0x6B, 0x88, 0xC6, + 0xBD, 0x76, 0x5F, 0x93, 0x9D, 0x3D, 0x17, 0x8A, + 0x9B, 0xDE, 0x9E, 0xF3, 0xAA, 0x13, 0x1C, 0x61, + 0xE3, 0x1C, 0x1E, 0x42, 0xCD, 0xFA, 0xF4, 0xB4, + 0xDC, 0xDE, 0x57, 0x9A, 0x37, 0xE1, 0x50, 0xEF, + 0xBE, 0xF5, 0x55, 0x5B, 0x4C, 0x1C, 0xB4, 0x04, + 0x39, 0xD8, 0x35, 0xA7, 0x24, 0xE2, 0xFA, 0xE7 }; + blake256_test(d, 512); +} void performance_blake(void){ hfal_performance_multiple(algolist); @@ -110,41 +116,36 @@ const char nessie_str[] PROGMEM = "nessie"; const char test_str[] PROGMEM = "test"; const char testshort_str[] PROGMEM = "short"; const char testlshort_str[] PROGMEM = "lshort"; +const char test512_str[] PROGMEM = "test512"; const char performance_str[] PROGMEM = "performance"; 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_test3_str[] PROGMEM = "shavs_test3"; -cmdlist_entry_t cmdlist[] PROGMEM = { +const cmdlist_entry_t cmdlist[] PROGMEM = { { nessie_str, NULL, testrun_nessie_blake}, { test_str, NULL, testrun_stdtest_blake}, { testshort_str, NULL, testshort}, { testlshort_str, NULL, testlshort}, + { test512_str, NULL, test512_32}, { performance_str, NULL, performance_blake}, { shavs_list_str, NULL, shavs_listalgos}, { shavs_set_str, (void*)1, (void_fpt)shavs_setalgo}, { shavs_test1_str, NULL, shavs_test1}, + { shavs_test3_str, NULL, shavs_test3}, { echo_str, (void*)1, (void_fpt)echo_ctrl}, { NULL, NULL, NULL} }; int main (void){ - DEBUG_INIT(); - - cli_rx = uart_getc; - cli_tx = uart_putc; - shavs_algolist=(hfdesc_t**)algolist; - shavs_algo=(hfdesc_t*)&blake32_desc; + main_setup(); + + shavs_algolist=(hfdesc_t**)algolist; + shavs_algo=(hfdesc_t*)&blake256_desc; for(;;){ - cli_putstr_P(PSTR("\r\n\r\nCrypto-VS (")); - cli_putstr(algo_name); - cli_putstr_P(PSTR("; ")); - cli_putstr(__DATE__); - cli_putstr_P(PSTR(" ")); - cli_putstr(__TIME__); - cli_putstr_P(PSTR(")\r\nloaded and running\r\n")); - + welcome_msg(algo_name); cmd_interface(cmdlist); } -} +}