parent
4ded454492
commit
da2f7ddcd0
@ -0,0 +1,31 @@
|
||||
|
||||
Upstream r1896.
|
||||
|
||||
--- neon-0.29.6/src/ne_md5.c.md5alias
|
||||
+++ neon-0.29.6/src/ne_md5.c
|
||||
@@ -139,6 +139,7 @@ md5_finish_ctx (struct md5_ctx *ctx, voi
|
||||
{
|
||||
/* Take yet unprocessed bytes into account. */
|
||||
md5_uint32 bytes = ctx->buflen;
|
||||
+ md5_uint32 swap_bytes;
|
||||
size_t pad;
|
||||
|
||||
/* Now count remaining bytes. */
|
||||
@@ -149,10 +150,13 @@ md5_finish_ctx (struct md5_ctx *ctx, voi
|
||||
pad = bytes >= 56 ? 64 + 56 - bytes : 56 - bytes;
|
||||
memcpy (&ctx->buffer[bytes], fillbuf, pad);
|
||||
|
||||
- /* Put the 64-bit file length in *bits* at the end of the buffer. */
|
||||
- *(md5_uint32 *) &ctx->buffer[bytes + pad] = SWAP (ctx->total[0] << 3);
|
||||
- *(md5_uint32 *) &ctx->buffer[bytes + pad + 4] = SWAP ((ctx->total[1] << 3) |
|
||||
- (ctx->total[0] >> 29));
|
||||
+ /* Put the 64-bit file length in *bits* at the end of the buffer.
|
||||
+ Use memcpy to avoid aliasing problems. On most systems, this
|
||||
+ will be optimized away to the same code. */
|
||||
+ swap_bytes = SWAP (ctx->total[0] << 3);
|
||||
+ memcpy (&ctx->buffer[bytes + pad], &swap_bytes, sizeof (swap_bytes));
|
||||
+ swap_bytes = SWAP ((ctx->total[1] << 3) | (ctx->total[0] >> 29));
|
||||
+ memcpy (&ctx->buffer[bytes + pad + 4], &swap_bytes, sizeof (swap_bytes));
|
||||
|
||||
/* Process last bytes. */
|
||||
md5_process_block (ctx->buffer, bytes + pad + 8, ctx);
|
Loading…
Reference in new issue