From: blogic Date: Tue, 24 Jun 2014 18:13:00 +0000 (+0000) Subject: firmware-utils/mkdir615h1: fix magic XOR calculation X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=commitdiff_plain;h=b07f7d032d3219e2a328d6ca6ca7bd7b45691a32 firmware-utils/mkdir615h1: fix magic XOR calculation Signed-off-by: Forest Crossman git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41314 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- diff --git a/tools/firmware-utils/src/mkdir615h1.c b/tools/firmware-utils/src/mkdir615h1.c index 84692aa3aa..d9fb35c1ec 100644 --- a/tools/firmware-utils/src/mkdir615h1.c +++ b/tools/firmware-utils/src/mkdir615h1.c @@ -199,7 +199,7 @@ static int encode_image(const char *input_file_name, } for (i = 0; i < bytes_read; i++) - buf[i] ^= magic >> ((((i >> 60) + i) & 7) - (i >> 60)); + buf[i] ^= magic >> (i % 8) & 0xff; fwrite(&buf, bytes_read, 1, fp_output); } @@ -254,7 +254,7 @@ int decode_image(const char *input_file_name, const char *output_file_name) bytes_read = fread(&buf, 1, BUF_SIZE, fp_input); for (i = 0; i < bytes_read; i++) - buf[i] ^= header.magic >> ((((i >> 60) + i) & 7) - (i >> 60)); + buf[i] ^= header.magic >> (i % 8) & 0xff; /* * Handle padded source file