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

style

Browse Source
This commit is contained in:
iceman1001
2020-09-07 10:39:15 +02:00
parent 0be35a8e7e
commit 5d357a6039
13 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/cmdanalyse.c
View File

@@ -951,7 +951,7 @@ static command_t CommandTable[] = {
{"lfsr", CmdAnalyseLfsr, AlwaysAvailable, "LFSR tests"},
{"a", CmdAnalyseA, AlwaysAvailable, "num bits test"},
{"nuid", CmdAnalyseNuid, AlwaysAvailable, "create NUID from 7byte UID"},
{"demodbuff", CmdAnalyseDemodBuffer, AlwaysAvailable, "Load binary string to demodbuffer"},
{"demodbuff", CmdAnalyseDemodBuffer, AlwaysAvailable, "Load binary string to demodbuffer"},
{"freq", CmdAnalyseFreq, AlwaysAvailable, "Calc wave lengths"},
{NULL, NULL, NULL, NULL}
};

4
client/src/cmdhffelica.c
View File

@@ -1643,9 +1643,9 @@ static int CmdHFFelicaDumpLite(const char *Cmd) {
return PM3_ETIMEOUT;
}
}
PrintAndLogEx(NORMAL, "");
if (resp.oldarg[0] == 0) {
PrintAndLogEx(WARNING, "Button pressed, aborted");
return PM3_EOPABORTED;

2
client/src/cmdhfmfdes.c
View File

@@ -4395,7 +4395,7 @@ static int CmdHF14aDesChk(const char *Cmd) {
if (pattern2b && startPattern < 0x10000) {
if (verbose == false)
PrintAndLogEx(NORMAL, "p" NOLF);
aeskeyListLen = 0;
deskeyListLen = 0;
k3kkeyListLen = 0;

4
client/src/cmdlf.c
View File

@@ -615,8 +615,8 @@ int lf_read(bool verbose, uint32_t samples) {
}
}
// response is number of bits read
uint32_t size = (resp.data.asDwords[0] / 8);
// response is number of bits read
uint32_t size = (resp.data.asDwords[0] / 8);
getSamples(size, verbose);
return PM3_SUCCESS;
}

2
client/src/emv/emv_roca.c
View File

@@ -71,7 +71,7 @@ static mbedtls_mpi_uint mpi_get_uint(const mbedtls_mpi *X) {
if (X->n == 1 && X->s > 0) {
return X->p[0];
}
PrintAndLogEx(WARNING, "ZERRRRO!!!\n");
return 0;
}

2
client/src/fido/cbortools.c
View File

@@ -49,7 +49,7 @@ static CborError dumpelm(CborValue *it, bool *got_next, int nestingLevel) {
*got_next = true;
if (err)
return err; // parse error
PrintAndLogEx(NORMAL, "%s" NOLF, sprint_hex(buf, n));
free(buf);
break;

6
client/src/mifare/mifarehost.c
View File

@@ -690,7 +690,7 @@ int mfStaticNested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBl
// check a block of generated key candidates.
if (IfPm3Flash()) {
mem[3] = ((chunk >> 8) & 0xFF);
mem[4] = (chunk & 0xFF);
@@ -915,7 +915,7 @@ int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, uint8_t params) {
clearCommandBuffer();
SendCommandMIX(CMD_HF_MIFARE_CSETBL, params, blockNo, 0, data, 16);
PacketResponseNG resp;
if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
if (WaitForResponseTimeout(CMD_ACK, &resp, 3500)) {
uint8_t isOK = resp.oldarg[0] & 0xff;
if (uid != NULL)
memcpy(uid, resp.data.asBytes, 4);
@@ -1078,7 +1078,7 @@ int detect_classic_nackbug(bool verbose) {
PrintAndLogEx(SUCCESS, "press pm3-button on the Proxmark3 device to abort both Proxmark3 and client.\n");
while (true) {
PrintAndLogEx(NORMAL, "." NOLF);
if (kbd_enter_pressed()) {
return PM3_EOPABORTED;