X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=blobdiff_plain;f=test_src%2Fmain-bmw-test.c;h=3228817a9358008dddcda6d5f0b3901f83e7d803;hp=c76dc06d3a85a1ee514189d56b8e35fe52cea9b5;hb=27e7d731ffb22116dba8c67cead51829d8ebe137;hpb=bd9d6731486cac11f6b294b3c84681eb65947f3d

diff --git a/test_src/main-bmw-test.c b/test_src/main-bmw-test.c
index c76dc06..3228817 100644
--- a/test_src/main-bmw-test.c
+++ b/test_src/main-bmw-test.c
@@ -18,7 +18,7 @@
 */
 /*
  * BlueMidnightWish test-suit
- * 
+ *
 */
 
 #include "config.h"
@@ -72,7 +72,6 @@ void bmw224_test(void* msg, uint32_t length_b){
 void bmw256_test(void* msg, uint32_t length_b){
 	hfal_test(&bmw256_desc, msg, length_b);
 }
-
 void bmw384_test(void* msg, uint32_t length_b){
 	hfal_test(&bmw384_desc, msg, length_b);
 }
@@ -81,9 +80,37 @@ void bmw512_test(void* msg, uint32_t length_b){
 	hfal_test(&bmw512_desc, msg, length_b);
 }
 
+void test506(void){
+	/* Testvector of length = 506 from short KAT */
+	uint8_t v[] = {
+		0xB9, 0xE3, 0xE2, 0x75, 0x5E, 0xD1, 0x21, 0x53,
+		0x81, 0xB2, 0x45, 0x57, 0xEE, 0x14, 0xF8, 0xCD,
+		0x26, 0x87, 0xA0, 0x71, 0xAE, 0xB3, 0xC7, 0x4F,
+		0x42, 0x1C, 0xFE, 0xA3, 0xCF, 0xF8, 0xA6, 0xEA,
+		0x0D, 0x4B, 0xDA, 0x2A, 0xD4, 0xBD, 0x82, 0x43,
+		0xCB, 0xA7, 0x2B, 0x48, 0x1C, 0xBD, 0x52, 0x6E,
+		0x1E, 0xFA, 0x1D, 0x9F, 0xD4, 0x32, 0xB9, 0x87,
+		0xE8, 0x12, 0x65, 0x82, 0x44, 0x29, 0xBA, 0xC0 };
+	bmw512_test(v, 506);
+}
+
+void test507(void){
+	/* Testvector of length = 506 from short KAT */
+	uint8_t v[] = {
+		0xE8, 0x33, 0x25, 0x35, 0xE9, 0xA2, 0x05, 0x24,
+		0x67, 0xA1, 0x02, 0x05, 0xC8, 0x70, 0x00, 0xBF,
+		0xC6, 0xA6, 0x8D, 0x73, 0x96, 0x2E, 0x69, 0xE4,
+		0xE5, 0x6F, 0x10, 0xBC, 0x79, 0xC6, 0x33, 0xC5,
+		0x2F, 0x4D, 0x00, 0x74, 0xD6, 0x07, 0x75, 0x95,
+		0xB6, 0x60, 0x07, 0x2E, 0x10, 0x74, 0x0D, 0xFA,
+		0x66, 0xBC, 0x13, 0x20, 0x46, 0x9A, 0x31, 0x96,
+		0xE0, 0x21, 0xE1, 0x32, 0x7C, 0xC0, 0x3A, 0xE0 };
+	bmw512_test(v, 507);
+}
+
 void testrun_stdtest_bmw(void){
 	char* msg0 = "abc";
-	char* msg1 = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"; 
+	char* msg1 = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq";
 	bmw224_test(msg0, strlen(msg0)*8);
 	bmw224_test(msg1, strlen(msg1)*8);
 	bmw256_test(msg0, strlen(msg0)*8);
@@ -94,6 +121,11 @@ void testrun_stdtest_bmw(void){
 	bmw512_test(msg1, strlen(msg1)*8);
 }
 
+void bmw256_short_test(void* msg, uint32_t length_b){
+	bmw256_test("abc", 3*8);
+}
+
+
 void testshort(void){
 	char* msg0 = "abc";
 	bmw224_test(msg0, strlen(msg0)*8);
@@ -110,6 +142,12 @@ void testlshort(void){
 
 const char nessie_str[]      PROGMEM = "nessie";
 const char test_str[]        PROGMEM = "test";
+const char test224_str[]     PROGMEM = "test224";
+const char test256_str[]     PROGMEM = "test256";
+const char test384_str[]     PROGMEM = "test384";
+const char test512_str[]     PROGMEM = "test512";
+const char test506_str[]     PROGMEM = "506";
+const char test507_str[]     PROGMEM = "507";
 const char testshort_str[]   PROGMEM = "short";
 const char testlshort_str[]  PROGMEM = "lshort";
 const char performance_str[] PROGMEM = "performance";
@@ -123,6 +161,8 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
 	{ test_str,            NULL, testrun_stdtest_bmw},
 	{ testshort_str,       NULL, testshort},
 	{ testlshort_str,      NULL, testlshort},
+	{ test506_str,         NULL, test506},
+	{ test507_str,         NULL, test507},
 	{ performance_str,     NULL, performance_bmw},
 	{ shavs_list_str,      NULL, shavs_listalgos},
 	{ shavs_set_str,   (void*)1, (void_fpt)shavs_setalgo},
@@ -133,9 +173,9 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
 
 int main (void){
 	DEBUG_INIT();
-	
+
 	cli_rx = (cli_rx_fpt)uart0_getc;
-	cli_tx = (cli_tx_fpt)uart0_putc;	 	
+	cli_tx = (cli_tx_fpt)uart0_putc;
 	shavs_algolist=(hfdesc_t**)algolist;
 	shavs_algo=(hfdesc_t*)&bmw256_desc;
 	for(;;){
@@ -146,7 +186,7 @@ int main (void){
 		cli_putstr_P(PSTR(" "));
 		cli_putstr(__TIME__);
 		cli_putstr_P(PSTR(")\r\nloaded and running\r\n"));
-		
+
 		cmd_interface(cmdlist);
 	}
-}	
+}