github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-19 21:03:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

style, same name everywhere in project

Browse source
This commit is contained in:
iceman1001 2023-07-24 00:53:35 +02:00
commit d19c9a262a
5 changed files with 26 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
client/src/cmddata.c
View file

@ -1758,8 +1758,8 @@ int getSamplesEx(uint32_t start, uint32_t end, bool verbose, bool ignore_lf_conf
if (verbose) if (verbose)
PrintAndLogEx(INFO, "Reading " _YELLOW_("%u") " bytes from device memory", n); PrintAndLogEx(INFO, "Reading " _YELLOW_("%u") " bytes from device memory", n);
PacketResponseNG response; PacketResponseNG resp;
if (!GetFromDevice(BIG_BUF, got, n, start, NULL, 0, &response, 10000, true)) { if (!GetFromDevice(BIG_BUF, got, n, start, NULL, 0, &resp, 10000, true)) {
PrintAndLogEx(WARNING, "timeout while waiting for reply."); PrintAndLogEx(WARNING, "timeout while waiting for reply.");
return PM3_ETIMEOUT; return PM3_ETIMEOUT;
} }
@ -1769,8 +1769,8 @@ int getSamplesEx(uint32_t start, uint32_t end, bool verbose, bool ignore_lf_conf
uint8_t bits_per_sample = 8; uint8_t bits_per_sample = 8;
// Old devices without this feature would send 0 at arg[0] // Old devices without this feature would send 0 at arg[0]
if (response.oldarg[0] > 0 && (ignore_lf_config == false)) { if (resp.oldarg[0] > 0 && (ignore_lf_config == false)) {
sample_config *sc = (sample_config *) response.data.asBytes; sample_config *sc = (sample_config *) resp.data.asBytes;
if (verbose) PrintAndLogEx(INFO, "Samples @ " _YELLOW_("%d") " bits/smpl, decimation 1:%d ", sc->bits_per_sample, sc->decimation); if (verbose) PrintAndLogEx(INFO, "Samples @ " _YELLOW_("%d") " bits/smpl, decimation 1:%d ", sc->bits_per_sample, sc->decimation);
bits_per_sample = sc->bits_per_sample; bits_per_sample = sc->bits_per_sample;
} }

4
client/src/cmdhf.c
View file

@ -426,8 +426,8 @@ int handle_hf_plot(void) {
uint8_t buf[FPGA_TRACE_SIZE] = {0}; uint8_t buf[FPGA_TRACE_SIZE] = {0};
PacketResponseNG response; PacketResponseNG resp;
if (GetFromDevice(FPGA_MEM, buf, FPGA_TRACE_SIZE, 0, NULL, 0, &response, 4000, true) == false) { if (GetFromDevice(FPGA_MEM, buf, FPGA_TRACE_SIZE, 0, NULL, 0, &resp, 4000, true) == false) {
PrintAndLogEx(WARNING, "timeout while waiting for reply."); PrintAndLogEx(WARNING, "timeout while waiting for reply.");
return PM3_ETIMEOUT; return PM3_ETIMEOUT;
} }

15
client/src/cmdhfmfhard.c
View file

@ -1562,7 +1562,20 @@ static int acquire_nonces(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_
float brute_force_depth; float brute_force_depth;
FILE *fnonces = NULL; FILE *fnonces = NULL;
PacketResponseNG resp;
// init to ZERO
PacketResponseNG resp = {
.cmd = 0,
.length = 0,
.magic = 0,
.status = 0,
.crc = 0,
.ng = false,
};
resp.oldarg[0] = 0;
resp.oldarg[1] = 0;
resp.oldarg[2] = 0;
memset(resp.data.asBytes, 0, PM3_CMD_DATA_SIZE);
uint8_t write_buf[9]; uint8_t write_buf[9];
char progress_text[80]; char progress_text[80];

6
client/src/cmdlfhitag.c
View file

@ -72,14 +72,14 @@ static int CmdLFHitagList(const char *Cmd) {
} }
// Query for the actual size of the trace // Query for the actual size of the trace
PacketResponseNG response; PacketResponseNG resp;
if (!GetFromDevice(BIG_BUF, got, PM3_CMD_DATA_SIZE, 0, NULL, 0, &response, 2500, false)) { if (!GetFromDevice(BIG_BUF, got, PM3_CMD_DATA_SIZE, 0, NULL, 0, &resp, 2500, false)) {
PrintAndLogEx(WARNING, "command execution time out"); PrintAndLogEx(WARNING, "command execution time out");
free(got); free(got);
return PM3_ETIMEOUT; return PM3_ETIMEOUT;
} }
uint16_t traceLen = response.arg[2]; uint16_t traceLen = resp.arg[2];
if (traceLen > PM3_CMD_DATA_SIZE) { if (traceLen > PM3_CMD_DATA_SIZE) {
uint8_t *p = realloc(got, traceLen); uint8_t *p = realloc(got, traceLen);
if (p == NULL) { if (p == NULL) {

6
client/src/cmdtrace.c
View file

@ -986,15 +986,15 @@ static int download_trace(void) {
PrintAndLogEx(INFO, "downloading tracelog data from device"); PrintAndLogEx(INFO, "downloading tracelog data from device");
// Query for the size of the trace, downloading PM3_CMD_DATA_SIZE // Query for the size of the trace, downloading PM3_CMD_DATA_SIZE
PacketResponseNG response; PacketResponseNG resp;
if (!GetFromDevice(BIG_BUF, gs_trace, PM3_CMD_DATA_SIZE, 0, NULL, 0, &response, 4000, true)) { if (!GetFromDevice(BIG_BUF, gs_trace, PM3_CMD_DATA_SIZE, 0, NULL, 0, &resp, 4000, true)) {
PrintAndLogEx(WARNING, "timeout while waiting for reply."); PrintAndLogEx(WARNING, "timeout while waiting for reply.");
free(gs_trace); free(gs_trace);
gs_trace = NULL; gs_trace = NULL;
return PM3_ETIMEOUT; return PM3_ETIMEOUT;
} }
gs_traceLen = response.oldarg[2]; gs_traceLen = resp.oldarg[2];
// if tracelog buffer was larger and we need to download more. // if tracelog buffer was larger and we need to download more.
if (gs_traceLen > PM3_CMD_DATA_SIZE) { if (gs_traceLen > PM3_CMD_DATA_SIZE) {