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 4

white space and adding hf_unisniff to buildscript

Browse source
This commit is contained in:
iceman1001 2024-01-02 23:11:51 +01:00
commit fda0968db2
5 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/src/cmdhfmfp.c
View file

@ -2091,7 +2091,7 @@ static command_t CommandTable[] = {
{"rdbl", CmdHFMFPRdbl, IfPm3Iso14443a, "Read blocks from card"}, {"rdbl", CmdHFMFPRdbl, IfPm3Iso14443a, "Read blocks from card"},
{"rdsc", CmdHFMFPRdsc, IfPm3Iso14443a, "Read sectors from card"}, {"rdsc", CmdHFMFPRdsc, IfPm3Iso14443a, "Read sectors from card"},
{"wrbl", CmdHFMFPWrbl, IfPm3Iso14443a, "Write block to card"}, {"wrbl", CmdHFMFPWrbl, IfPm3Iso14443a, "Write block to card"},
{"chkey", CmdHFMFPChKey, IfPm3Iso14443a, "Change key on card"}, {"chkey", CmdHFMFPChKey, IfPm3Iso14443a, "Change key on card"},
{"chconf", CmdHFMFPChConf, IfPm3Iso14443a, "Change config on card"}, {"chconf", CmdHFMFPChConf, IfPm3Iso14443a, "Change config on card"},
{"-----------", CmdHelp, IfPm3Iso14443a, "---------------- " _CYAN_("personalization") " -------------------"}, {"-----------", CmdHelp, IfPm3Iso14443a, "---------------- " _CYAN_("personalization") " -------------------"},
{"commitp", CmdHFMFPCommitPerso, IfPm3Iso14443a, "Configure security layer (SL1/SL3 mode)"}, {"commitp", CmdHFMFPCommitPerso, IfPm3Iso14443a, "Configure security layer (SL1/SL3 mode)"},

2
client/src/cmdsmartcard.c
View file

@ -1313,7 +1313,7 @@ static int CmdRelay(const char *Cmd) {
continue; continue;
} }
} else if (cardType == ISODEP_NFCB) { } else if (cardType == ISODEP_NFCB) {
if (exchange_14b_apdu(cmdbuf + 2, apduLen, !fieldActivated, true, apduRes, sizeof(apduRes), &apduResLen, 0)) { if (exchange_14b_apdu(cmdbuf + 2, apduLen, !fieldActivated, true, apduRes, sizeof(apduRes), &apduResLen, 0)) {
cardType = ISODEP_INACTIVE; cardType = ISODEP_INACTIVE;
mbedtls_net_close(&netCtx); mbedtls_net_close(&netCtx);
continue; continue;

2
client/src/cmdtrace.c
View file

@ -1121,7 +1121,7 @@ static int CmdTraceLoad(const char *Cmd) {
CLIParserFree(ctx); CLIParserFree(ctx);
if (gs_trace) { if (gs_trace) {
free(gs_trace); // maybe better to not clobber this until we have successful load? free(gs_trace); // maybe better to not clobber this until we have successful load?
gs_trace = NULL; gs_trace = NULL;
gs_traceLen = 0; gs_traceLen = 0;
} }

14
doc/commands.json
View file

@ -10973,16 +10973,18 @@
"command": "mem spiffs dump", "command": "mem spiffs dump",
"description": "Dumps device SPIFFS file to a local file Size is handled by first sending a STAT command against file to verify existence", "description": "Dumps device SPIFFS file to a local file Size is handled by first sending a STAT command against file to verify existence",
"notes": [ "notes": [
"mem spiffs dump -s tag.bin -> download binary file from device", "mem spiffs dump -s tag.bin -> download binary file from device, saved as `tag.bin`",
"mem spiffs dump -s tag.bin -d a001 -e -> download tag.bin, save as `a001.bin`" "mem spiffs dump -s tag.bin -d a001 -> download tag.bin, save as `a001.bin`",
"mem spiffs dump -s tag.bin -t -> download tag.bin into trace buffer"
], ],
"offline": false, "offline": false,
"options": [ "options": [
"-h, --help This help", "-h, --help This help",
"-s, --src <fn> SPIFFS file to save", "-s, --src <fn> SPIFFS file to save",
"-d, --dest <fn> file name to save to <w/o .bin>" "-d, --dest <fn> file name to save to <w/o .bin>",
"-t, --trace download into trace buffer"
], ],
"usage": "mem spiffs dump [-h] -s <fn> [-d <fn>]" "usage": "mem spiffs dump [-ht] -s <fn> [-d <fn>]"
}, },
"mem spiffs info": { "mem spiffs info": {
"command": "mem spiffs info", "command": "mem spiffs info",
@ -11087,7 +11089,7 @@
}, },
"mem spiffs view": { "mem spiffs view": {
"command": "mem spiffs view", "command": "mem spiffs view",
"description": "View a file on flash memory on devicer in console", "description": "View a file on flash memory on device in console",
"notes": [ "notes": [
"mem spiffs view -f tag.bin" "mem spiffs view -f tag.bin"
], ],
@ -12160,6 +12162,6 @@
"metadata": { "metadata": {
"commands_extracted": 703, "commands_extracted": 703,
"extracted_by": "PM3Help2JSON v1.00", "extracted_by": "PM3Help2JSON v1.00",
"extracted_on": "2024-01-02T20:54:40" "extracted_on": "2024-01-02T22:09:45"
} }
} }

2
tools/build_all_firmwares.sh
View file

@ -32,7 +32,7 @@ mv bootrom/obj/bootrom.elf "$DEST/PM3BOOTROM.elf"
# cf armsrc/Standalone/Makefile.hal # cf armsrc/Standalone/Makefile.hal
STANDALONE_MODES=(LF_SKELETON) STANDALONE_MODES=(LF_SKELETON)
STANDALONE_MODES+=(LF_EM4100EMUL LF_EM4100RSWB LF_EM4100RSWW LF_EM4100RWC LF_HIDBRUTE LF_HIDFCBRUTE LF_ICEHID LF_MULTIHID LF_NEDAP_SIM LF_NEXID LF_PROXBRUTE LF_PROX2BRUTE LF_SAMYRUN LF_THAREXDE) STANDALONE_MODES+=(LF_EM4100EMUL LF_EM4100RSWB LF_EM4100RSWW LF_EM4100RWC LF_HIDBRUTE LF_HIDFCBRUTE LF_ICEHID LF_MULTIHID LF_NEDAP_SIM LF_NEXID LF_PROXBRUTE LF_PROX2BRUTE LF_SAMYRUN LF_THAREXDE)
STANDALONE_MODES+=(HF_14ASNIFF HF_14BSNIFF HF_15SNIFF HF_AVEFUL HF_BOG HF_CARDHOPPER HF_COLIN HF_CRAFTBYTE HF_ICECLASS HF_LEGIC HF_LEGICSIM HF_MATTYRUN HF_MFCSIM HF_MSDSAL HF_REBLAY HF_TCPRST HF_TMUDFORD HF_YOUNG) STANDALONE_MODES+=(HF_14ASNIFF HF_14BSNIFF HF_15SNIFF HF_AVEFUL HF_BOG HF_CARDHOPPER HF_COLIN HF_CRAFTBYTE HF_ICECLASS HF_LEGIC HF_LEGICSIM HF_MATTYRUN HF_MFCSIM HF_MSDSAL HF_REBLAY HF_TCPRST HF_TMUDFORD HF_UNISNIFF HF_YOUNG)
STANDALONE_MODES+=(DANKARMULTI) STANDALONE_MODES+=(DANKARMULTI)
STANDALONE_MODES_REQ_BT=(HF_CARDHOPPER HF_REBLAY) STANDALONE_MODES_REQ_BT=(HF_CARDHOPPER HF_REBLAY)
STANDALONE_MODES_REQ_SMARTCARD=() STANDALONE_MODES_REQ_SMARTCARD=()