From: Nicolas Pitre Date: Sat, 12 Nov 2005 23:59:54 +0000 (+1100) Subject: [CRYPTO] sha1: Rename i/j to done/partial X-Git-Tag: v2.6.16-rc1~658^2~23 X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=9d70a6c86cd86e111291bd0d506028ecb9649923;p=linux-2.6-omap-h63xx.git [CRYPTO] sha1: Rename i/j to done/partial This patch gives more descriptive names to the variables i and j. Signed-off-by: Nicolas Pitre Signed-off-by: Herbert Xu --- diff --git a/crypto/sha1.c b/crypto/sha1.c index 292dcc13ff9..7b1abca2936 100644 --- a/crypto/sha1.c +++ b/crypto/sha1.c @@ -49,32 +49,33 @@ static void sha1_init(void *ctx) static void sha1_update(void *ctx, const u8 *data, unsigned int len) { struct sha1_ctx *sctx = ctx; - unsigned int i, j; + unsigned int partial, done; const u8 *src; - j = (sctx->count >> 3) & 0x3f; + partial = (sctx->count >> 3) & 0x3f; sctx->count += len << 3; - i = 0; + done = 0; src = data; - if ((j + len) > 63) { + if ((partial + len) > 63) { u32 temp[SHA_WORKSPACE_WORDS]; - if (j) { - memcpy(&sctx->buffer[j], data, (i = 64-j)); + if (partial) { + done = 64 - partial; + memcpy(sctx->buffer + partial, data, done); src = sctx->buffer; } do { sha_transform(sctx->state, src, temp); - i += 64; - src = &data[i]; - } while (i + 63 < len); + done += 64; + src = data + done; + } while (done + 63 < len); memset(temp, 0, sizeof(temp)); - j = 0; + partial = 0; } - memcpy(&sctx->buffer[j], src, len - i); + memcpy(sctx->buffer + partial, src, len - done); }