[OpenWrt-Devel] [PATCH] firmware-utils/mkdir615h1: fix magic XOR calculation

Forest Crossman cyrozap at gmail.com
Sat Jun 21 11:35:26 EDT 2014


Signed-off-by: Forest Crossman <cyrozap at gmail.com>
---
 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 84692aa..d9fb35c 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
-- 
1.9.2
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel



More information about the openwrt-devel mailing list