X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=blobdiff_plain;f=camellia%2Fcamellia-asm.S;h=4ab4029b4ce52bdfc75832d3b021b9303c6faabc;hp=c743997518247b41bfeca78081016311b80baff7;hb=4b5da1dc27a791b5c448274a3db09cd035b33493;hpb=4f50c75ee5a6cc88bf7ea71957ed509e298e6c25 diff --git a/camellia/camellia-asm.S b/camellia/camellia-asm.S index c743997..4ab4029 100644 --- a/camellia/camellia-asm.S +++ b/camellia/camellia-asm.S @@ -1,7 +1,7 @@ /* camellia-asm.S */ /* 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 @@ -646,9 +646,9 @@ change_endian: #define KEY_ROL17 0x08 #define KEY_ROL15 0x00 /* -void camellia_6rounds(camellia128_ctx_t* s, uint64_t* bl, uint64_t* br, uint8_t roundop, uint8_t keychoice){ +void camellia_6rounds(camellia128_ctx_t *s, uint64_t *bl, uint64_t *br, uint8_t roundop, uint8_t keychoice){ uint8_t i; - uint64_t* k[4]; + uint64_t *k[4]; k[0] = &(s->kll); k[1] = &(s->klr); k[2] = &(s->kal); @@ -827,7 +827,7 @@ main_loop: ;############################################################################## /* -void camellia128_init(camellia128_ctx_t* s, uint8_t* key){ +void camellia128_init(camellia128_ctx_t *s, uint8_t *key){ uint8_t i; s->kll = 0; //((uint64_t*)key)[0];