arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-26 09:28:13 +00:00
Code Issues Releases Wiki Activity

rename index to idx in sha3 to avoid collision with index function in strings.h

Browse Source
This commit is contained in:
Pavol Rusnak 2016-05-16 16:59:05 +02:00
parent f60cd681f6
commit 23590c05c6
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sha3.c
View File

@ -267,16 +267,16 @@ static void sha3_process_block(uint64_t hash[25], const uint64_t *block, size_t
*/ */
void sha3_Update(SHA3_CTX *ctx, const unsigned char *msg, size_t size) void sha3_Update(SHA3_CTX *ctx, const unsigned char *msg, size_t size)
{ {
size_t index = (size_t)ctx->rest; size_t idx = (size_t)ctx->rest;
size_t block_size = (size_t)ctx->block_size; size_t block_size = (size_t)ctx->block_size;
if (ctx->rest & SHA3_FINALIZED) return; /* too late for additional input */ if (ctx->rest & SHA3_FINALIZED) return; /* too late for additional input */
ctx->rest = (unsigned)((ctx->rest + size) % block_size); ctx->rest = (unsigned)((ctx->rest + size) % block_size);
/* fill partial block */ /* fill partial block */
if (index) { if (idx) {
size_t left = block_size - index; size_t left = block_size - idx;
memcpy((char*)ctx->message + index, msg, (size < left ? size : left)); memcpy((char*)ctx->message + idx, msg, (size < left ? size : left));
if (size < left) return; if (size < left) return;
/* process partial block */ /* process partial block */