]> git.cryptolib.org Git - avr-crypto-lib.git/blobdiff - test_src/main-present-test.c
fixing some decryption bugs in GCM128
[avr-crypto-lib.git] / test_src / main-present-test.c
index 4c739bcd2f8436d20f215fcea0ee85af36e85cbc..226fcf7a4d62c351d9f34be5854503d7791c3286 100644 (file)
@@ -1,6 +1,6 @@
 /* main-present-test.c */
 /*
-    This file is part of the Crypto-avr-lib/microcrypt-lib.
+    This file is part of the AVR-Crypto-Lib.
     Copyright (C) 2008  Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
  * 
 */
 
-#include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
-#include "debug.h"
+#include "main-test-common.h"
 
-#include "present.h"
-#include "nessie_bc_test.h"
-#include "cli.h"
+#include <present80.h>
+#include <present128.h>
 #include "performance_test.h"
-
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
-
-char* cipher_name = "Present";
-
+#include "bcal-performance.h"
+#include "bcal-nessie.h"
+#include "bcal_present80.h"
+#include "bcal_present128.h"
+
+char *algo_name = "Present";
+
+const bcdesc_t *const algolist[] PROGMEM = {
+       (bcdesc_t*)&present80_desc,
+       (bcdesc_t*)&present128_desc,
+       NULL
+};
 /*****************************************************************************
  *  additional validation-functions                                                                                     *
  *****************************************************************************/
-void present_genctx_dummy(uint8_t* key, uint16_t keysize_b, present_ctx_t* ctx){
-       present_init(key, keysize_b, ctx);
+void testrun_nessie_present(void){
+       bcal_nessie_multiple(algolist);
 }
 
-void testrun_nessie_present(void){
-       nessie_bc_ctx.blocksize_B =   8;
-       nessie_bc_ctx.keysize_b   =  80;
-       nessie_bc_ctx.name        = cipher_name;
-       nessie_bc_ctx.ctx_size_B  = sizeof(present_ctx_t);
-       nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)present_enc;
-       nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)present_dec;
-       nessie_bc_ctx.cipher_genctx  = (nessie_bc_gen_fpt)present_genctx_dummy;
-       
-       nessie_bc_run();        
+void testrun_selfenc(uint8_t *key, uint8_t *buffer){
+
+       present80_ctx_t ctx;
+       cli_putstr_P(PSTR("\r\nkey   : "));
+       cli_hexdump(key, 10);
+       cli_putstr_P(PSTR("\r\nplain : "));
+       cli_hexdump(buffer, 8);
+       present80_init(key, 80, &ctx);
+       present80_enc(buffer, &ctx);
+       cli_putstr_P(PSTR("\r\ncipher: "));
+       cli_hexdump(buffer, 8);
+       present80_dec(buffer, &ctx);
+       cli_putstr_P(PSTR("\r\nplain : "));
+       cli_hexdump(buffer, 8);
+       cli_putstr_P(PSTR("\r\n"));
 }
 
