X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=skein%2Fthreefish1024_enc.c;h=ebe7fe67ddf55791be26bb594ca9ed6dff0fb26f;hb=d9352fc79fbdee0cf3288809b104ea196ea85693;hp=99cca17e651eae4e9fc22d28c53a0d60600cec69;hpb=bd9d6731486cac11f6b294b3c84681eb65947f3d;p=avr-crypto-lib.git

diff --git a/skein/threefish1024_enc.c b/skein/threefish1024_enc.c
index 99cca17..ebe7fe6 100644
--- a/skein/threefish1024_enc.c
+++ b/skein/threefish1024_enc.c
@@ -1,7 +1,7 @@
 /* threefish1024_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,7 +18,7 @@
 */
 /*
  * \author  Daniel Otte
- * \email   daniel.otte@rub.de
+ * \email   bg@nerilex.org
  * \date    2009-03-12
  * \license GPLv3 or later
  *
@@ -33,7 +33,7 @@
 #define X(a) (((uint64_t*)data)[(a)])
 
 static
-void permute_16(void* data){
+void permute_16(void *data){
 	uint64_t t;
 	t = X(1);
 	X(1) = X(9);
@@ -55,12 +55,13 @@ void permute_16(void* data){
 	X(14) = 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 threefish1024_init(const void* key, const void* tweak, threefish1024_ctx_t* ctx){
+void threefish1024_init(const void *key, const void *tweak, threefish1024_ctx_t *ctx){
 	memcpy(ctx->k, key, 16*8);
 	if(tweak){
 		memcpy(ctx->t, tweak, 2*8);
@@ -76,7 +77,7 @@ void threefish1024_init(const void* key, const void* tweak, threefish1024_ctx_t*
 }
 
 static
-void add_key_16(void* data, const threefish1024_ctx_t* ctx, uint8_t s){
+void add_key_16(void *data, const threefish1024_ctx_t *ctx, uint8_t s){
 	uint8_t i;
 	for(i=0; i<13; ++i){
 		X(i) += ctx->k[(s+i)%17];
@@ -86,7 +87,7 @@ void add_key_16(void* data, const threefish1024_ctx_t* ctx, uint8_t s){
 	X(15) += ctx->k[(s+15)%17] + s;
 }
 
-void threefish1024_enc(void* data, const threefish1024_ctx_t* ctx){
+void threefish1024_enc(void *data, const threefish1024_ctx_t *ctx){
 	uint8_t i=0,s=0;
 	/* old constans, changed at round 2 of the SHA-3 contest
 	uint8_t r0[8] = {55, 25, 33, 34, 28, 17, 58, 47};