X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=blobdiff_plain;f=test_src%2Fmain-skipjack-test.c;h=d95d9eb03b9194bf71603ad0ef0144cbaf7d3176;hp=7c3dd9de198d6026ca5646373d25b8c8dd407742;hb=4b5da1dc27a791b5c448274a3db09cd035b33493;hpb=d1181933dc28db92d787cf5604e2fc96ab0d8f9f

diff --git a/test_src/main-skipjack-test.c b/test_src/main-skipjack-test.c
index 7c3dd9d..d95d9eb 100644
--- a/test_src/main-skipjack-test.c
+++ b/test_src/main-skipjack-test.c
@@ -1,7 +1,7 @@
 /* main-skipjack-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
@@ -21,34 +21,25 @@
  * 
 */
 
-#include "config.h"
-
-#include "uart_i.h"
-#include "debug.h"
+#include "main-test-common.h"
 
 #include "skipjack.h"
 #include "nessie_bc_test.h"
-#include "cli.h"
 #include "performance_test.h"
 #include "bcal-performance.h"
 #include "bcal-nessie.h"
 #include "bcal_skipjack.h"
 
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-
-
-char* algo_name = "Skipjack";
+char *algo_name = "Skipjack";
 
-const bcdesc_t* algolist[] PROGMEM = {
+const bcdesc_t *const algolist[] PROGMEM = {
 	(bcdesc_t*)&skipjack_desc,
 	NULL
 };
 /*****************************************************************************
  *  additional validation-functions											 *
  *****************************************************************************/
-void skipjack_genctx_dummy(uint8_t* key, uint16_t keysize, void* ctx){
+void skipjack_genctx_dummy(uint8_t *key, uint16_t keysize, void *ctx){
 	memcpy(ctx, key, 10);
 }
 
@@ -61,11 +52,59 @@ void testrun_performance_skipjack(void){
 	bcal_performance_multiple(algolist);
 }
 
+int test_enc(const void *buffer, void *key){
+	uint8_t data[8];
+	int r;
+	memcpy(data, buffer, 8);
+	skipjack_enc(data, key);
+	cli_putstr_P(PSTR("  key = "));
+	cli_hexdump(key, 10);
+	cli_putstr_P(PSTR(" plaintext = "));
+	cli_hexdump(buffer, 8);
+	cli_putstr_P(PSTR(" ciphertext = "));
+	cli_hexdump(data, 8);
+	skipjack_dec(data, key);
+	r = memcmp(data, buffer, 8);
+	cli_putstr_P(PSTR(" decrypt: "));
+	if(r){
+		cli_putstr_P(PSTR("fail"));
+	}else{
+		cli_putstr_P(PSTR("ok"));
+	}
+	return r;
+}
+
+void testrun_nist_vectors(void){
+	uint8_t key[10];
+	uint8_t data[8];
+	uint8_t i;
+
+	cli_putstr_P(PSTR("\r\n\r\n=== NIST vectors run 1 ==="));
+	memset(key, 0, 10);
+	for(i=0; i<64; ++i){
+		memset(data, 0, 8);
+		data[i>>3] |= 0x80 >> (i & 7);
+		cli_putstr_P(PSTR("\r\n round: 0x"));
+		cli_hexdump_byte(i);
+		test_enc(data, key);
+	}
+
+	cli_putstr_P(PSTR("\r\n\r\n=== NIST vectors run 2 ==="));
+	memset(data, 0, 8);
+	for(i=0; i<80; ++i){
+                memset(key, 0, 10);
+                key[i>>3] |= 0x80 >> (i & 7);
+                cli_putstr_P(PSTR("\r\n round: 0x"));
+                cli_hexdump_byte(i);
+                test_enc(data, key);
+        }
+}
+
 /*****************************************************************************
  *  self tests																 *
  *****************************************************************************/
 
-void testencrypt(uint8_t* block, uint8_t* key){
+void testencrypt(uint8_t *block, uint8_t *key){
 	cli_putstr("\r\n==testy-encrypt==\r\n key: ");
 	cli_hexdump(key,10);
 	cli_putstr("\r\n plain: ");
@@ -75,7 +114,7 @@ void testencrypt(uint8_t* block, uint8_t* key){
 	cli_hexdump(block,8);
 }
 
-void testdecrypt(uint8_t* block, uint8_t* key){
+void testdecrypt(uint8_t *block, uint8_t *key){
 	cli_putstr("\r\n==testy-decrypt==\r\n key: ");
 	cli_hexdump(key,10);
 	cli_putstr("\r\n crypt: ");
@@ -113,26 +152,24 @@ void testrun_skipjack(void){
 
 const char nessie_str[]      PROGMEM = "nessie";
 const char test_str[]        PROGMEM = "test";
+const char nist_str[]        PROGMEM = "nist";
 const char performance_str[] PROGMEM = "performance";
 const char echo_str[]        PROGMEM = "echo";
 
-cmdlist_entry_t cmdlist[] PROGMEM = {
+const cmdlist_entry_t cmdlist[] PROGMEM = {
 	{ nessie_str,      NULL, testrun_nessie_skipjack},
 	{ test_str,        NULL, testrun_skipjack},
+	{ nist_str,        NULL, testrun_nist_vectors},
 	{ performance_str, NULL, testrun_performance_skipjack},
 	{ echo_str,    (void*)1, (void_fpt)echo_ctrl},
 	{ NULL,            NULL, NULL}
 };
 
 int main (void){
-	DEBUG_INIT();
-	
-	cli_rx = (cli_rx_fpt)uart0_getc;
-	cli_tx = (cli_tx_fpt)uart0_putc;	 	
-	for(;;){
-		cli_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
-		cli_putstr(algo_name);
-		cli_putstr_P(PSTR(")\r\nloaded and running\r\n"));
-		cmd_interface(cmdlist);
+    main_setup();
+
+    for(;;){
+        welcome_msg(algo_name);
+        cmd_interface(cmdlist);
 	}
 }