X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=blobdiff_plain;f=trivium%2Ftrivium.c;h=89a3b0a06a0e8325dddf6a9af0eebffdda4d68e8;hp=cbad46197bf3abb5440d4580cd6ab1ae2801e54d;hb=4b5da1dc27a791b5c448274a3db09cd035b33493;hpb=2a5b018aa71694c5021f41e469234c3c5adb8784 diff --git a/trivium/trivium.c b/trivium/trivium.c index cbad461..89a3b0a 100644 --- a/trivium/trivium.c +++ b/trivium/trivium.c @@ -1,7 +1,7 @@ /* trivium.c */ /* This file is part of the AVR-Crypto-Lib. - Copyright (C) 2008 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 @@ -19,7 +19,7 @@ /** * * author: Daniel Otte - * email: daniel.otte@rub.de + * email: bg@nerilex.org * license: GPLv3 * */ @@ -32,7 +32,7 @@ #define G(i) ((((*ctx)[(i)/8])>>(((i)%8)))&1) #define S(i,v) ((*ctx)[(i)/8] = (((*ctx)[(i)/8]) & (uint8_t)~(1<<((i)%8))) | ((v)<<((i)%8))) -uint8_t trivium_enc(trivium_ctx_t* ctx){ +uint8_t trivium_enc(trivium_ctx_t *ctx){ uint8_t t1,t2,t3,z; t1 = G(65) ^ G(92); @@ -77,9 +77,9 @@ static const uint8_t rev_table[16] PROGMEM = { 0x03, 0x0B, 0x07, 0x0F /* 0011 1011 0111 1111 */ }; -void trivium_init(const void* key, uint16_t keysize_b, - const void* iv, uint16_t ivsize_b, - trivium_ctx_t* ctx){ +void trivium_init(const void *key, uint16_t keysize_b, + const void *iv, uint16_t ivsize_b, + trivium_ctx_t *ctx){ uint16_t i; uint8_t c1,c2; uint8_t t1,t2;