Added the changes to armsrc for milfare ultralight C and Desfire commands

[proxmark3-svn] / armsrc / appmain.c

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 2061f6b3efb758fb4817cf54f0f2cd4c082a88b9..947c12ccdb9d474d349c5f2feac1bdc676a4546d 100644 (file)
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -801,7 +801,16 @@ void UsbPacketReceived(uint8_t *packet, int len)
                        MifareUReadBlock(c->arg[0],c->d.asBytes);
                        break;
                case CMD_MIFAREU_READCARD:
-                       MifareUReadCard(c->arg[0],c->d.asBytes);
+                        MifareUReadCard(c->arg[0],c->arg[1],c->d.asBytes);
+                        break;
+                case CMD_MIFAREUC_READCARD:
+                        MifareUReadCard(c->arg[0],c->arg[1],c->d.asBytes);
+                        break;
+                case CMD_MIFAREUC_AUTH1:
+                        MifareUC_Auth1(c->arg[0],c->d.asBytes);
+                        break;
+                case CMD_MIFAREUC_AUTH2:
+                        MifareUC_Auth2(c->arg[0],c->d.asBytes);
                         break;
                case CMD_MIFARE_READSC:
                        MifareReadSector(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
@@ -824,7 +833,12 @@ void UsbPacketReceived(uint8_t *packet, int len)
                case CMD_SIMULATE_MIFARE_CARD:
                        Mifare1ksim(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
                        break;
-               
+               case CMD_MIFARE_DES_AUTH1:
+                        Mifare_DES_Auth1(c->arg[0],c->d.asBytes);
+                        break;
+                case CMD_MIFARE_DES_AUTH2:
+                        Mifare_DES_Auth2(c->arg[0],c->d.asBytes);
+                        break;         
                // emulator
                case CMD_MIFARE_SET_DBGMODE:
                        MifareSetDbgLvl(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
@@ -862,11 +876,17 @@ void UsbPacketReceived(uint8_t *packet, int len)
                        SnoopIClass();
                        break;
                case CMD_SIMULATE_TAG_ICLASS:
-                       SimulateIClass(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+                       SimulateIClass(c->arg[0], c->d.asBytes);
                        break;
                case CMD_READER_ICLASS:
                        ReaderIClass(c->arg[0]);
                        break;
+               case CMD_READER_ICLASS_REPLAY:
+                   ReaderIClass_Replay(c->arg[0], c->d.asBytes);
+                       break;
+               case CMD_ICLASS_ISO14443A_GETPUBLIC:
+                   IClass_iso14443A_GetPublic(c->arg[0]);
+                   break;
 #endif
 
                case CMD_SIMULATE_TAG_HF_LISTEN: