diff options
-rw-r--r-- | src/flash.c | 2 | ||||
-rw-r--r-- | src/hash.c | 16 | ||||
-rw-r--r-- | src/hash.h | 2 | ||||
-rw-r--r-- | src/main.c | 2 |
4 files changed, 18 insertions, 4 deletions
diff --git a/src/flash.c b/src/flash.c index d1d7efd..3ad957f 100644 --- a/src/flash.c +++ b/src/flash.c @@ -84,7 +84,7 @@ void flash_image(const char *filename, const char *piece, const char *device, co unsigned long long size, off; unsigned char bsize[4], tmp; unsigned char nolofiller[128]; - ushort hash = do_hash_file(filename); + ushort hash = do_hash_file(filename, piece); if (piece == NULL) { //exit(1); @@ -17,6 +17,7 @@ */ #include <stdio.h> +#include <string.h> #include "hash.h" usho do_hash(usho *b, int len) @@ -27,11 +28,12 @@ usho do_hash(usho *b, int len) return result; } -usho do_hash_file(const char *filename) +usho do_hash_file(const char *filename, const char *type) { unsigned char buf[BSIZE]; FILE *fd = fopen(filename, "r"); usho hash = 0; + int size; int ret; if (fd == NULL) { @@ -46,8 +48,20 @@ usho do_hash_file(const char *filename) hash ^= do_hash((usho *)&buf, ret); } while(ret); + size = ftell(fd); fclose(fd); + /* mmc image must be aligned */ + if (type && strcmp(type, "mmc") == 0) { + int align = ((size >> 8) + 1) << 8; + printf("align from %d to %d\n", size, align); + buf[0] = 0xff; + while (size < align) { + hash ^= do_hash((usho *)&buf, 1); + ++size; + } + } + return hash; } @@ -5,6 +5,6 @@ #define BSIZE 0x20000 usho do_hash(usho *b, int len); -usho do_hash_file(const char *filename); +usho do_hash_file(const char *filename, const char *type); #endif @@ -291,7 +291,7 @@ int main(int argc, char **argv) while((c = getopt(argc, argv, "QC:cp:PvVhRu:ib:U:r:e:ld:I:D:f:F:s:xH:S:n")) != -1) { switch(c) { case 'H': - printf("xorpair: %04x\n", do_hash_file(optarg)); + printf("xorpair: %04x\n", do_hash_file(optarg, NULL)); return 0; case 'x': return dump_config(); |