X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=hivex%2Fhivex.c;h=9799ddc68d9cee71ddec270e041cc818620c2afa;hp=fd65f8ccb4271740e81dc28bd4dd57004a50d310;hb=5fe4d4718cf00876d8de20f4c297dc4ca69db1a4;hpb=f1dc74b8d605c07f4b8d4ca0b8dcf3db8c18edd1 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;