diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2011-06-13 08:12:41 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2011-06-13 08:12:41 +0000 |
commit | 0d7a558f23b6bc421e9c0ab69c73576501523e68 (patch) | |
tree | c74e3afaea755c18d9f50874dcbb464200bff894 | |
parent | b7e016ba42728e41ffb28ee6074eac4aa5ff0101 (diff) | |
download | upstream-0d7a558f23b6bc421e9c0ab69c73576501523e68.tar.gz upstream-0d7a558f23b6bc421e9c0ab69c73576501523e68.tar.bz2 upstream-0d7a558f23b6bc421e9c0ab69c73576501523e68.zip |
tools/firmware-utils: fix buffalo csum calculation
Also print an error message if decryption fails.
SVN-Revision: 27167
-rw-r--r-- | tools/firmware-utils/src/buffalo-enc.c | 4 | ||||
-rw-r--r-- | tools/firmware-utils/src/buffalo-lib.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tools/firmware-utils/src/buffalo-enc.c b/tools/firmware-utils/src/buffalo-enc.c index 94de53e910..13d270b3f7 100644 --- a/tools/firmware-utils/src/buffalo-enc.c +++ b/tools/firmware-utils/src/buffalo-enc.c @@ -87,8 +87,10 @@ static int decrypt_file(void) ep.key = (unsigned char *) crypt_key; err = decrypt_buf(&ep, buf, src_len); - if (err) + if (err) { + ERR("unable to decrypt '%s'", ifname); goto out; + } printf("Magic\t\t: '%s'\n", ep.magic); printf("Seed\t\t: 0x%02x\n", ep.seed); diff --git a/tools/firmware-utils/src/buffalo-lib.c b/tools/firmware-utils/src/buffalo-lib.c index 00ad1a5c10..29aee9f88d 100644 --- a/tools/firmware-utils/src/buffalo-lib.c +++ b/tools/firmware-utils/src/buffalo-lib.c @@ -179,7 +179,7 @@ int bcrypt_buf(unsigned char seed, unsigned char *key, unsigned char *src, uint32_t buffalo_csum(uint32_t csum, void *buf, unsigned long len) { - unsigned char *p = buf; + char *p = buf; while (len--) { int i; |