From ea137d37353c958bca38e37de77621263b30f418 Mon Sep 17 00:00:00 2001 From: John Crispin <john@openwrt.org> Date: Tue, 24 Jun 2014 18:13:00 +0000 Subject: [PATCH] firmware-utils/mkdir615h1: fix magic XOR calculation Signed-off-by: Forest Crossman <cyrozap@gmail.com> SVN-Revision: 41314 --- tools/firmware-utils/src/mkdir615h1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 -- GitLab