X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=skein%2Fthreefish1024_enc.c;h=ebe7fe67ddf55791be26bb594ca9ed6dff0fb26f;hb=b8aa8d06134ce687993cb3148d66ebd86dbf1d6f;hp=5e6310b9cefb9a1eba006ab69fc2db6de51edea2;hpb=8007e094d9e9e9477a08978c5ad2d96c6cb8bb66;p=avr-crypto-lib.git diff --git a/skein/threefish1024_enc.c b/skein/threefish1024_enc.c index 5e6310b..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); @@ -61,7 +61,7 @@ void permute_16(void* data){ #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); @@ -77,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]; @@ -87,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};