make process changed and modularised

[avr-crypto-lib.git] / main-shabea-test.c

diff --git a/main-shabea-test.c b/main-shabea-test.c
index 1fde5095c208ff3dd60fcca3b3ebe78ca42f5dbb..fb9c87c6b08f168cebd3b3a9530b6361aeee2168 100644 (file)
--- a/main-shabea-test.c
+++ b/main-shabea-test.c
@@ -30,11 +30,11 @@ void testencrypt(uint8_t* block, uint8_t* key){
        uart_putstr("\r\n==testy-encrypt==\r\n key: ");
        uart_hexdump(key,16);
        uart_putstr("\r\n plain: ");
-       uart_hexdump(block,16);
+       uart_hexdump(block,32);
        _delay_ms(50);
-       shabea128(block,key,128,1,16);
+       shabea256(block,key,128,1,16);
        uart_putstr("\r\n crypt: ");
-       uart_hexdump(block,16);
+       uart_hexdump(block,32);
 }
 
 void testdecrypt(uint8_t* block, uint8_t* key){
@@ -42,11 +42,11 @@ void testdecrypt(uint8_t* block, uint8_t* key){
        uart_putstr("\r\n==testy-decrypt==\r\n key: ");
        uart_hexdump(key,16);
        uart_putstr("\r\n crypt: ");
-       uart_hexdump(block,16);
+       uart_hexdump(block,32);
        _delay_ms(50);
-       shabea128(block,key,128,0,16);
+       shabea256(block,key,128,0,16);
        uart_putstr("\r\n plain: ");
-       uart_hexdump(block,16);
+       uart_hexdump(block,32);
 }
 
 void testrun_shabea(void){
@@ -60,14 +60,22 @@ void testrun_shabea(void){
                  { 0x28, 0xDB, 0xC3, 0xBC, 0x49, 0xFF, 0xD8, 0x7D,
                        0xCF, 0xA5, 0x09, 0xB1, 0x1D, 0x42, 0x2B, 0xE7,}
                };
-       uint8_t datas[4][16]=
+       uint8_t datas[4][32]=
                { {     0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-                       0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f },
+                       0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+                       0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+                       0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f },
                  {     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
                  { 0x83, 0xA2, 0xF8, 0xA2, 0x88, 0x64, 0x1F, 0xB9, 
+                       0xA4, 0xE9, 0xA5, 0xCC, 0x2F, 0x13, 0x1C, 0x7D,
+                       0x83, 0xA2, 0xF8, 0xA2, 0x88, 0x64, 0x1F, 0xB9, 
                        0xA4, 0xE9, 0xA5, 0xCC, 0x2F, 0x13, 0x1C, 0x7D },
                  { 0xB4, 0x1E, 0x6B, 0xE2, 0xEB, 0xA8, 0x4A, 0x14, 
+                       0x8E, 0x2E, 0xED, 0x84, 0x59, 0x3C, 0x5E, 0xC7,
+                       0xB4, 0x1E, 0x6B, 0xE2, 0xEB, 0xA8, 0x4A, 0x14, 
                        0x8E, 0x2E, 0xED, 0x84, 0x59, 0x3C, 0x5E, 0xC7 }
                };
        uint8_t i=0;