{
uint32_t a, b, c, d;
- a = hash[0];
- b = hash[1];
- c = hash[2];
- d = hash[3];
+ /*
+ * This used to be set from the hash[0..3] input, but we can
+ * skip a memory clear if we just start from 0 instead.
+ */
+ a = b = c = d = 0;
MD5STEP(F1, a, b, c, d, in[0] + 0xd76aa478, 7);
MD5STEP(F1, d, a, b, c, in[1] + 0xe8c7b756, 12);
MD5STEP(F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15);
MD5STEP(F4, b, c, d, a, in[9] + 0xeb86d391, 21);
- hash[0] += a;
- hash[1] += b;
- hash[2] += c;
- hash[3] += d;
+ hash[0] = a;
+ hash[1] = b;
+ hash[2] = c;
+ hash[3] = d;
}
void md5_update(struct md5_ctx *mctx, const uint8_t *data, unsigned int len)
static int verify_io_u_md5(struct verify_header *hdr, struct io_u *io_u)
{
- unsigned char *p = io_u->buf;
- struct md5_ctx md5_ctx;
+ unsigned char *p = io_u->buf + sizeof(*hdr);
+ uint32_t hash[MD5_HASH_WORDS];
+ struct md5_ctx md5_ctx = {
+ .hash = hash,
+ };
- memset(&md5_ctx, 0, sizeof(md5_ctx));
- p += sizeof(*hdr);
md5_update(&md5_ctx, p, hdr->len - sizeof(*hdr));
- if (memcmp(hdr->md5_digest, md5_ctx.hash, sizeof(md5_ctx.hash))) {
+ if (memcmp(hdr->md5_digest, md5_ctx.hash, sizeof(hash))) {
log_err("md5: verify failed at %llu/%lu\n", io_u->offset, io_u->buflen);
hexdump(hdr->md5_digest, sizeof(hdr->md5_digest));
- hexdump(md5_ctx.hash, sizeof(md5_ctx.hash));
+ hexdump(md5_ctx.hash, sizeof(hash));
return 1;
}
static void fill_md5(struct verify_header *hdr, void *p, unsigned int len)
{
- struct md5_ctx md5_ctx;
+ struct md5_ctx md5_ctx = {
+ .hash = (uint32_t *) hdr->md5_digest,
+ };
- memset(&md5_ctx, 0, sizeof(md5_ctx));
md5_update(&md5_ctx, p, len);
- memcpy(hdr->md5_digest, md5_ctx.hash, sizeof(md5_ctx.hash));
}
/*