tools/firmware-utils: fix buffalo csum calculation

Also print an error message if decryption fails.

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27167 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/tools/firmware-utils/src/buffalo-enc.c b/tools/firmware-utils/src/buffalo-enc.c
index 94de53e..13d270b 100644 (file)
--- 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 00ad1a5..29aee9f 100644 (file)
--- 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;