From a170827089864754cd3e0c10862afa0c51e6c3d4 Mon Sep 17 00:00:00 2001 From: Richard Jones Date: Mon, 18 Jan 2010 17:56:13 +0000 Subject: [PATCH] hivex: Move header checksum code into a function. This function can be reused later. --- hivex/hivex.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/hivex/hivex.c b/hivex/hivex.c index fd65f8c..9799ddc 100644 --- a/hivex/hivex.c +++ b/hivex/hivex.c @@ -255,6 +255,21 @@ struct ntreg_vk_record { char name[1]; /* key name follows here */ } __attribute__((__packed__)); +static uint32_t +header_checksum (hive_h *h) +{ + uint32_t *daddr = (uint32_t *) h->addr; + size_t i; + uint32_t sum = 0; + + for (i = 0; i < 0x1fc / 4; ++i) { + sum ^= le32toh (*daddr); + daddr++; + } + + return sum; +} + hive_h * hivex_open (const char *filename, int flags) { @@ -323,14 +338,7 @@ hivex_open (const char *filename, int flags) goto error; /* Header checksum. */ - uint32_t *daddr = (uint32_t *) h->addr; - size_t i; - uint32_t sum = 0; - for (i = 0; i < 0x1fc / 4; ++i) { - sum ^= le32toh (*daddr); - daddr++; - } - + uint32_t sum = header_checksum (h); if (sum != le32toh (h->hdr->csum)) { fprintf (stderr, "hivex: %s: bad checksum in hive header\n", filename); errno = EINVAL; -- 1.8.3.1