From 17bdb83ae669a9a01b6c33846a423e832e79557c Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Thu, 31 Jan 2008 14:32:19 +0100 Subject: [PATCH] Use "sizeof VAR", rather than a literal "4". * lib/md5.c (md5_read_ctx): Use sizeof ctx->A, not 4. * lib/md4.c (md4_read_ctx): Likewise. * lib/sha1.c (sha1_read_ctx): Likewise. --- ChangeLog | 7 +++++++ lib/md4.c | 8 ++++---- lib/md5.c | 8 ++++---- lib/sha1.c | 10 +++++----- 4 files changed, 20 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index f3daa369d..8faa77c46 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-01-31 Jim Meyering + + Use "sizeof VAR", rather than a literal "4". + * lib/md5.c (md5_read_ctx): Use sizeof ctx->A, not 4. + * lib/md4.c (md4_read_ctx): Likewise. + * lib/sha1.c (sha1_read_ctx): Likewise. + 2008-01-31 Simon Josefsson * tests/test-sha1.c: New file, based on test-md5.c. diff --git a/lib/md4.c b/lib/md4.c index dd1e2df40..3d2c17a9f 100644 --- a/lib/md4.c +++ b/lib/md4.c @@ -79,10 +79,10 @@ void * md4_read_ctx (const struct md4_ctx *ctx, void *resbuf) { char *r = resbuf; - set_uint32 (r + 0*4, SWAP (ctx->A)); - set_uint32 (r + 1*4, SWAP (ctx->B)); - set_uint32 (r + 2*4, SWAP (ctx->C)); - set_uint32 (r + 3*4, SWAP (ctx->D)); + set_uint32 (r + 0 * sizeof ctx->A, SWAP (ctx->A)); + set_uint32 (r + 1 * sizeof ctx->B, SWAP (ctx->B)); + set_uint32 (r + 2 * sizeof ctx->C, SWAP (ctx->C)); + set_uint32 (r + 3 * sizeof ctx->D, SWAP (ctx->D)); return resbuf; } diff --git a/lib/md5.c b/lib/md5.c index b6d307c40..0c8bc24db 100644 --- a/lib/md5.c +++ b/lib/md5.c @@ -95,10 +95,10 @@ void * md5_read_ctx (const struct md5_ctx *ctx, void *resbuf) { char *r = resbuf; - set_uint32 (r + 0*4, SWAP (ctx->A)); - set_uint32 (r + 1*4, SWAP (ctx->B)); - set_uint32 (r + 2*4, SWAP (ctx->C)); - set_uint32 (r + 3*4, SWAP (ctx->D)); + set_uint32 (r + 0 * sizeof ctx->A, SWAP (ctx->A)); + set_uint32 (r + 1 * sizeof ctx->B, SWAP (ctx->B)); + set_uint32 (r + 2 * sizeof ctx->C, SWAP (ctx->C)); + set_uint32 (r + 3 * sizeof ctx->D, SWAP (ctx->D)); return resbuf; } diff --git a/lib/sha1.c b/lib/sha1.c index 8869d43ff..a955d85e3 100644 --- a/lib/sha1.c +++ b/lib/sha1.c @@ -82,11 +82,11 @@ void * sha1_read_ctx (const struct sha1_ctx *ctx, void *resbuf) { char *r = resbuf; - set_uint32 (r + 0*4, SWAP (ctx->A)); - set_uint32 (r + 1*4, SWAP (ctx->B)); - set_uint32 (r + 2*4, SWAP (ctx->C)); - set_uint32 (r + 3*4, SWAP (ctx->D)); - set_uint32 (r + 4*4, SWAP (ctx->E)); + set_uint32 (r + 0 * sizeof ctx->A, SWAP (ctx->A)); + set_uint32 (r + 1 * sizeof ctx->B, SWAP (ctx->B)); + set_uint32 (r + 2 * sizeof ctx->C, SWAP (ctx->C)); + set_uint32 (r + 3 * sizeof ctx->D, SWAP (ctx->D)); + set_uint32 (r + 4 * sizeof ctx->E, SWAP (ctx->E)); return resbuf; } -- 2.11.0