]> git.cryptolib.org Git - arm-crypto-lib.git/commitdiff
Adding Present
authorbg <daniel.otte@rub.de>
Sat, 5 Feb 2011 14:18:27 +0000 (15:18 +0100)
committerbg <daniel.otte@rub.de>
Sat, 5 Feb 2011 14:18:27 +0000 (15:18 +0100)
bcal/bcal_present.c
bcal/bcal_present.h
mkfiles/present.mk [new file with mode: 0644]
present/present.c [new file with mode: 0644]
present/present.h [new file with mode: 0644]
seed/seed_c.c
test_src/main-cscipher-test.c
test_src/main-present-test.c [new file with mode: 0644]

index 6442c1e8057edabc6a92c1af31a591e33efdcbf5..c9a4fa5aacf6e89190eb9e4a5015f81e4a5394cb 100644 (file)
  * 
  */
 
-#include <avr/pgmspace.h>
 #include <stdlib.h>
 #include "blockcipher_descriptor.h"
 #include "present.h"
 #include "keysize_descriptor.h"
 
-const char present_str[]   PROGMEM = "Present";
+const char present_str[] = "Present";
 
-const uint8_t present_keysize_desc[] PROGMEM = { KS_TYPE_LIST, 1, KS_INT(80), 
-                                                KS_TYPE_TERMINATOR    };
+const uint8_t present_keysize_desc[] = { KS_TYPE_LIST, 1, KS_INT(80),
+                                         KS_TYPE_TERMINATOR    };
 
