implement 'hf iclass snoop -j'

[proxmark3-svn] / armsrc / appmain.c

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 9b9acb6f95fc920f5ef28699900f7c51b14658ce..589f394d5cea78de9106402f1b46499644fd09c5 100644 (file)
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -24,10 +24,12 @@
 #include "legicrfsim.h"
 #include "hitag2.h"
 #include "hitagS.h"
 #include "legicrfsim.h"
 #include "hitag2.h"
 #include "hitagS.h"

+#include "iclass.h"

 #include "iso14443b.h"
 #include "iso15693.h"
 #include "lfsampling.h"
 #include "BigBuf.h"
 #include "iso14443b.h"
 #include "iso15693.h"
 #include "lfsampling.h"
 #include "BigBuf.h"

+#include "mifarecmd.h"

 #include "mifareutil.h"
 #include "mifaresim.h"
 #include "pcf7931.h"
 #include "mifareutil.h"
 #include "mifaresim.h"
 #include "pcf7931.h"


@@ -996,7 +998,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
        switch(c->cmd) {
 #ifdef WITH_LF
                case CMD_SET_LF_SAMPLING_CONFIG:
        switch(c->cmd) {
 #ifdef WITH_LF
                case CMD_SET_LF_SAMPLING_CONFIG:

-                       setSamplingConfig((sample_config *) c->d.asBytes);
+                       setSamplingConfig(c->d.asBytes);

                        break;
                case CMD_ACQUIRE_RAW_ADC_SAMPLES_125K:
                        cmd_send(CMD_ACK,SampleLF(c->arg[0], c->arg[1]),0,0,0,0);
                        break;
                case CMD_ACQUIRE_RAW_ADC_SAMPLES_125K:
                        cmd_send(CMD_ACK,SampleLF(c->arg[0], c->arg[1]),0,0,0,0);


@@ -1140,7 +1142,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
                        break;
                        
                case CMD_SNOOP_ISO_15693:
                        break;
                        
                case CMD_SNOOP_ISO_15693:

-                       SnoopIso15693();
+                       SnoopIso15693(0, NULL);

                        break;
                        
                case CMD_ISO_15693_COMMAND:
                        break;
                        
                case CMD_ISO_15693_COMMAND:


@@ -1242,6 +1244,9 @@ void UsbPacketReceived(uint8_t *packet, int len)
                case CMD_MIFARE_WRITEBL:
                        MifareWriteBlock(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_PERSONALIZE_UID:
+                       MifarePersonalizeUID(c->arg[0], c->arg[1], c->d.asBytes);
+                       break;

                //case CMD_MIFAREU_WRITEBL_COMPAT:
                        //MifareUWriteBlockCompat(c->arg[0], c->d.asBytes);
                        //break;
                //case CMD_MIFAREU_WRITEBL_COMPAT:
                        //MifareUWriteBlockCompat(c->arg[0], c->d.asBytes);
                        //break;


@@ -1302,7 +1307,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
 #ifdef WITH_ICLASS
                // Makes use of ISO14443a FPGA Firmware
                case CMD_SNOOP_ICLASS:
 #ifdef WITH_ICLASS
                // Makes use of ISO14443a FPGA Firmware
                case CMD_SNOOP_ICLASS:

-                       SnoopIClass();
+                       SnoopIClass(c->arg[0], c->d.asBytes);

                        break;
                case CMD_SIMULATE_TAG_ICLASS:
                        SimulateIClass(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
                        break;
                case CMD_SIMULATE_TAG_ICLASS:
                        SimulateIClass(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);


@@ -1319,14 +1324,14 @@ void UsbPacketReceived(uint8_t *packet, int len)
                case CMD_ICLASS_WRITEBLOCK:
                        iClass_WriteBlock(c->arg[0], c->d.asBytes);
                        break;
                case CMD_ICLASS_WRITEBLOCK:
                        iClass_WriteBlock(c->arg[0], c->d.asBytes);
                        break;

-               case CMD_ICLASS_READCHECK:  // auth step 1
-                       iClass_ReadCheck(c->arg[0], c->arg[1]);
-                       break;

                case CMD_ICLASS_READBLOCK:
                        iClass_ReadBlk(c->arg[0]);
                        break;
                case CMD_ICLASS_READBLOCK:
                        iClass_ReadBlk(c->arg[0]);
                        break;

-               case CMD_ICLASS_AUTHENTICATION: //check
-                       iClass_Authentication(c->d.asBytes);
+               case CMD_ICLASS_CHECK:
+                       iClass_Check(c->d.asBytes);
+                       break;
+               case CMD_ICLASS_READCHECK:
+                       iClass_Readcheck(c->arg[0], c->arg[1]);

                        break;
                case CMD_ICLASS_DUMP:
                        iClass_Dump(c->arg[0], c->arg[1]);
                        break;
                case CMD_ICLASS_DUMP:
                        iClass_Dump(c->arg[0], c->arg[1]);