+skipjack

diff --git a/Makefile b/Makefile
index 1dbe4e8116933cbd4e8258dc22702676513130e5..43a45c7547050ac5d4ff1ba9ba3cd9423f568e1b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
-PRG        = sha1
+PRG        = skipjack
 # cryptotest
-OBJ        = main-sha1-test.o debug.o uart.o serial-tools.o sha1-asm.o
+OBJ        = main-skipjack-test.o debug.o uart.o serial-tools.o skipjack.o
+# main-sha1-test.o debug.o uart.o serial-tools.o sha1-asm.o
 # main-md5-test.o debug.o uart.o serial-tools.o md5.o
 # main-cast5-test.o debug.o uart.o serial-tools.o cast5.o
 # main.o debug.o uart.o serial-tools.o sha256-asm.o xtea-asm.o arcfour-asm.o prng.o cast5.o

diff --git a/config.h b/config.h
index a416ef04c3f2f240f814083bc75031011302989c..f7013d3b1382484013139489e1606b70c566d002 100644 (file)
--- a/config.h
+++ b/config.h
@@ -2,7 +2,7 @@
 #define __CONFIG_H__
 #include <avr/io.h>
 
-#define F_CPU 8000000         // Oszillator-Frequenz in Hz
+#define F_CPU 16000000         // Oszillator-Frequenz in Hz
 
 #define DEBUG uart
 

diff --git a/main-skipjack-test.c b/main-skipjack-test.c
new file mode 100644 (file)
index 0000000..9b71a56
--- /dev/null
+++ b/main-skipjack-test.c
@@ -0,0 +1,80 @@
+/*
+ * skipjack test-suit
+ * 
+*/
+
+#include "config.h"
+#include "serial-tools.h"
+#include "uart.h"
+#include "debug.h"
+
+#include "skipjack.h"
+
+#include <stdint.h>
+#include <string.h>
+
+
+/*****************************************************************************
+ *  additional validation-functions                                                                                     *
+ *****************************************************************************/
+
+/*****************************************************************************
+ *  self tests                                                                                                                          *
+ *****************************************************************************/
+
+void testencrypt(uint8_t* block, uint8_t* key){
+       uart_putstr("\r\n==testy-encrypt==\r\n key: ");
+       uart_hexdump(key,10);
+       uart_putstr("\r\n plain: ");
+       uart_hexdump(block,8);
+       skipjack_enc(block,key);
+       uart_putstr("\r\n crypt: ");
+       uart_hexdump(block,8);
+}
+
+void testdecrypt(uint8_t* block, uint8_t* key){
+       uart_putstr("\r\n==testy-decrypt==\r\n key: ");
+       uart_hexdump(key,10);
+       uart_putstr("\r\n crypt: ");
+       uart_hexdump(block,8);
+       skipjack_dec(block,key);
+       uart_putstr("\r\n plain: ");
+       uart_hexdump(block,8);
+}
+
+void testrun_skipjack(void){
+       uint8_t key[]={ 0x00, 0x99, 0x88, 0x77, 0x66,
+                                       0x55, 0x44, 0x33, 0x22, 0x11};
+       uint8_t data[]={ 0x33, 0x22, 0x11, 0x00, 0xdd, 0xcc, 0xbb, 0xaa};
+       testencrypt(data,key);
+       testdecrypt(data,key);  
+}
+
+
+
+/*****************************************************************************
+ *  main                                                                                                                                        *
+ *****************************************************************************/
+
+int main (void){
+       char str[20];
+
+       DEBUG_INIT();
+       uart_putstr("\r\n");
+
+       uart_putstr("\r\n\r\nCrypto-VS (skipjack)\r\nloaded and running\r\n");
+
+restart:
+       while(1){ 
+               if (!getnextwordn(str,20))  {DEBUG_S("DBG: W1\r\n"); goto error;}
+               if (strcmp(str, "test")) {DEBUG_S("DBG: 1b\r\n"); goto error;}
+                       testrun_skipjack();
+               goto restart;           
+               continue;
+       error:
+               uart_putstr("ERROR\r\n");
+       }
+       
+       
+}
+

