X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=verify.c;h=42a56d7162631e51be05d10394b40fa91b1bd382;hp=178b6d6a21d4b007058eaca1322112057c50464f;hb=8c432325c3df2075a77b27eab8a87704cf7b48ee;hpb=a3ff21e3875887a28a40eb246e5c8f0c01cf96cd diff --git a/verify.c b/verify.c index 178b6d6a..42a56d71 100644 --- a/verify.c +++ b/verify.c @@ -95,17 +95,18 @@ static int verify_io_u_crc32(struct verify_header *hdr, struct io_u *io_u) 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; } @@ -166,11 +167,11 @@ static void fill_crc32(struct verify_header *hdr, void *p, unsigned int len) 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)); } /*