summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2013-06-19 15:45:05 (GMT)
committer Mike Frysinger <vapier@gentoo.org>2013-06-19 15:49:15 (GMT)
commitf6205c6ab786f14e3515dfc0bfdb958ada8ed0e9 (patch)
treeeb9a33aa6a18faf1b292949ecf4a132e7cce76a1
parentfea25880212dd934c7e17fce8a299f9184933f6b (diff)
downloadbusybox-f6205c6ab786f14e3515dfc0bfdb958ada8ed0e9.tar.gz
busybox-f6205c6ab786f14e3515dfc0bfdb958ada8ed0e9.tar.bz2
md5/sha512: fix strict aliasing warnings
If the target can tolerate these issues, then gcc is smart enough to generate the same code (x86_64 produces the same code). If the target can't, then it needs the memcpy anyways. libbb/hash_md5_sha.c: In function 'common64_end': libbb/hash_md5_sha.c:87:4: warning: dereferencing type-punned pointer will break strict-aliasing rules *(uint64_t *) (&ctx->wbuffer[64 - 8]) = t; libbb/hash_md5_sha.c: In function 'sha512_end': libbb/hash_md5_sha.c:886:4: warning: dereferencing type-punned pointer will break strict-aliasing rules *(uint64_t *) (&ctx->wbuffer[128 - 8]) = t; libbb/hash_md5_sha.c:889:4: warning: dereferencing type-punned pointer will break strict-aliasing rules *(uint64_t *) (&ctx->wbuffer[128 - 16]) = t; Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-rw-r--r--libbb/hash_md5_sha.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libbb/hash_md5_sha.c b/libbb/hash_md5_sha.c
index b4d955e..e10cb39 100644
--- a/libbb/hash_md5_sha.c
+++ b/libbb/hash_md5_sha.c
@@ -84,7 +84,7 @@ static void FAST_FUNC common64_end(md5_ctx_t *ctx, int swap_needed)
if (swap_needed)
t = bb_bswap_64(t);
/* wbuffer is suitably aligned for this */
- *(uint64_t *) (&ctx->wbuffer[64 - 8]) = t;
+ memcpy(&ctx->wbuffer[64 - 8], &t, sizeof(t));
}
ctx->process_block(ctx);
if (remaining >= 8)
@@ -883,10 +883,10 @@ void FAST_FUNC sha512_end(sha512_ctx_t *ctx, void *resbuf)
uint64_t t;
t = ctx->total64[0] << 3;
t = SWAP_BE64(t);
- *(uint64_t *) (&ctx->wbuffer[128 - 8]) = t;
+ memcpy(&ctx->wbuffer[128 - 8], &t, sizeof(t));
t = (ctx->total64[1] << 3) | (ctx->total64[0] >> 61);
t = SWAP_BE64(t);
- *(uint64_t *) (&ctx->wbuffer[128 - 16]) = t;
+ memcpy(&ctx->wbuffer[128 - 16], &t, sizeof(t));
}
sha512_process_block128(ctx);
if (remaining >= 16)