github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-07-31 03:50:45 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

style

Browse source
This commit is contained in:
iceman1001 2022-02-12 17:46:34 +01:00
parent f1d45b491c
commit ec59acf64c
9 changed files with 961 additions and 886 deletions
Download patch file Download diff file Expand all files Collapse all files

9
armsrc/Standalone/lf_em4100rsww.c
View file

@ -186,8 +186,7 @@ static void Wipe(void) {
static void Read(void) { static void Read(void) {
mode = 0; mode = 0;
while (low2 == 0 || mode == 0) while (low2 == 0 || mode == 0) {
{
DbpString("Read"); DbpString("Read");
LEDsoff(); LEDsoff();
LED_A_ON(); LED_A_ON();
@ -258,8 +257,7 @@ static void Validate(void) {
} }
return; return;
} } else if (low2 != 0 || high2 != 0) {
else if (low2 != 0 || high2 != 0) {
LEDsoff(); LEDsoff();
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
LED_A_ON(); LED_A_ON();
@ -272,8 +270,7 @@ static void Validate(void) {
} }
return; return;
} } else
else
SpinDelay(200); SpinDelay(200);
int b = BUTTON_HELD(200); int b = BUTTON_HELD(200);

3
client/src/pm3line_vocabulory.h
View file

@ -185,6 +185,8 @@ const static vocabulory_t vocabulory[] = {
{ 0, "hf cipurse formatall" }, { 0, "hf cipurse formatall" },
{ 0, "hf cipurse create" }, { 0, "hf cipurse create" },
{ 0, "hf cipurse delete" }, { 0, "hf cipurse delete" },
{ 0, "hf cipurse updkey" },
{ 0, "hf cipurse updakey" },
{ 0, "hf cipurse default" }, { 0, "hf cipurse default" },
{ 1, "hf cipurse test" }, { 1, "hf cipurse test" },
{ 1, "hf epa help" }, { 1, "hf epa help" },
@ -348,6 +350,7 @@ const static vocabulory_t vocabulory[] = {
{ 0, "hf mfu ndefread" }, { 0, "hf mfu ndefread" },
{ 0, "hf mfu rdbl" }, { 0, "hf mfu rdbl" },
{ 0, "hf mfu restore" }, { 0, "hf mfu restore" },
{ 1, "hf mfu view" },
{ 0, "hf mfu wrbl" }, { 0, "hf mfu wrbl" },
{ 0, "hf mfu eload" }, { 0, "hf mfu eload" },
{ 0, "hf mfu eview" }, { 0, "hf mfu eview" },

1406
doc/commands.json
View file

File diff suppressed because it is too large Load diff

27
doc/commands.md
View file

@ -137,17 +137,17 @@ Check column "offline" for their availability.
|command |offline |description |command |offline |description
|------- |------- |----------- |------- |------- |-----------
|`emv help `|Y |`This help` |`emv help `|Y |`This help`
|`emv exec `|N |`Executes EMV contactless transaction.` |`emv exec `|N |`Executes EMV contactless transaction`
|`emv pse `|N |`Execute PPSE. It selects 2PAY.SYS.DDF01 or 1PAY.SYS.DDF01 directory.` |`emv pse `|N |`Execute PPSE. It selects 2PAY.SYS.DDF01 or 1PAY.SYS.DDF01 directory`
|`emv search `|N |`Try to select all applets from applets list and print installed applets.` |`emv search `|N |`Try to select all applets from applets list and print installed applets`
|`emv select `|N |`Select applet.` |`emv select `|N |`Select applet`
|`emv gpo `|N |`Execute GetProcessingOptions.` |`emv gpo `|N |`Execute GetProcessingOptions`
|`emv readrec `|N |`Read files from card.` |`emv readrec `|N |`Read files from card`
|`emv genac `|N |`Generate ApplicationCryptogram.` |`emv genac `|N |`Generate ApplicationCryptogram`
|`emv challenge `|N |`Generate challenge.` |`emv challenge `|N |`Generate challenge`
|`emv intauth `|N |`Internal authentication.` |`emv intauth `|N |`Internal authentication`
|`emv scan `|N |`Scan EMV card and save it contents to json file for emulator.` |`emv scan `|N |`Scan EMV card and save it contents to json file for emulator`
|`emv test `|Y |`Crypto logic test.` |`emv test `|Y |`Crypto logic test`
|`emv list `|Y |`List ISO7816 history` |`emv list `|Y |`List ISO7816 history`
|`emv roca `|N |`Extract public keys and run ROCA test` |`emv roca `|N |`Extract public keys and run ROCA test`
@ -252,6 +252,8 @@ Check column "offline" for their availability.
|`hf cipurse formatall `|N |`Erase all the data from chip` |`hf cipurse formatall `|N |`Erase all the data from chip`
|`hf cipurse create `|N |`Create file, application, key via DGI record` |`hf cipurse create `|N |`Create file, application, key via DGI record`
|`hf cipurse delete `|N |`Delete file` |`hf cipurse delete `|N |`Delete file`
|`hf cipurse updkey `|N |`Update key`
|`hf cipurse updakey `|N |`Update key attributes`
|`hf cipurse default `|N |`Set default key and file id for all the other commands` |`hf cipurse default `|N |`Set default key and file id for all the other commands`
|`hf cipurse test `|Y |`Tests` |`hf cipurse test `|Y |`Tests`
@ -519,8 +521,9 @@ Check column "offline" for their availability.
|`hf mfu ndefread `|N |`Prints NDEF records from card` |`hf mfu ndefread `|N |`Prints NDEF records from card`
|`hf mfu rdbl `|N |`Read block` |`hf mfu rdbl `|N |`Read block`
|`hf mfu restore `|N |`Restore a dump onto a MFU MAGIC tag` |`hf mfu restore `|N |`Restore a dump onto a MFU MAGIC tag`
|`hf mfu view `|Y |`Display content from tag dump file`
|`hf mfu wrbl `|N |`Write block` |`hf mfu wrbl `|N |`Write block`
|`hf mfu eload `|N |`load Ultralight .eml dump file into emulator memory` |`hf mfu eload `|N |`Load Ultralight .eml dump file into emulator memory`
|`hf mfu eview `|N |`View emulator memory` |`hf mfu eview `|N |`View emulator memory`
|`hf mfu sim `|N |`Simulate MIFARE Ultralight from emulator memory` |`hf mfu sim `|N |`Simulate MIFARE Ultralight from emulator memory`
|`hf mfu setpwd `|N |`Set 3DES key - Ultralight-C` |`hf mfu setpwd `|N |`Set 3DES key - Ultralight-C`