-void testrun_selfenc(uint8_t* key, uint8_t* buffer){
-       present_ctx_t ctx;
-       uart_putstr_P(PSTR("\r\nkey   : "));
-       uart_hexdump(key, 10);
-       uart_putstr_P(PSTR("\r\nplain : "));
-       uart_hexdump(buffer, 8);
-       present_init(key, 80, &ctx);
-       present_enc(buffer, &ctx);
-       uart_putstr_P(PSTR("\r\ncipher: "));
-       uart_hexdump(buffer, 8);
-       present_dec(buffer, &ctx);
-       uart_putstr_P(PSTR("\r\nplain : "));
-       uart_hexdump(buffer, 8);
-       uart_putstr_P(PSTR("\r\n"));
+void testrun_selfenc_128(uint8_t *key, uint8_t *buffer){
+
+       present128_ctx_t ctx;
+       cli_putstr_P(PSTR("\r\nkey   : "));
+       cli_hexdump(key, 16);
+       cli_putstr_P(PSTR("\r\nplain : "));
+       cli_hexdump(buffer, 8);
+       present128_init(key, 128, &ctx);
+       present128_enc(buffer, &ctx);
+       cli_putstr_P(PSTR("\r\ncipher: "));
+       cli_hexdump(buffer, 8);
+       present128_dec(buffer, &ctx);
+       cli_putstr_P(PSTR("\r\nplain : "));
+       cli_hexdump(buffer, 8);
+       cli_putstr_P(PSTR("\r\n"));
 }
+// void present_key_test(const uint8_t *key);
+
 
 void testrun_self_present(void){
-       uint8_t buffer[8], key[10];
-       uart_putstr_P(PSTR("\r\n\r\n=== Testvectors from the paper ===\r\n"));
-       
-       memset(buffer, 0, 8);
-       memset(key, 0, 10);
-       testrun_selfenc(key, buffer);
-       
-       memset(buffer, 0, 8);
-       memset(key, 0xFF, 10);
-       testrun_selfenc(key, buffer);
-       
-       memset(buffer, 0xFF, 8);
-       memset(key, 0, 10);
-       testrun_selfenc(key, buffer);
-       
-       memset(buffer, 0xFF, 8);
-       memset(key, 0xFF, 10);
+       uint8_t buffer[8], key[10], i;
+       cli_putstr_P(PSTR("\r\n\r\n=== Testvectors from the paper ===\r\n"));
+       for(i=0; i<4; ++i){
+               memset(buffer, (i&2)?0xff:0x00,  8);
+               memset(key,    (i&1)?0xff:0x00, 10);
+               testrun_selfenc(key, buffer);
+       }
+       memset(buffer, 0x00,  8);
+       memset(key,    0x00, 10);
+       key[0] = 0x80;
        testrun_selfenc(key, buffer);
-       
+
+//     present_key_test(key);
+
+}
+
+void testrun_self_present_128(void){
+       uint8_t buffer[8], key[16], i;
+       cli_putstr_P(PSTR("\r\n\r\n=== Testvectors from the paper ===\r\n"));
+       for(i=0; i<4; ++i){
+               memset(buffer, (i&2)?0xff:0x00,  8);
+               memset(key,    (i&1)?0xff:0x00, 16);
+               testrun_selfenc_128(key, buffer);
+       }
+       memset(buffer, 0x00,  8);
+       memset(key,    0x00, 16);
+       key[0] = 0x80;
+       testrun_selfenc_128(key, buffer);
+
+//     present_key_test(key);
+
 }
 
 void testrun_performance_present(void){
-       uint64_t t;
-       uint8_t key[10], data[8];
-       present_ctx_t ctx;
-       
-       calibrateTimer();
-       print_overhead();
-       
-       memset(key,  0, 10);
-       memset(data, 0,  8);
-       
-       startTimer(1);
-       present_init(key, 80, &ctx);
-       t = stopTimer();
-       print_time_P(PSTR("\tctx-gen time: "),t);
-       
-       startTimer(1);
-       present_enc(data, &ctx);
-       t = stopTimer();
-       print_time_P(PSTR("\tencrypt time: "), t);
-       
-       startTimer(1);
-       present_dec(data, &ctx);
-       t = stopTimer();
-       print_time_P(PSTR("\tdecrypt time: "), t);
-       
-       uart_putstr_P(PSTR("\r\n"));
+       bcal_performance_multiple(algolist);
 }
 
 /*****************************************************************************
  *  main                                                                                                                                        *
  *****************************************************************************/
 
-int main (void){
-       char  str[20];
-       DEBUG_INIT();
-       uart_putstr("\r\n");
-
-       uart_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
-       uart_putstr(cipher_name);
-       uart_putstr_P(PSTR(")\r\nloaded and running\r\n"));
-
-       PGM_P    u   = PSTR("nessie\0test\0performance\0");
-       void_fpt v[] = {testrun_nessie_present, testrun_self_present, testrun_performance_present};
-
-       while(1){ 
-               if (!getnextwordn(str,20)){DEBUG_S("DBG: W1\r\n"); goto error;}
-               if(execcommand_d0_P(str, u, v)<0){
-                       uart_putstr_P(PSTR("\r\nunknown command\r\n"));
-               }
-               continue;
-       error:
-               uart_putstr("ERROR\r\n");
-       }
-       
+const char nessie_str[]      PROGMEM = "nessie";
+const char test_str[]        PROGMEM = "test";
+const char test_128_str[]    PROGMEM = "test-128";
+const char performance_str[] PROGMEM = "performance";
+const char echo_str[]        PROGMEM = "echo";
+
+const cmdlist_entry_t cmdlist[] PROGMEM = {
+       { nessie_str,      NULL, testrun_nessie_present},
+       { test_str,        NULL, testrun_self_present},
+       { test_128_str,    NULL, testrun_self_present_128},
+       { performance_str, NULL, testrun_performance_present},
+       { echo_str,    (void*)1, (void_fpt)echo_ctrl},
+       { NULL,            NULL, NULL}
+};
+
+int main(void) {
+       main_setup();
+
+       for(;;){
+               welcome_msg(algo_name);
+               cmd_interface(cmdlist);
+    }
+
 }