diff options
author | Aaron Giles <aaron@aarongiles.com> | 2009-03-10 00:27:30 +0000 |
---|---|---|
committer | Aaron Giles <aaron@aarongiles.com> | 2009-03-10 00:27:30 +0000 |
commit | d2d22a19afb6111c7d5f35f2e3f68e7fc931081a (patch) | |
tree | 23bf327c396ff178f091afcd566f1a32f5259827 /src/tools | |
parent | 20d7fc9d6e5e791f5277ab8e55cf0e9484707abc (diff) |
Redid metadata hashing. A digest of tags and hashes for each
piece of metadata along with the hash for the raw data is then
hashed to produce the final SHA1.
Updated romload to skip the obsolete MD5 field.
Diffstat (limited to 'src/tools')
-rw-r--r-- | src/tools/chdman.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/src/tools/chdman.c b/src/tools/chdman.c index dc9ab490232..155ff38700f 100644 --- a/src/tools/chdman.c +++ b/src/tools/chdman.c @@ -1764,25 +1764,6 @@ static int do_verify(int argc, char *argv[], int param) fixed = TRUE; } } - - if (memcmp(header.rawsha1, verify.metasha1, sizeof(header.metasha1)) != 0) - { - fprintf(stderr, "Error: metadata SHA1 in header = "); - for (i = 0; i < CHD_SHA1_BYTES; i++) - fprintf(stderr, "%02x", header.metasha1[i]); - fprintf(stderr, "\n"); - fprintf(stderr, " actual metadata SHA1 = "); - for (i = 0; i < CHD_SHA1_BYTES; i++) - fprintf(stderr, "%02x", verify.metasha1[i]); - fprintf(stderr, "\n"); - - /* fix it */ - if (param) - { - memcpy(header.metasha1, verify.metasha1, sizeof(header.metasha1)); - fixed = TRUE; - } - } } } } @@ -2103,12 +2084,6 @@ static int do_info(int argc, char *argv[], int param) header.rawsha1[8], header.rawsha1[9], header.rawsha1[10], header.rawsha1[11], header.rawsha1[12], header.rawsha1[13], header.rawsha1[14], header.rawsha1[15], header.rawsha1[16], header.rawsha1[17], header.rawsha1[18], header.rawsha1[19]); - printf("Metadata SHA1:%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x\n", - header.metasha1[0], header.metasha1[1], header.metasha1[2], header.metasha1[3], - header.metasha1[4], header.metasha1[5], header.metasha1[6], header.metasha1[7], - header.metasha1[8], header.metasha1[9], header.metasha1[10], header.metasha1[11], - header.metasha1[12], header.metasha1[13], header.metasha1[14], header.metasha1[15], - header.metasha1[16], header.metasha1[17], header.metasha1[18], header.metasha1[19]); } if (header.flags & CHDFLAGS_HAS_PARENT) { |