1. fixed hf 14a mifare. added functionality to ignore one Nt

[proxmark3-svn] / armsrc / appmain.c

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index aa70e677e7a1cef51e2414085be26301488e8786..49718ee8801d26859d7fbce4eaf2c3636d47aa67 100644 (file)
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -694,6 +694,28 @@ void UsbPacketReceived(uint8_t *packet, int len)
                        break;
 #endif
 
+#ifdef WITH_ISO14443a
+               case CMD_MIFARE_READBL:
+                       MifareReadBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+                       break;
+               case CMD_MIFARE_READSC:
+                       MifareReadSector(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+                       break;
+               case CMD_MIFARE_WRITEBL:
+                       MifareWriteBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+                       break;
+               case CMD_MIFARE_NESTED:
+                       MifareNested(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+                       break;
+               case CMD_MIFARE_CHKKEYS:
+                       MifareChkKeys(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+                       break;
+               case CMD_SIMULATE_MIFARE_CARD:
+                       Mifare1ksim(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+                       break;
+                       
+#endif
+
 #ifdef WITH_ISO14443b
                case CMD_SNOOP_ISO_14443:
                        SnoopIso14443();
@@ -706,6 +728,13 @@ void UsbPacketReceived(uint8_t *packet, int len)
                        break;
 #endif
 
+#ifdef WITH_ISO14443a
+               // Makes use of ISO14443a FPGA Firmware
+               case CMD_SNOOP_ICLASS:
+                       SnoopIClass();
+                       break;
+#endif
+
                case CMD_SIMULATE_TAG_HF_LISTEN:
                        SimulateTagHfListen();
                        break;