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

text and cpp warning for hitagu fix suggested by jump

Browse source
This commit is contained in:
iceman1001 2025-03-24 09:13:21 +01:00
commit 12f94a921a
5 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
armsrc/epa.c
View file

@ -649,5 +649,5 @@ void EPA_PACE_Simulate(const PacketCommandNG *c) {
Dbprintf("Standardized Domain Parameter: %i", pace_version_info.parameter_id); Dbprintf("Standardized Domain Parameter: %i", pace_version_info.parameter_id);
DbpString(""); DbpString("");
DbpString("finished"); DbpString("Done!");
} }

12
client/src/cmdflashmem.c
View file

@ -247,7 +247,7 @@ static int CmdFlashMemLoad(const char *Cmd) {
uint8_t *data = calloc(FLASH_MEM_MAX_SIZE_P(spi_flash_pages), sizeof(uint8_t)); uint8_t *data = calloc(FLASH_MEM_MAX_SIZE_P(spi_flash_pages), sizeof(uint8_t));
switch (d) { switch (d) {
case DICTIONARY_MIFARE: case DICTIONARY_MIFARE: {
keylen = MF_KEY_LENGTH; keylen = MF_KEY_LENGTH;
res = loadFileDICTIONARY(filename, data, &datalen, keylen, &keycount); res = loadFileDICTIONARY(filename, data, &datalen, keylen, &keycount);
if (res || !keycount) { if (res || !keycount) {
@ -261,7 +261,8 @@ static int CmdFlashMemLoad(const char *Cmd) {
} }
strcpy(spiffsDest, MF_KEYS_FILE); strcpy(spiffsDest, MF_KEYS_FILE);
break; break;
case DICTIONARY_T55XX: }
case DICTIONARY_T55XX: {
keylen = T55XX_KEY_LENGTH; keylen = T55XX_KEY_LENGTH;
res = loadFileDICTIONARY(filename, data, &datalen, keylen, &keycount); res = loadFileDICTIONARY(filename, data, &datalen, keylen, &keycount);
if (res || !keycount) { if (res || !keycount) {
@ -275,7 +276,8 @@ static int CmdFlashMemLoad(const char *Cmd) {
} }
strcpy(spiffsDest, T55XX_KEYS_FILE); strcpy(spiffsDest, T55XX_KEYS_FILE);
break; break;
case DICTIONARY_ICLASS: }
case DICTIONARY_ICLASS: {
keylen = ICLASS_KEY_LENGTH; keylen = ICLASS_KEY_LENGTH;
res = loadFileDICTIONARY(filename, data, &datalen, keylen, &keycount); res = loadFileDICTIONARY(filename, data, &datalen, keylen, &keycount);
if (res || !keycount) { if (res || !keycount) {
@ -289,7 +291,8 @@ static int CmdFlashMemLoad(const char *Cmd) {
} }
strcpy(spiffsDest, ICLASS_KEYS_FILE); strcpy(spiffsDest, ICLASS_KEYS_FILE);
break; break;
case DICTIONARY_NONE: }
case DICTIONARY_NONE: {
res = loadFile_safe(filename, ".bin", (void **)&data, &datalen); res = loadFile_safe(filename, ".bin", (void **)&data, &datalen);
if (res != PM3_SUCCESS) { if (res != PM3_SUCCESS) {
free(data); free(data);
@ -302,6 +305,7 @@ static int CmdFlashMemLoad(const char *Cmd) {
return PM3_EOVFLOW; return PM3_EOVFLOW;
} }
break; break;
}
} }
// ICEMAN: not needed when we transite to loadxxxx_safe methods // ICEMAN: not needed when we transite to loadxxxx_safe methods

5
client/src/cmdhf14a.c
View file

@ -3330,6 +3330,7 @@ int CmdHF14ANdefRead(const char *Cmd) {
} }
free(ndef_file); free(ndef_file);
PrintAndLogEx(NORMAL, "");
return PM3_SUCCESS; return PM3_SUCCESS;
} }
@ -3589,8 +3590,8 @@ int CmdHF14ANdefFormat(const char *Cmd) {
DropField(); DropField();
} }
PrintAndLogEx(INFO, "Done!");
PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "");
PrintAndLogEx(INFO, "finished");
return PM3_SUCCESS; return PM3_SUCCESS;
} }
@ -3742,8 +3743,8 @@ int CmdHF14ANdefWrite(const char *Cmd) {
PrintAndLogEx(INFO, "Write data file %02x " _GREEN_("success"), fnum); PrintAndLogEx(INFO, "Write data file %02x " _GREEN_("success"), fnum);
} }
PrintAndLogEx(INFO, "Done!");
PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "");
PrintAndLogEx(INFO, "finished");
return PM3_SUCCESS; return PM3_SUCCESS;
} }

1
client/src/cmdhfmf.c
View file

@ -2539,7 +2539,6 @@ static int CmdHF14AMfAutoPWN(const char *Cmd) {
char outfilename[FILE_PATH_SIZE] = {0}; char outfilename[FILE_PATH_SIZE] = {0};
CLIParamStrToBuf(arg_get_str(ctx, 6), (uint8_t *)outfilename, FILE_PATH_SIZE, &outfnlen); CLIParamStrToBuf(arg_get_str(ctx, 6), (uint8_t *)outfilename, FILE_PATH_SIZE, &outfnlen);
bool slow = arg_get_lit(ctx, 7); bool slow = arg_get_lit(ctx, 7);
bool legacy_mfchk = arg_get_lit(ctx, 8); bool legacy_mfchk = arg_get_lit(ctx, 8);
bool verbose = arg_get_lit(ctx, 9); bool verbose = arg_get_lit(ctx, 9);

3
client/src/cmdlfem410x.c
View file

@ -741,8 +741,7 @@ static int CmdEM410xClone(const char *Cmd) {
} }
} }
//TODO: keep other fields? //TODO: keep other fields?
memcpy(packet.data, &config_page, sizeof(config_page)); memcpy(packet.data, &config_page.asBytes, sizeof(config_page.asBytes));
// PrintAndLogEx(INFO, "packet.data: %s", sprint_hex(packet.data, sizeof(packet.data)));
packet.page = 1; packet.page = 1;
break; break;
} }