X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=blobdiff_plain;f=jh%2Fjh_simple_small_core.c;h=e824546052e8184a3c715bd39189833cb16ac43a;hp=15d8571d984e549c32ec6c0753e6489d1161bd65;hb=4b5da1dc27a791b5c448274a3db09cd035b33493;hpb=d1181933dc28db92d787cf5604e2fc96ab0d8f9f

diff --git a/jh/jh_simple_small_core.c b/jh/jh_simple_small_core.c
index 15d8571..e824546 100644
--- a/jh/jh_simple_small_core.c
+++ b/jh/jh_simple_small_core.c
@@ -1,7 +1,7 @@
 /* jh_simple_speed.c */
 /*
     This file is part of the AVR-Crypto-Lib.
-    Copyright (C) 2006-2010 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
@@ -30,12 +30,12 @@
 #include "cli.h"
 #endif
 
-static uint8_t sbox0[] PROGMEM =
+const static uint8_t sbox0[] PROGMEM =
 	{  9,  0,  4, 11, 13, 12,  3, 15,  1, 10,  2,  6,  7,  5,  8, 14 };
-static uint8_t sbox1[] PROGMEM =
+const static uint8_t sbox1[] PROGMEM =
 	{  3, 12,  6, 13,  5,  7,  1,  9, 15,  2,  0,  4, 11, 10, 14,  8 };
 
-static uint8_t round_const_0[] PROGMEM = {
+const static uint8_t round_const_0[] PROGMEM = {
   0x6a, 0x09, 0xe6, 0x67, 0xf3, 0xbc, 0xc9, 0x08,
   0xb2, 0xfb, 0x13, 0x66, 0xea, 0x95, 0x7d, 0x3e,
   0x3a, 0xde, 0xc1, 0x75, 0x12, 0x77, 0x50, 0x99,
@@ -50,9 +50,9 @@ uint8_t jh_l(uint8_t v, uint8_t w){
 }
 
 static
-void jh_round(uint8_t* a, const uint8_t* rc){
+void jh_round(uint8_t *a, const uint8_t *rc){
 	uint8_t b[128];
-	uint8_t i,r,x,y;
+	uint8_t i,r=0,x,y;
 	for(i=0; i<128; ++i){
 		if(i%4==0){
 			r = rc[i/4];
@@ -79,7 +79,7 @@ void jh_round(uint8_t* a, const uint8_t* rc){
 }
 
 static
-void jh_next_round_const(uint8_t* a){
+void jh_next_round_const(uint8_t *a){
 	uint8_t b[32];
 	uint8_t i,x,y;
 	for(i=0; i<32; ++i){
@@ -138,7 +138,7 @@ void degroup(uint8_t *a){
 	memcpy(a,b,128);
 }
 
-void jh_encrypt(uint8_t* a){
+void jh_encrypt(uint8_t *a){
 	uint8_t i;
 	uint8_t rc[32];
 	/* grouping */
@@ -150,21 +150,11 @@ void jh_encrypt(uint8_t* a){
 	for(i=0;i<32;++i){
 		rc[i] = pgm_read_byte(&(round_const_0[i]));
 	}
-	for(i=0;i<35;++i){
+	for(i=0;i<42;++i){
 		jh_round(a, rc);
 		jh_next_round_const(rc);
 	}
-	uint8_t r=0,x,y;
 
-	for(i=0; i<128; ++i){
-		if(i%4==0){
-			r = rc[i/4];
-		}
-		x = pgm_read_byte(((r&0x80)?sbox1:sbox0)+(a[i]>>4));
-		y = pgm_read_byte(((r&0x40)?sbox1:sbox0)+(a[i]&0xf));
-		a[i]=(x<<4)|y;
-		r<<=2;
-	}
 	/* degrouping */
 #if DEBUG
 	cli_putstr_P(PSTR("\r\n== pre degroup ==\r\n"));