diff --git a/skipjack.c b/skipjack.c
new file mode 100644 (file)
index 0000000..36792d7
--- /dev/null
+++ b/skipjack.c
@@ -0,0 +1,158 @@
+/**
+ * 
+ * 
+ * 
+ * 
+ * 
+ * 
+ */
+
+
+#include <stdint.h>
+#include <avr/io.h>
+#include <avr/pgmspace.h>
+
+/*****************************************************************************/
+
+uint8_t skipjack_ftable[] PROGMEM ={ 
+       0xa3, 0xd7, 0x09, 0x83, 0xf8, 0x48, 0xf6, 0xf4, 
+       0xb3, 0x21, 0x15, 0x78, 0x99, 0xb1, 0xaf, 0xf9, 
+       0xe7, 0x2d, 0x4d, 0x8a, 0xce, 0x4c, 0xca, 0x2e, 
+       0x52, 0x95, 0xd9, 0x1e, 0x4e, 0x38, 0x44, 0x28, 
+       0x0a, 0xdf, 0x02, 0xa0, 0x17, 0xf1, 0x60, 0x68, 
+       0x12, 0xb7, 0x7a, 0xc3, 0xe9, 0xfa, 0x3d, 0x53, 
+       0x96, 0x84, 0x6b, 0xba, 0xf2, 0x63, 0x9a, 0x19, 
+       0x7c, 0xae, 0xe5, 0xf5, 0xf7, 0x16, 0x6a, 0xa2, 
+       0x39, 0xb6, 0x7b, 0x0f, 0xc1, 0x93, 0x81, 0x1b, 
+       0xee, 0xb4, 0x1a, 0xea, 0xd0, 0x91, 0x2f, 0xb8, 
+       0x55, 0xb9, 0xda, 0x85, 0x3f, 0x41, 0xbf, 0xe0, 
+       0x5a, 0x58, 0x80, 0x5f, 0x66, 0x0b, 0xd8, 0x90, 
+       0x35, 0xd5, 0xc0, 0xa7, 0x33, 0x06, 0x65, 0x69, 
+       0x45, 0x00, 0x94, 0x56, 0x6d, 0x98, 0x9b, 0x76, 
+       0x97, 0xfc, 0xb2, 0xc2, 0xb0, 0xfe, 0xdb, 0x20, 
+       0xe1, 0xeb, 0xd6, 0xe4, 0xdd, 0x47, 0x4a, 0x1d, 
+       0x42, 0xed, 0x9e, 0x6e, 0x49, 0x3c, 0xcd, 0x43, 
+       0x27, 0xd2, 0x07, 0xd4, 0xde, 0xc7, 0x67, 0x18, 
+       0x89, 0xcb, 0x30, 0x1f, 0x8d, 0xc6, 0x8f, 0xaa, 
+       0xc8, 0x74, 0xdc, 0xc9, 0x5d, 0x5c, 0x31, 0xa4, 
+       0x70, 0x88, 0x61, 0x2c, 0x9f, 0x0d, 0x2b, 0x87, 
+       0x50, 0x82, 0x54, 0x64, 0x26, 0x7d, 0x03, 0x40, 
+       0x34, 0x4b, 0x1c, 0x73, 0xd1, 0xc4, 0xfd, 0x3b, 
+       0xcc, 0xfb, 0x7f, 0xab, 0xe6, 0x3e, 0x5b, 0xa5, 
+       0xad, 0x04, 0x23, 0x9c, 0x14, 0x51, 0x22, 0xf0, 
+       0x29, 0x79, 0x71, 0x7e, 0xff, 0x8c, 0x0e, 0xe2, 
+       0x0c, 0xef, 0xbc, 0x72, 0x75, 0x6f, 0x37, 0xa1, 
+       0xec, 0xd3, 0x8e, 0x62, 0x8b, 0x86, 0x10, 0xe8, 
+       0x08, 0x77, 0x11, 0xbe, 0x92, 0x4f, 0x24, 0xc5, 
+       0x32, 0x36, 0x9d, 0xcf, 0xf3, 0xa6, 0xbb, 0xac, 
+       0x5e, 0x6c, 0xa9, 0x13, 0x57, 0x25, 0xb5, 0xe3, 
+       0xbd, 0xa8, 0x3a, 0x01, 0x05, 0x59, 0x2a, 0x46
+};
+
+/*****************************************************************************/
+
+uint16_t skipjack_g(uint16_t g, uint8_t k, uint8_t *key){
+       #define G1 (((uint8_t*)&g)[0])
+       #define G2 (((uint8_t*)&g)[1])
+       /* this could also be rolled up */
+       G1 ^= pgm_read_byte_near(&(skipjack_ftable[G2 ^ key[(4*k+0)%10]]));
+       G2 ^= pgm_read_byte_near(&(skipjack_ftable[G1 ^ key[(4*k+1)%10]]));
+       G1 ^= pgm_read_byte_near(&(skipjack_ftable[G2 ^ key[(4*k+2)%10]]));
+       G2 ^= pgm_read_byte_near(&(skipjack_ftable[G1 ^ key[(4*k+3)%10]]));
+       return g;       
+}
+
+/*****************************************************************************/
+
+uint16_t skipjack_g_inv(uint16_t g, uint8_t k, uint8_t *key){
+//     #define G1 (((uint8_t)&g)[1])
+//     #define G2 (((uint8_t)&g)[0])
+       /* this could also be rolled up */
+       G2 ^= pgm_read_byte_near(&(skipjack_ftable[G1 ^ key[(4*k+3)%10]]));
+       G1 ^= pgm_read_byte_near(&(skipjack_ftable[G2 ^ key[(4*k+2)%10]]));
+       G2 ^= pgm_read_byte_near(&(skipjack_ftable[G1 ^ key[(4*k+1)%10]]));
+       G1 ^= pgm_read_byte_near(&(skipjack_ftable[G2 ^ key[(4*k+0)%10]]));
+       return g;       
+}
+
+/*****************************************************************************/
+
+void skipjack_a(uint16_t* w, uint8_t k, uint8_t* key){
+       uint16_t t;
+
+       t = w[3];
+       w[3] = w[2];
+       w[2] = w[1];
+       w[1] = skipjack_g(w[0],k-1,key);
+       w[0] = t ^ w[1] ^ k<<8;
+}
+
+/*****************************************************************************/
+
+void skipjack_a_inv(uint16_t* w, uint8_t k, uint8_t* key){
+       uint16_t t;
+       t = w[0] ^ w[1];
+       w[0] = skipjack_g_inv(w[1],k-1,key);
+       w[1] = w[2];
+       w[2] = w[3];
+       w[3] = t ^ k<<8;
+}
+
+/*****************************************************************************/
+
+void skipjack_b(uint16_t* w, uint8_t k, uint8_t* key){
+       uint16_t t;
+       t = w[0];
+       w[0] = w[3];
+       w[3] = w[2];
+       w[2] = t ^ k<<8 ^ w[1];
+       w[1] = skipjack_g(t,k-1,key);
+}
+
+/*****************************************************************************/
+
+void skipjack_b_inv(uint16_t* w, uint8_t k, uint8_t* key){
+       uint16_t t;
+       t = w[2];
+       w[2] = w[3];
+       w[3] = w[0];
+       w[0] = skipjack_g_inv(w[1],k-1,key);
+       w[1] = w[0] ^ t ^ k<<8;
+}
+
+/*****************************************************************************/
+/**
+ * block is 64 bits (=8 bytes) in size, key is 80 bits (=10 bytes) in size.
+ * 
+ */
+void skipjack_enc(void* block, void* key){
+       uint8_t k;
+       for(k=0; k<32; ++k){
+               if(k & 0x08){
+                       skipjack_b((uint16_t*)block, k+1, key);
+               } else {
+                       skipjack_a((uint16_t*)block, k+1, key);
+               }
+       }
+}
+
+/*****************************************************************************/
+/**
+ * block is 64 bits (=8 bytes) in size, key is 80 bits (=10 bytes) in size.
+ * 
+ */
+void skipjack_dec(void* block, void* key){
+       int8_t k;
+       for(k=31; k>=0; --k){
+               if(k & 0x08){
+                       skipjack_b_inv((uint16_t*)block, k+1, key);
+               } else {
+                       skipjack_a_inv((uint16_t*)block, k+1, key);
+               }
+       }
+}
+
+
+
+
+

diff --git a/skipjack.h b/skipjack.h
new file mode 100644 (file)
index 0000000..00e968b
--- /dev/null
+++ b/skipjack.h
@@ -0,0 +1,19 @@
+#ifndef SKIPJACK_H_
+#define SKIPJACK_H_
+
+#include <stdint.h>
+
+/*****************************************************************************/
+/**
+ * block is 64 bits (=8 bytes) in size, key is 80 bits (=10 bytes) in size.
+ * 
+ */
+void skipjack_enc(void* block, void* key);
+/*****************************************************************************/
+/**
+ * block is 64 bits (=8 bytes) in size, key is 80 bits (=10 bytes) in size.
+ * 
+ */
+void skipjack_dec(void* block, void* key);
+
+#endif /*SKIPJACK_H_*/