diff options
| author | Rich Salz <rsalz@akamai.com> | 2015-05-04 18:00:15 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-05-05 22:18:59 -0400 |
| commit | 16f8d4ebf0fd4847fa83d9c61f4150273cb4f533 (patch) | |
| tree | 3c30094cad38433c24008c30efe3d93cf38d8ae9 /crypto/sha | |
| parent | 12048657a91b12e499d03ec9ff406b42aba67366 (diff) | |
| download | openssl-16f8d4ebf0fd4847fa83d9c61f4150273cb4f533.zip openssl-16f8d4ebf0fd4847fa83d9c61f4150273cb4f533.tar.gz openssl-16f8d4ebf0fd4847fa83d9c61f4150273cb4f533.tar.bz2 | |
memset, memcpy, sizeof consistency fixes
Just as with the OPENSSL_malloc calls, consistently use sizeof(*ptr)
for memset and memcpy. Remove needless casts for those functions.
For memset, replace alternative forms of zero with 0.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto/sha')
| -rw-r--r-- | crypto/sha/sha512.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/crypto/sha/sha512.c b/crypto/sha/sha512.c index f934c74..c58cc1b 100644 --- a/crypto/sha/sha512.c +++ b/crypto/sha/sha512.c @@ -107,9 +107,11 @@ int SHA512_Final(unsigned char *md, SHA512_CTX *c) p[n] = 0x80; /* There always is a room for one */ n++; - if (n > (sizeof(c->u) - 16)) - memset(p + n, 0, sizeof(c->u) - n), n = 0, - sha512_block_data_order(c, p, 1); + if (n > (sizeof(c->u) - 16)) { + memset(p + n, 0, sizeof(c->u) - n); + n = 0; + sha512_block_data_order(c, p, 1); + } memset(p + n, 0, sizeof(c->u) - 16 - n); #ifdef B_ENDIAN |