dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #772 from slurdge/bigbigbuf

Browse Source 
[WIP] Make BigBuf take dynamically the available space with a fixed (4K) stack
This commit is contained in:
Iceman
2020-06-11 13:09:20 +02:00
committed by GitHub
parent 150017ce09 05ed3f7018
commit 291238a2f0
9 changed files with 71 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
client/src/cmddata.c
View File

@@ -567,7 +567,7 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
sscanf(Cmd, "%i %i %i %zu %c", &clk, &invert, &maxErr, &maxLen, &amp);
if (!maxLen) maxLen = BIGBUF_SIZE;
if (!maxLen) maxLen = pm3_capabilities.bigbuf_size;
if (invert != 0 && invert != 1) {
PrintAndLogEx(WARNING, "Invalid argument: %s", Cmd);
@@ -1517,16 +1517,18 @@ static int CmdHexsamples(const char *Cmd) {
uint32_t offset = 0;
char string_buf[25];
char *string_ptr = string_buf;
uint8_t got[BIGBUF_SIZE];
uint8_t got[pm3_capabilities.bigbuf_size];
sscanf(Cmd, "%u %u", &requested, &offset);
/* if no args send something */
if (requested == 0)
requested = 8;
if (requested > pm3_capabilities.bigbuf_size)
requested = pm3_capabilities.bigbuf_size;
if (offset + requested > sizeof(got)) {
PrintAndLogEx(NORMAL, "Tried to read past end of buffer, <bytes> + <offset> > %d", BIGBUF_SIZE);
PrintAndLogEx(NORMAL, "Tried to read past end of buffer, <bytes> + <offset> > %d", pm3_capabilities.bigbuf_size);
return PM3_EINVARG;
}
@@ -1595,10 +1597,11 @@ int getSamples(uint32_t n, bool verbose) {
// we don't have to worry about remaining trash
// in the last byte in case the bits-per-sample
// does not line up on byte boundaries
uint8_t got[BIGBUF_SIZE - 1] = { 0 };
uint8_t got[pm3_capabilities.bigbuf_size - 1];
memset(got, 0x00, sizeof(got));
if (n == 0 || n > sizeof(got))
n = sizeof(got);
if (n == 0 || n > pm3_capabilities.bigbuf_size - 1)
n = pm3_capabilities.bigbuf_size - 1;
if (verbose) PrintAndLogEx(INFO, "Reading " _YELLOW_("%u") " bytes from device memory", n);

1
client/src/cmddata.h
View File

@@ -79,7 +79,6 @@ int AskEdgeDetect(const int *in, int *out, int len, int threshold);
int demodIdteck(void);
#define MAX_DEMOD_BUF_LEN (1024*128)
#define BIGBUF_SIZE 40000
extern uint8_t DemodBuffer[MAX_DEMOD_BUF_LEN];
extern size_t DemodBufferLen;

2
client/src/cmdlft55xx.c
View File

@@ -2837,7 +2837,7 @@ static int CmdResetRead(const char *Cmd) {
if (resp.status == PM3_SUCCESS) {
uint16_t gotsize = BIGBUF_SIZE - 1;
uint16_t gotsize = pm3_capabilities.bigbuf_size - 1;
uint8_t *got = calloc(gotsize, sizeof(uint8_t));
if (got == NULL) {
PrintAndLogEx(WARNING, "failed to allocate memory");