TeaSpeak/tomcrypt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'pr/crc32-declaration-block-beginning' into develop

Browse Source 
This closes #155
This commit is contained in:
Steffen Jaeckel 2017-03-01 15:03:16 +01:00
commit d4cc79011b
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/misc/crc32.c
View File

@ -149,9 +149,10 @@ void crc32_init(crc32_state *ctx)
void crc32_update(crc32_state *ctx, const unsigned char *input, unsigned long length) void crc32_update(crc32_state *ctx, const unsigned char *input, unsigned long length)
{ {
ulong32 crc;
LTC_ARGCHKVD(ctx != NULL); LTC_ARGCHKVD(ctx != NULL);
LTC_ARGCHKVD(input != NULL); LTC_ARGCHKVD(input != NULL);
ulong32 crc = ctx->crc; crc = ctx->crc;
while (length--) while (length--)
crc = crc32_m_tab[CRC32_INDEX(crc) ^ *input++] ^ CRC32_SHIFTED(crc); crc = crc32_m_tab[CRC32_INDEX(crc) ^ *input++] ^ CRC32_SHIFTED(crc);
@ -161,14 +162,18 @@ void crc32_update(crc32_state *ctx, const unsigned char *input, unsigned long le
void crc32_finish(crc32_state *ctx, void *hash, unsigned long size) void crc32_finish(crc32_state *ctx, void *hash, unsigned long size)
{ {
unsigned char* h;
unsigned long i;
ulong32 crc;
LTC_ARGCHKVD(ctx != NULL); LTC_ARGCHKVD(ctx != NULL);
LTC_ARGCHKVD(hash != NULL); LTC_ARGCHKVD(hash != NULL);
unsigned char* h = hash; h = hash;
unsigned long i; crc = ctx->crc;
ulong32 crc = ctx->crc;
crc ^= _CRC32_NEGL; crc ^= _CRC32_NEGL;
if (size > 4) size = 4;
for (i = 0; i < size; i++) { for (i = 0; i < size; i++) {
h[i] = ((unsigned char*)&(crc))[i]; h[i] = ((unsigned char*)&(crc))[i];
} }