X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=skein%2Fthreefish256_enc.c;h=08f7d8846f44631aff40c25aebecd2f07fdff43a;hb=d9352fc79fbdee0cf3288809b104ea196ea85693;hp=ebfa03975aec82ebff4b2a0537f29447e4534741;hpb=8007e094d9e9e9477a08978c5ad2d96c6cb8bb66;p=avr-crypto-lib.git diff --git a/skein/threefish256_enc.c b/skein/threefish256_enc.c index ebfa039..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,7 +18,7 @@ */ /* * \author Daniel Otte - * \email daniel.otte@rub.de + * \email bg@nerilex.org * \date 2009-03-12 * \license GPLv3 or later * @@ -32,7 +32,7 @@ #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); @@ -45,7 +45,7 @@ void permute_4(void* data){ #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); @@ -61,14 +61,14 @@ 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; /* old constans, changed at round 2 of the SHA-3 contest uint8_t r0[8] = { 5, 36, 13, 58, 26, 53, 11, 59};