X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=blobdiff_plain;f=skein%2Fthreefish256_enc.c;h=08f7d8846f44631aff40c25aebecd2f07fdff43a;hp=8bfbf9de471bad329a6490300d49c25f4e7358b0;hb=4b5da1dc27a791b5c448274a3db09cd035b33493;hpb=4f50c75ee5a6cc88bf7ea71957ed509e298e6c25

diff --git a/skein/threefish256_enc.c b/skein/threefish256_enc.c
index 8bfbf9d..08f7d88 100644
--- a/skein/threefish256_enc.c
+++ b/skein/threefish256_enc.c
@@ -1,7 +1,7 @@
 /* threefish256_enc.c */
 /*
     This file is part of the AVR-Crypto-Lib.
-    Copyright (C) 2009  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
@@ -18,12 +18,12 @@
 */
 /*
  * \author  Daniel Otte
- * \email   daniel.otte@rub.de
+ * \email   bg@nerilex.org
  * \date    2009-03-12
  * \license GPLv3 or later
- * 
- * 
- * 
+ *
+ *
+ *
  */
 
 #include <stdint.h>
@@ -32,19 +32,20 @@
 
 #define X(a) (((uint64_t*)data)[(a)])
 static
-void permute_4(void* data){
+void permute_4(void *data){
 	uint64_t t;
 	t = X(1);
 	X(1) = X(3);
 	X(3) = t;
 }
 
-#define THREEFISH_KEY_CONST 0x5555555555555555LL /* 2**64/3 */
+//#define THREEFISH_KEY_CONST 0x5555555555555555LL /* 2**64/3 */
+#define THREEFISH_KEY_CONST 0x1BD11BDAA9FC1A22LL
 
 #define K(s) (((uint64_t*)key)[(s)])
 #define T(s) (((uint64_t*)tweak)[(s)])
 
-void threefish256_init(const void* key, const void* tweak, threefish256_ctx_t* ctx){
+void threefish256_init(const void *key, const void *tweak, threefish256_ctx_t *ctx){
 	memcpy(ctx->k, key, 4*8);
 	if(tweak){
 		memcpy(ctx->t, tweak, 2*8);
@@ -60,17 +61,21 @@ void threefish256_init(const void* key, const void* tweak, threefish256_ctx_t* c
 }
 
 static
-void add_key_4(void* data, const threefish256_ctx_t* ctx, uint8_t s){
+void add_key_4(void *data, const threefish256_ctx_t *ctx, uint8_t s){
 	X(0) += ctx->k[(s+0)%5];
 	X(1) += ctx->k[(s+1)%5] + ctx->t[s%3];
 	X(2) += ctx->k[(s+2)%5] + ctx->t[(s+1)%3];
 	X(3) += ctx->k[(s+3)%5] + s;
 }
 
-void threefish256_enc(void* data, const threefish256_ctx_t* ctx){
+void threefish256_enc(void *data, const threefish256_ctx_t *ctx){
 	uint8_t i=0,s=0;
-	uint8_t r0[8] = { 5, 36, 13, 58, 26, 53, 11, 59}; 
+/* old constans, changed at round 2 of the SHA-3 contest
+	uint8_t r0[8] = { 5, 36, 13, 58, 26, 53, 11, 59};
 	uint8_t r1[8] = {56, 28, 46, 44, 20, 35, 42, 50};
+*/
+	uint8_t r0[8] = {14, 52, 23,  5, 25, 46, 58, 32};
+	uint8_t r1[8] = {16, 57, 40, 37, 33, 12, 22, 32};
 	do{
 		if(i%4==0){
 			add_key_4(data, ctx, s);