domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

firmware-utils: improve tools for Buffalo DHP series

Browse Source 
some of Buffalo DHP series use slightly different trx magic, buffalo-enc,
buffalo-tag, and factory image begin with 'bgn'.

this patch adds support for building those images.

Signed-off-by: FUKAUMI Naoki <naobsd@gmail.com>
This commit is contained in:
FUKAUMI Naoki
2017-01-29 01:05:54 +09:00
committed by Rafał Miłecki
parent bc32f7deb5
commit 7faee1bc9f
7 changed files with 215 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tools/firmware-utils/src/buffalo-enc.c
View File

@@ -35,6 +35,7 @@ static char *product;
static char *version;
static int do_decrypt;
static int offset;
static int size;
void usage(int status)
{
@@ -54,6 +55,7 @@ void usage(int status)
" -v <version> set version to <version>\n"
" -h show this screen\n"
" -O Offset of encrypted data in file (decryption)\n"
" -S Size of unencrypted data in file (encryption)\n"
);
exit(status);
@@ -118,7 +120,7 @@ out:
static int encrypt_file(void)
{
struct enc_param ep;
ssize_t src_len;
ssize_t src_len, tail_dst, tail_len, tail_src;
unsigned char *buf;
uint32_t hdrlen;
ssize_t totlen = 0;
@@ -131,8 +133,12 @@ static int encrypt_file(void)
goto out;
}
totlen = enc_compute_buf_len(product, version, src_len);
hdrlen = enc_compute_header_len(product, version);
if (size) {
tail_dst = enc_compute_buf_len(product, version, size);
tail_len = src_len - size;
totlen = tail_dst + tail_len;
} else
totlen = enc_compute_buf_len(product, version, src_len);
buf = malloc(totlen);
if (buf == NULL) {
@@ -140,12 +146,21 @@ static int encrypt_file(void)
goto out;
}
hdrlen = enc_compute_header_len(product, version);
err = read_file_to_buf(ifname, &buf[hdrlen], src_len);
if (err) {
ERR("unable to read from file '%s'", ofname);
goto free_buf;
}
if (size) {
tail_src = hdrlen + size;
memmove(&buf[tail_dst], &buf[tail_src], tail_len);
memset(&buf[tail_src], 0, tail_dst - tail_src);
src_len = size;
}
memset(&ep, '\0', sizeof(ep));
ep.key = (unsigned char *) crypt_key;
ep.seed = seed;
@@ -241,7 +256,7 @@ int main(int argc, char *argv[])
while ( 1 ) {
int c;
c = getopt(argc, argv, "adi:m:o:hlp:v:k:O:r:s:");
c = getopt(argc, argv, "adi:m:o:hlp:v:k:O:r:s:S:");
if (c == -1)
break;
@@ -276,6 +291,9 @@ int main(int argc, char *argv[])
case 'O':
offset = strtoul(optarg, NULL, 0);
break;
case 'S':
size = strtoul(optarg, NULL, 0);
break;
case 'h':
usage(EXIT_SUCCESS);
break;