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

make style

Browse Source
This commit is contained in:
Philippe Teuwen
2020-06-10 01:17:49 +02:00
parent e3e33a6501
commit b55c186b3a
5 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/cmdhf14a.c
View File

@@ -1354,7 +1354,7 @@ static int detect_nxp_card(uint8_t sak, uint16_t atqa) {
type |= MTDESFIRE;
}
}
if (type == MTNONE) {
PrintAndLogEx(WARNING, " failed to fingerprint");
}

10
client/src/cmdhficlass.c
View File

@@ -770,7 +770,7 @@ static int CmdHFiClassELoad(const char *Cmd) {
break;
}
case EML: {
res = loadFileEML_safe(filename, (void**)&dump, &bytes_read);
res = loadFileEML_safe(filename, (void **)&dump, &bytes_read);
break;
}
case JSON: {
@@ -1676,7 +1676,7 @@ static int CmdHFiClassCloneTag(const char *Cmd) {
uint8_t *dump = NULL;
size_t bytes_read = 0;
if (loadFile_safe(filename, "", (void**)&dump, &bytes_read) != PM3_SUCCESS) {
if (loadFile_safe(filename, "", (void **)&dump, &bytes_read) != PM3_SUCCESS) {
PrintAndLogEx(FAILED, "File: " _YELLOW_("%s") ": not found or locked.", filename);
return PM3_EFILE;
}
@@ -1702,7 +1702,7 @@ static int CmdHFiClassCloneTag(const char *Cmd) {
memcpy(tag_data, dump + startblock * 8, sizeof(iclass_block_t) * (endblock - startblock + 1));
free(dump);
uint8_t MAC[4] = {0x00, 0x00, 0x00, 0x00};
uint8_t div_key[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
@@ -2040,7 +2040,7 @@ static int CmdHFiClassReadTagFile(const char *Cmd) {
uint8_t *dump = NULL;
size_t bytes_read = 0;
if (loadFile_safe(filename, "", (void**)&dump, &bytes_read) != PM3_SUCCESS) {
if (loadFile_safe(filename, "", (void **)&dump, &bytes_read) != PM3_SUCCESS) {
PrintAndLogEx(FAILED, "File: " _YELLOW_("%s") ": not found or locked.", filename);
return PM3_EFILE;
}
@@ -2190,7 +2190,7 @@ static int loadKeys(char *filename) {
uint8_t *dump = NULL;
size_t bytes_read = 0;
if (loadFile_safe(filename, "", (void**)&dump, &bytes_read) != PM3_SUCCESS) {
if (loadFile_safe(filename, "", (void **)&dump, &bytes_read) != PM3_SUCCESS) {
PrintAndLogEx(FAILED, "File: " _YELLOW_("%s") ": not found or locked.", filename);
return PM3_EFILE;
}

4
client/src/cmdhfmf.c
View File

@@ -4525,8 +4525,8 @@ static int CmdHF14AMfMAD(const char *Cmd) {
PrintAndLogEx(ERR, "error, read sector 0. card don't have MAD or don't have MAD on default keys");
return PM3_ESOFT;
}
PrintAndLogEx(NORMAL, "");
PrintAndLogEx(INFO, "--- " _CYAN_("MAD Information") " -------------------------------");
PrintAndLogEx(INFO, "---------------------------------------------------");

10
client/src/cmdlfviking.c
View File

@@ -1,5 +1,5 @@
//-----------------------------------------------------------------------------
// Marshmellow,
// Marshmellow,
//
// This code is licensed to you under the terms of the GNU GPL, version 2 or,
// at your option, any later version. See the LICENSE.txt file for the text of
@@ -53,18 +53,18 @@ static int usage_lf_viking_sim(void) {
}
static int CmdVikingDemod(const char *Cmd) {
return demodViking();
return demodViking();
}
//see ASKDemod for what args are accepted
int demodViking(void) {
if (ASKDemod("", false, false, 1) != PM3_SUCCESS) {
PrintAndLogEx(DEBUG, "DEBUG: Error - Viking ASKDemod failed");
return PM3_ESOFT;
}
size_t size = DemodBufferLen;
size_t size = DemodBufferLen;
int ans = detectViking(DemodBuffer, &size);
if (ans < 0) {
PrintAndLogEx(DEBUG, "DEBUG: Error - Viking Demod %d %s", ans, (ans == -5) ? _RED_("[chksum error]") : "");