RepoMirrors
/
openwrt
mirror of git://git.openwrt.org/openwrt/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

firmware-utils: fix mistake and improve logic in nec-enc 

this patch fixes/improves follows:

- PATTERN_LEN is defined as a macro but unused
- redundant logic in count-up for "ptn"

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
This commit is contained in:
INAGAKI Hiroshi 2020-10-31 21:45:05 +09:00 committed by Petr Štetiar
parent 165f0b00cd
commit 65f3e7ce1f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/firmware-utils/Makefile
View File

@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME := firmware-utils PKG_NAME := firmware-utils
PKG_RELEASE := 4 PKG_RELEASE := 5
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/kernel.mk

8
tools/firmware-utils/src/nec-enc.c
View File

@ -47,7 +47,7 @@ static unsigned char buf_pattern[4096], buf[4096];
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
int k_off = 0, ptn = 0, c, ret = EXIT_SUCCESS; int k_off = 0, ptn = 1, c, ret = EXIT_SUCCESS;
char *ifn = NULL, *ofn = NULL, *key = NULL; char *ifn = NULL, *ofn = NULL, *key = NULL;
size_t n, k_len; size_t n, k_len;
FILE *out, *in; FILE *out, *in;
@ -99,11 +99,11 @@ int main(int argc, char **argv)
while ((n = fread(buf, 1, sizeof(buf), in)) > 0) { while ((n = fread(buf, 1, sizeof(buf), in)) > 0) {
for (int i = 0; i < n; i++) { for (int i = 0; i < n; i++) {
buf_pattern[i] = ptn + 1; buf_pattern[i] = ptn;
ptn++; ptn++;
if (ptn > 250) if (ptn > PATTERN_LEN)
ptn = 0; ptn = 1;
} }
k_off = xor_pattern(buf_pattern, n, key, k_len, k_off); k_off = xor_pattern(buf_pattern, n, key, k_len, k_off);