X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=blobdiff_plain;f=skein%2Fthreefish256_enc_asm.S;h=f2766af23c7402d9c4853facd71b310ab3986950;hp=184d32a5aa6866bb5bad3341be5f7527f5be8ffe;hb=4b5da1dc27a791b5c448274a3db09cd035b33493;hpb=8007e094d9e9e9477a08978c5ad2d96c6cb8bb66 diff --git a/skein/threefish256_enc_asm.S b/skein/threefish256_enc_asm.S index 184d32a..f2766af 100644 --- a/skein/threefish256_enc_asm.S +++ b/skein/threefish256_enc_asm.S @@ -1,7 +1,7 @@ /* threefish256_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-16 * \license GPLv3 or later */ @@ -40,7 +40,7 @@ A7 = 21 #define K(s) (((uint64_t*)key)[(s)]) #define T(s) (((uint64_t*)tweak)[(s)]) -void threefish256_init(void* key, void* tweak, threefish256_ctx_t* ctx){ +void threefish256_init(void *key, void *tweak, threefish256_ctx_t *ctx){ memcpy(ctx->k, key, 4*8); memcpy(ctx->t, tweak, 2*8); uint8_t i; @@ -180,19 +180,19 @@ threefish256_init: /******************************************************************************/ /* #define X(a) (((uint64_t*)data)[(a)]) -void permute_4(void* data){ +void permute_4(void *data){ uint64_t t; t = X(1); X(1) = X(3); X(3) = t; } -void add_key_4(void* data, threefish256_ctx_t* ctx, uint8_t s){ / * s: 0..19 * / +void add_key_4(void *data, threefish256_ctx_t *ctx, uint8_t s){ / * s: 0..19 * / 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, threefish256_ctx_t* ctx){ +void threefish256_enc(void *data, threefish256_ctx_t *ctx){ uint8_t i=0,s=0; uint8_t r0[8] = { 5, 36, 13, 58, 26, 53, 11, 59}; uint8_t r1[8] = {56, 28, 46, 44, 20, 35, 42, 50};