X-Git-Url: https://git.cryptolib.org/avr-crypto-lib.git?a=blobdiff_plain;f=camellia%2Fcamellia128-stub.c;h=c0c0546a57949582a1e62eb9248f74652cb03116;hb=4b5da1dc27a791b5c448274a3db09cd035b33493;hp=57ed483a6ff57e68dbbf27d6c55bd24cd08a4e72;hpb=701cee0d98aab48dd3192c8cc7c77eb42581bc56;p=avr-crypto-lib.git diff --git a/camellia/camellia128-stub.c b/camellia/camellia128-stub.c index 57ed483..c0c0546 100644 --- a/camellia/camellia128-stub.c +++ b/camellia/camellia128-stub.c @@ -1,7 +1,7 @@ /* camellia128-stub.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 @@ -39,7 +39,7 @@ uint64_t camellia_fl(uint64_t x, uint64_t k); /*****************************************************************************/ uint64_t camellia_fl_inv(uint64_t y, uint64_t k); /*****************************************************************************/ -void change_endian(void* data, uint8_t length); +void change_endian(void *data, uint8_t length); /* uint64_t PROGMEM camellia_sigma[6]={ / * 64 byte table * / 0xA09E667F3BCC908BLL, @@ -83,7 +83,7 @@ void camellia128_ctx_dump(camellia128_ctx_t *s){ /*****************************************************************************/ /* extern uint64_t camellia_sigma[6]; */ -void camellia128_init(const void* key, camellia128_ctx_t* s){ +void camellia128_init(const void *key, camellia128_ctx_t *s){ uint8_t i; s->kll = 0; /* ((uint64_t*)key)[0]; */ @@ -113,9 +113,9 @@ void camellia128_init(const void* key, camellia128_ctx_t* s){ } /*****************************************************************************/ -void camellia128_keyop(camellia128_ctx_t* s, int8_t q); +void camellia128_keyop(camellia128_ctx_t *s, int8_t q); /*****************************************************************************/ -void camellia128_keyop_inv(camellia128_ctx_t* s, int8_t q); +void camellia128_keyop_inv(camellia128_ctx_t *s, int8_t q); /*****************************************************************************/ #define SEL_KA 1 @@ -133,12 +133,12 @@ void camellia128_keyop_inv(camellia128_ctx_t* s, int8_t q); #define KEY_ROL17 0x08 #define KEY_ROL15 0x00 -void camellia_6rounds(const camellia128_ctx_t* s, uint64_t* bl, uint64_t* br, +void camellia_6rounds(const camellia128_ctx_t *s, uint64_t *bl, uint64_t *br, uint8_t roundop, uint8_t keychoice); /*****************************************************************************/ -void camellia128_enc(void* block, const camellia128_ctx_t* s){ +void camellia128_enc(void *block, const camellia128_ctx_t *s){ #define BL (((uint64_t*)block)[0]) #define BR (((uint64_t*)block)[1]) @@ -192,7 +192,7 @@ void camellia128_enc(void* block, const camellia128_ctx_t* s){ /*****************************************************************************/ -void camellia128_dec(void* block, const camellia128_ctx_t* s){ +void camellia128_dec(void *block, const camellia128_ctx_t *s){ #define BL (((uint64_t*)block)[1]) #define BR (((uint64_t*)block)[0])