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

hf_unisniff: rename "ask" to "user" to avoid confusion with "ASK" sniffing

Browse source
This commit is contained in:
Anonymous 2023-12-03 08:44:06 -05:00
commit 9b752c6ecb
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
armsrc/Standalone/hf_unisniff.c
View file

@ -56,9 +56,9 @@
* append = append to existing file, create if not existing. * append = append to existing file, create if not existing.
* none = do not save to SPIFFS, leave in trace buffer only. * none = do not save to SPIFFS, leave in trace buffer only.
* *
* protocol = [14a|14b|15|ask] * protocol = [14a|14b|15|user]
* which protocol to sniff. If you choose a protocol it will go directly * which protocol to sniff. If you choose a protocol it will go directly
* to work. If you choose 'ask' you may select the protocol at the start * to work. If you choose 'user' you may select the protocol at the start
* of each session. * of each session.
* *
* To retrieve trace data from flash: * To retrieve trace data from flash:
@ -120,12 +120,12 @@
#define HF_UNISNIFF_CONFIG "hf_unisniff.conf" #define HF_UNISNIFF_CONFIG "hf_unisniff.conf"
#define HF_UNISNIFF_CONFIG_SIZE 128 #define HF_UNISNIFF_CONFIG_SIZE 128
#define HF_UNISNIFF_PROTOCOLS {"14a","14b","15", "ask"} // The logic requires ASK be last. #define HF_UNISNIFF_PROTOCOLS {"14a","14b","15", "user"} // The logic requires USER be last.
#define HF_UNISNIFF_NUM_PROTOCOLS 4 #define HF_UNISNIFF_NUM_PROTOCOLS 4
#define HF_UNISNIFF_PROTO_14a 0 #define HF_UNISNIFF_PROTO_14a 0
#define HF_UNISNIFF_PROTO_14b 1 #define HF_UNISNIFF_PROTO_14b 1
#define HF_UNISNIFF_PROTO_15 2 #define HF_UNISNIFF_PROTO_15 2
#define HF_UNISNIFF_PROTO_ASK HF_UNISNIFF_NUM_PROTOCOLS-1 #define HF_UNISNIFF_PROTO_USER HF_UNISNIFF_NUM_PROTOCOLS-1
#define HF_UNISNIFF_SAVE_MODE HF_UNISNIFF_SAVE_MODE_NEW // Default, override in .conf #define HF_UNISNIFF_SAVE_MODE HF_UNISNIFF_SAVE_MODE_NEW // Default, override in .conf
#define HF_UNISNIFF_SAVE_MODE_NEW 0 #define HF_UNISNIFF_SAVE_MODE_NEW 0
@ -225,7 +225,7 @@ void RunMod(void) {
} }
#endif #endif
if (sniff_protocol >= HF_UNISNIFF_PROTO_ASK) { if (sniff_protocol >= HF_UNISNIFF_PROTO_USER) {
Dbprintf("[!] Protocol undefined, going to prompt loop"); Dbprintf("[!] Protocol undefined, going to prompt loop");
sniff_protocol = default_sniff_protocol; // Default to compile-time setting. sniff_protocol = default_sniff_protocol; // Default to compile-time setting.
for (;;) { for (;;) {
@ -243,7 +243,7 @@ void RunMod(void) {
int button_pressed = BUTTON_HELD(1000); int button_pressed = BUTTON_HELD(1000);
if (button_pressed == BUTTON_SINGLE_CLICK) { if (button_pressed == BUTTON_SINGLE_CLICK) {
sniff_protocol++; sniff_protocol++;
if (sniff_protocol >= HF_UNISNIFF_PROTO_ASK) sniff_protocol=0; if (sniff_protocol >= HF_UNISNIFF_PROTO_USER) sniff_protocol=0;
SpinDelay(100); SpinDelay(100);
Dbprintf("Selected protocol: '%s'", protocols[sniff_protocol]); Dbprintf("Selected protocol: '%s'", protocols[sniff_protocol]);
} else if (button_pressed == BUTTON_HOLD) { } else if (button_pressed == BUTTON_HOLD) {

1
doc/md/Use_of_Proxmark/4_Advanced-compilation-parameters.md
View file

@ -133,6 +133,7 @@ Here are the supported values you can assign to `STANDALONE` in `Makefile.platfo
| HF_REBLAY | 14A relay over BT - Salvador Mendoza | HF_REBLAY | 14A relay over BT - Salvador Mendoza
| HF_TCPRST | IKEA Rothult ST25TA, Standalone Master Key Dump/Emulation - Nick Draffen | HF_TCPRST | IKEA Rothult ST25TA, Standalone Master Key Dump/Emulation - Nick Draffen
| HF_TMUDFORD | Read and emulate ISO15693 card UID - Tim Mudford | HF_TMUDFORD | Read and emulate ISO15693 card UID - Tim Mudford
| HF_UNISNIFF | Combined 14a/14b/15 sniffer with runtime selection & extra save options
| HF_YOUNG | Mifare sniff/simulation - Craig Young | HF_YOUNG | Mifare sniff/simulation - Craig Young
| DANKARMULTI | Standalone mode that bakes together multiple other standalone modes. - dankar | DANKARMULTI | Standalone mode that bakes together multiple other standalone modes. - dankar