X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=blobdiff_plain;f=skein%2Fthreefish512_enc_asm.S;h=aad6b70757421e2d4428b5bbc04274a662840804;hp=687b9b68edf74dedd1ed2920bcdaed61e2968695;hb=4b5da1dc27a791b5c448274a3db09cd035b33493;hpb=8007e094d9e9e9477a08978c5ad2d96c6cb8bb66 diff --git a/skein/threefish512_enc_asm.S b/skein/threefish512_enc_asm.S index 687b9b6..aad6b70 100644 --- a/skein/threefish512_enc_asm.S +++ b/skein/threefish512_enc_asm.S @@ -1,7 +1,7 @@ /* threefish512_enc_asm.S */ /* 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-24 * \license GPLv3 or later */ @@ -39,7 +39,7 @@ A7 = 21 #define K(s) (((uint64_t*)key)[(s)]) #define T(s) (((uint64_t*)tweak)[(s)]) -void threefish512_init(const void* key, const void* tweak, threefish512_ctx_t* ctx){ +void threefish512_init(const void *key, const void *tweak, threefish512_ctx_t *ctx){ memcpy(ctx->k, key, 8*8); memcpy(ctx->t, tweak, 2*8); uint8_t i; @@ -178,7 +178,7 @@ threefish512_init: /******************************************************************************/ /* #define X(a) (((uint64_t*)data)[(a)]) -void permute_8(void* data){ +void permute_8(void *data){ uint64_t t; t = X(0); X(0) = X(2); @@ -189,7 +189,7 @@ void permute_8(void* data){ X(3) = X(7); X(7) = t; } -void add_key_8(void* data, const threefish512_ctx_t* ctx, uint8_t s){ +void add_key_8(void *data, const threefish512_ctx_t *ctx, uint8_t s){ uint8_t i; for(i=0; i<5; ++i){ X(i) += ctx->k[(s+i)%9]; @@ -198,7 +198,7 @@ void add_key_8(void* data, const threefish512_ctx_t* ctx, uint8_t s){ X(6) += ctx->k[(s+6)%9] + ctx->t[(s+1)%3]; X(7) += ctx->k[(s+7)%9] + s; } -void threefish512_enc(void* data, const threefish512_ctx_t* ctx){ +void threefish512_enc(void *data, const threefish512_ctx_t *ctx){ uint8_t i=0,s=0; uint8_t r0[8] = {38, 48, 34, 26, 33, 39, 29, 33}; uint8_t r1[8] = {30, 20, 14, 12, 49, 27, 26, 51};