-const bcdesc_t present_desc PROGMEM = {
+const bcdesc_t present_desc = {
        BCDESC_TYPE_BLOCKCIPHER,
        BC_INIT_TYPE_1,
        present_str,
index 209a2956bacfe0ae62ed6b84b60f0cb5b14f6e27..5f60c6eba3dd8647374e693498da069a1457075c 100644 (file)
@@ -25,7 +25,6 @@
  * 
  */
 
-#include <avr/pgmspace.h>
 #include "blockcipher_descriptor.h"
 #include "present.h"
 #include "keysize_descriptor.h"
diff --git a/mkfiles/present.mk b/mkfiles/present.mk
new file mode 100644 (file)
index 0000000..7e16fe9
--- /dev/null
@@ -0,0 +1,13 @@
+# Makefile for present
+ALGO_NAME := PRESENT
+
+# comment out the following line for removement of present from the build process
+BLOCK_CIPHERS += $(ALGO_NAME)
+
+$(ALGO_NAME)_DIR      := present/
+$(ALGO_NAME)_OBJ      := present.o
+$(ALGO_NAME)_INCDIR   := bcal/
+$(ALGO_NAME)_TEST_BIN := main-present-test.o bcal_present.o $(CLI_STD) $(BCAL_STD)
+$(ALGO_NAME)_NESSIE_TEST      := "nessie"
+$(ALGO_NAME)_PERFORMANCE_TEST := "performance"
+
diff --git a/present/present.c b/present/present.c
new file mode 100644 (file)
index 0000000..6de3a6d
--- /dev/null
@@ -0,0 +1,123 @@
+/* present.c */
+/*
+    This file is part of the ARM-Crypto-Lib.
+    Copyright (C) 2006-2010  Daniel Otte (daniel.otte@rub.de)
+
+    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
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/**
+ * present.c
+ * a implementation of the PRESENT block-cipher
+ * author: Daniel Otte
+ * email:  daniel.otte@rub.de
+ * license: GPLv3
+ * 
+ * */
+#include <string.h>
+#include <stdint.h> 
+#include "present.h"
+
+static uint8_t sbox(uint8_t b){
+       uint8_t sb[]={0xC, 0x5, 0x6, 0xB, 
+                                 0x9, 0x0, 0xA, 0xD, 
+                                 0x3, 0xE, 0xF, 0x8, 
+                                 0x4, 0x7, 0x1, 0x2 };
+       return (((sb[b>>4])<<4)|(sb[b&0xf]));
+}
+
+static uint8_t sbox_inv(uint8_t b){
+       uint8_t sb[]={0x5, 0xE, 0xF, 0x8, 
+                                 0xC, 0x1, 0x2, 0xD, 
+                                 0xB, 0x4, 0x6, 0x3, 
+                                 0x0, 0x7, 0x9, 0xA };
+       return (((sb[b>>4])<<4)|(sb[b&0xf]));
+}
+
+#define SHR_O(a) c=(a)&1; (a)>>=1;
+#define SHR_I(a) (a)=(c?0x8000:0x0000) | ((a)>>1);
+
+static void p(uint16_t* o, uint8_t* i){
+       uint8_t c;
+       uint8_t m,n;
+       for(m=0; m<8; ++m){
+               for(n=0; n<2; ++n){
+                       SHR_O(i[m]);
+                       SHR_I(o[0]);
+                       SHR_O(i[m]);
+                       SHR_I(o[1]);
+                       SHR_O(i[m]);
+                       SHR_I(o[2]);
+                       SHR_O(i[m]);
+                       SHR_I(o[3]);
+               }
+       }
+}
+
+static void p_inv(uint8_t* o, uint8_t* i){
+       uint8_t tmp[8];
+       p((uint16_t*)tmp, i);
+       p((uint16_t*)o, tmp);
+}
+
+void present_init(const uint8_t* key, uint8_t keysize_b, present_ctx_t* ctx){
+       uint8_t buffer[10], tmp[2];
+       uint8_t i;
+       memcpy(buffer, key, 10);
+       memcpy(&(ctx->k[0]), buffer+2, 8);
+       for(i=1; i<32; ++i){
+               /* rotate buffer 19 right */
+               memcpy(tmp, buffer, 2);
+               memmove(buffer, buffer+2, 8);
+               memcpy(buffer+8, tmp, 2);
+                /* three shifts to do*/
+               tmp[1]=buffer[0];
+               *((uint64_t*)buffer)>>=3;
+               *((uint16_t*)(buffer+8))>>=3;
+               buffer[9] |= tmp[1]<<5;
+               buffer[7] |= tmp[0]<<5;
+               /* rotating done now substitution */
+               buffer[9] = (sbox(buffer[9])&0xF0) | ((buffer[9])&0x0F);
+               /* xor with round counter */
+               *((uint16_t*)(buffer+1)) ^= (uint16_t)i<<7;
+               memcpy(&(ctx->k[i]), buffer+2, 8);
+       }
+}
+
+void present_enc(void* buffer, present_ctx_t* ctx){
+       uint8_t i,j,tmp[8];
+       for(i=0; i<31; ++i){
+               *((uint64_t*)buffer) ^= ctx->k[i];
+                for(j=0; j<8; ++j){
+                       tmp[j] = sbox(((uint8_t*)buffer)[j]);
+                }
+                p((uint16_t*)buffer, tmp);
+       }
+       *((uint64_t*)buffer) ^= ctx->k[31];
+}
+
+
+void present_dec(void* buffer, present_ctx_t* ctx){
+       uint8_t j,tmp[8];
+       int8_t i;
+       *((uint64_t*)buffer) ^= ctx->k[31];
+
+       for(i=30; i>=0; --i){ 
+               p_inv(tmp, (uint8_t*)buffer);
+               for(j=0; j<8; ++j){
+                       ((uint8_t*)buffer)[j] = sbox_inv(tmp[j]);
+               }
+               *((uint64_t*)buffer) ^= ctx->k[i];
+       }
+}
diff --git a/present/present.h b/present/present.h
new file mode 100644 (file)
index 0000000..0e34eb0
--- /dev/null
@@ -0,0 +1,34 @@
+/* present.h */
+/*
+    This file is part of the ARM-Crypto-Lib.
+    Copyright (C) 2008  Daniel Otte (daniel.otte@rub.de)
+
+    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
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#ifndef PRESENT_H_
+#define PRESENT_H_
+
+#include <stdint.h>
+
+typedef struct present_ctx_st{
+       uint64_t k[32];
+} present_ctx_t;
+
+
+void present_init(const uint8_t* key, uint8_t keysize_b, present_ctx_t* ctx);
+void present_enc(void* buffer, present_ctx_t* ctx);
+void present_dec(void* buffer, present_ctx_t* ctx);
+
+
+#endif /*PRESENT_H_*/
index 826d1dc85ed4e69cb707de61bf40dd462fe5a3ee..d11622b6d4bd287ac7d8c7b52473773efbd6baa0 100644 (file)
@@ -20,7 +20,7 @@
  * \file       seed_c.c
  * \author     Daniel Otte 
  * \date       2007-06-1
- * \brief      SEED parts in C for AVR
+ * \brief      SEED parts in C for ARM
  * \par License        
  * GPL
  * 
index f9f3aad79c674c288c1a269d62d131aaa5edc7e0..64155a570dd8520add9ea588684fdd491f087f83 100644 (file)
@@ -62,8 +62,8 @@ void testrun_nessie_cscipher(void){
 
 void testrun_cscipher(void){
        uint8_t data[] = {0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef };
-       uint8_t key[] = {0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef,
-                                        0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10 };
+       uint8_t key[] =  {0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef,
+                                         0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10 };
        cscipher_ctx_t ctx;
        cli_putstr("\r\n== CS-Cipher test==\r\nkey: ");
        cli_hexdump(key, 16);
diff --git a/test_src/main-present-test.c b/test_src/main-present-test.c
new file mode 100644 (file)
index 0000000..79b6df8
--- /dev/null
@@ -0,0 +1,152 @@
+/* main-present-test.c */
+/*
+    This file is part of the ARM-Crypto-Lib.
+    Copyright (C) 2006-2010  Daniel Otte (daniel.otte@rub.de)
+
+    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
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/*
+ * present test-suit
+ * 
+*/
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include "config.h"
+#include "cli.h"
+#include "dump.h"
+#include "uart_lowlevel.h"
+#include "sysclock.h"
+#include "hw_gptm.h"
+#include "config.h"
+
+#include <present.h>
+#include "nessie_bc_test.h"
+#include "performance_test.h"
+#include "bcal-performance.h"
+#include "bcal_present.h"
+
+const char* algo_name = "Present";
+
+void uart0_putc(char byte){
+       uart_putc(UART_0, byte);
+}
+
+char uart0_getc(void){
+       return uart_getc(UART_0);
+}
+
+const bcdesc_t* algolist[] = {
+       (bcdesc_t*)&present_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){
+       nessie_bc_ctx.blocksize_B =   8;
+       nessie_bc_ctx.keysize_b   =  80;
+       nessie_bc_ctx.name        = algo_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){
+       present_ctx_t ctx;
+       cli_putstr("\r\nkey   : ");
+       cli_hexdump(key, 10);
+       cli_putstr("\r\nplain : ");
+       cli_hexdump(buffer, 8);
+       present_init(key, 80, &ctx);
+       present_enc(buffer, &ctx);
+       cli_putstr("\r\ncipher: ");
+       cli_hexdump(buffer, 8);
+       present_dec(buffer, &ctx);
+       cli_putstr("\r\nplain : ");
+       cli_hexdump(buffer, 8);
+       cli_putstr("\r\n");
+}
+
+void testrun_self_present(void){
+       uint8_t buffer[8], key[10];
+       cli_putstr("\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);
+       testrun_selfenc(key, buffer);
+       
+}
+
+void testrun_performance_present(void){
+       bcal_performance_multiple(algolist);
+}
+
+/*****************************************************************************
+ *  main                                                                                                                                        *
+ *****************************************************************************/
+
+const char nessie_str[]      = "nessie";
+const char test_str[]        = "test";
+const char performance_str[] = "performance";
+const char echo_str[]        = "echo";
+
+const cmdlist_entry_t cmdlist[] = {
+       { nessie_str,      NULL, testrun_nessie_present},
+       { test_str,        NULL, testrun_self_present},
+       { performance_str, NULL, testrun_performance_present},
+       { echo_str,    (void*)1, (void_fpt)echo_ctrl},
+       { NULL,            NULL, NULL}
+};
+
+int main (void){
+       sysclk_set_freq(SYS_FREQ);
+       sysclk_mosc_verify_enable();
+       uart_init(UART_0, 115200, 8, UART_PARATY_NONE, UART_STOPBITS_ONE);
+       gptm_set_timer_32periodic(TIMER0);
+
+       cli_rx = uart0_getc;
+       cli_tx = uart0_putc;
+       
+       for(;;){
+               cli_putstr("\r\n\r\nARM-Crypto-Lib VS (");
+               cli_putstr(algo_name);
+               cli_putstr("; ");
+               cli_putstr(__DATE__);
+               cli_putc(' ');
+               cli_putstr(__TIME__);
+               cli_putstr(")\r\nloaded and running\r\n");
+               cmd_interface(cmdlist);
+       }
+}