grg/checkm8_tool
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Same as prev, but on remote side

Browse Source
This commit is contained in:
Gregor Haas
2020-01-07 11:17:34 -05:00
parent f5d3293a5f
commit b590cd65c8
2 changed files with 14 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
c8_remote/src/command.c
View File

@@ -98,7 +98,7 @@ struct dev_cmd_resp *command(struct pwned_device *dev,
return cmd_resp; return cmd_resp;
} }
ret = dfu_send_data(dev, args, arg_len, 1); ret = dfu_send_data(dev, args, arg_len, 0);
if(IS_CHECKM8_FAIL(ret)) if(IS_CHECKM8_FAIL(ret))
{ {
cmd_resp->ret = ret; cmd_resp->ret = ret;
@@ -110,7 +110,7 @@ struct dev_cmd_resp *command(struct pwned_device *dev,
ret = ctrl_transfer(dev, ret = ctrl_transfer(dev,
0xA1, 2, 0xFFFF, 0, 0xA1, 2, 0xFFFF, 0,
resp_buf, response_len + 1, resp_buf, response_len + 1,
100, 0); 100, 1);
if(ret >= 0) checkm8_debug_indent("\tfinal request transferred %i bytes\n", ret); if(ret >= 0) checkm8_debug_indent("\tfinal request transferred %i bytes\n", ret);
else else
{ {
@@ -124,7 +124,7 @@ struct dev_cmd_resp *command(struct pwned_device *dev,
ret = ctrl_transfer(dev, ret = ctrl_transfer(dev,
0xA1, 2, 0xFFFF, 0, 0xA1, 2, 0xFFFF, 0,
resp_buf, response_len, resp_buf, response_len,
100, 0); 100, 1);
if(ret >= 0) checkm8_debug_indent("\tfinal request transferred %i bytes\n", ret); if(ret >= 0) checkm8_debug_indent("\tfinal request transferred %i bytes\n", ret);
else else
{ {
@@ -261,5 +261,5 @@ struct dev_cmd_resp *dev_write_memory(struct pwned_device *dev, long long addr,
((unsigned long *) cmd_args)[4] = len; ((unsigned long *) cmd_args)[4] = len;
memcpy(&cmd_args[40], data, len); memcpy(&cmd_args[40], data, len);
return command(dev, (unsigned char *) &cmd_args, 40 + len, 1 * sizeof(unsigned long long)); return command(dev, cmd_args, 40 + len, 1 * sizeof(unsigned long long));
} }

29
c8_remote/src/usb_helpers.c
View File

@@ -435,24 +435,13 @@ int no_error_ctrl_transfer_data(struct pwned_device *dev,
checkm8_debug_indent("\treceived argument ack\n"); checkm8_debug_indent("\treceived argument ack\n");
while(index < data_len) while(index < data_len)
{ {
if(data_len - index > ARD_BUF_SIZE) amount = ARD_BUF_SIZE; amount = 0;
else amount = data_len - index; while(read(dev->ard_fd, &amount, 2) == 0);
checkm8_debug_indent("\twriting data chunk of size %i\n", amount); checkm8_debug_indent("\twriting data chunk of size %i\n", amount);
write(dev->ard_fd, &data[index], amount); write(dev->ard_fd, &data[index], amount);
while(read(dev->ard_fd, &buf, 1) == 0);
if(buf == PROT_ACK)
{
checkm8_debug_indent("\treceived data ack\n");
index += amount; index += amount;
} }
else
{
checkm8_debug_indent("\treceived unexpected response %x\n", buf);
return CHECKM8_FAIL_PROT;
}
}
while(read(dev->ard_fd, &buf, 1) == 0); while(read(dev->ard_fd, &buf, 1) == 0);
if(buf == PROT_SUCCESS) if(buf == PROT_SUCCESS)
@@ -487,7 +476,7 @@ int ctrl_transfer(struct pwned_device *dev,
dev, bmRequestType, bRequest, wValue, wIndex, data, data_len, timeout); dev, bmRequestType, bRequest, wValue, wIndex, data, data_len, timeout);
#ifdef WITH_ARDUINO #ifdef WITH_ARDUINO
int amount, index; int amount, index, size;
char buf; char buf;
struct usb_xfer_args args; struct usb_xfer_args args;
args.bmRequestType = bmRequestType; args.bmRequestType = bmRequestType;
@@ -511,16 +500,16 @@ int ctrl_transfer(struct pwned_device *dev,
while(amount < data_len) while(amount < data_len)
{ {
// get the size of this chunk // get the size of this chunk
while(read(dev->ard_fd, &buf, 1) == 0); while(read(dev->ard_fd, &size, 2) == 0);
checkm8_debug_indent("\treceiving data chunk of size %i\n", buf); checkm8_debug_indent("\treceiving data chunk of size %i\n", size);
index = 0; index = 0;
while(index < buf) while(index < size)
{ {
index += read(dev->ard_fd, &data[amount + index], buf - index); index += read(dev->ard_fd, &data[amount + index], size - index);
} }
amount += buf; amount += size;
} }
} }
else else
@@ -529,7 +518,7 @@ int ctrl_transfer(struct pwned_device *dev,
while(index < data_len) while(index < data_len)
{ {
amount = 0; amount = 0;
while(read(dev->ard_fd, &amount, 1) == 0); while(read(dev->ard_fd, &amount, 2) == 0);
checkm8_debug_indent("\twriting data chunk of size %i\n", amount); checkm8_debug_indent("\twriting data chunk of size %i\n", amount);
write(dev->ard_fd, &data[index], amount); write(dev->ard_fd, &data[index], amount);