Merge pull request #112 from marshmellow42/master

[proxmark3-svn] / client / cmdhficlass.c

diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index b945e12b4c2b850360113533a8c7bf41f0210c63..824aaa3674cc1bd5cf84d38174968d0e3fbd468e 100644 (file)
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -29,6 +29,8 @@
 #include "loclass/ikeys.h"
 #include "loclass/elite_crack.h"
 #include "loclass/fileutils.h"
 #include "loclass/ikeys.h"
 #include "loclass/elite_crack.h"
 #include "loclass/fileutils.h"

+#include "protocols.h"
+#include "usb_cmd.h"

 
 static int CmdHelp(const char *Cmd);
 
 
 static int CmdHelp(const char *Cmd);
 


@@ -75,10 +77,9 @@ int CmdHFiClassSim(const char *Cmd)
        uint8_t CSN[8] = {0, 0, 0, 0, 0, 0, 0, 0};
 
        if (strlen(Cmd)<1) {
        uint8_t CSN[8] = {0, 0, 0, 0, 0, 0, 0, 0};
 
        if (strlen(Cmd)<1) {

-               usage_hf_iclass_sim();
+               return usage_hf_iclass_sim();

        }
        }

-
-       simType = param_get8(Cmd, 0);
+       simType = param_get8ex(Cmd, 0, 0, 10);

 
        if(simType == 0)
        {
 
        if(simType == 0)
        {


@@ -164,38 +165,47 @@ int CmdHFiClassSim(const char *Cmd)
        return 0;
 }
 
        return 0;
 }
 

-int CmdHFiClassReader(const char *Cmd)
+int HFiClassReader(const char *Cmd, bool loop, bool verbose)

 {
 {

-       UsbCommand c = {CMD_READER_ICLASS, {0}};
+       bool tagFound = false;
+       UsbCommand c = {CMD_READER_ICLASS, {FLAG_ICLASS_READER_CSN|
+                                       FLAG_ICLASS_READER_CONF|FLAG_ICLASS_READER_AA}};
+       if (!loop) c.arg[0] |= FLAG_ICLASS_READER_ONLY_ONCE | FLAG_ICLASS_READER_ONE_TRY;

        SendCommand(&c);
        UsbCommand resp;
        while(!ukbhit()){
        SendCommand(&c);
        UsbCommand resp;
        while(!ukbhit()){

-               if (WaitForResponseTimeout(CMD_ACK,&resp,4500)) {
-                       uint8_t isOK    = resp.arg[0] & 0xff;
-                       uint8_t * data  = resp.d.asBytes;
+               if (WaitForResponseTimeout(CMD_ACK,&resp, 4500)) {
+                       uint8_t readStatus = resp.arg[0] & 0xff;
+                       uint8_t *data = resp.d.asBytes;

 
 

-                       PrintAndLog("isOk:%02x", isOK);
-                       if( isOK == 0){
+                       if (verbose)
+                               PrintAndLog("Readstatus:%02x", readStatus);
+                       if( readStatus == 0){

                                //Aborted
                                //Aborted

-                               PrintAndLog("Quitting...");
+                               if (verbose) PrintAndLog("Quitting...");

                                return 0;
                        }
                                return 0;
                        }

-                       if(isOK > 0)
-                       {
+                       if( readStatus & FLAG_ICLASS_READER_CSN){

                                PrintAndLog("CSN: %s",sprint_hex(data,8));
                                PrintAndLog("CSN: %s",sprint_hex(data,8));

+                               tagFound = true;

                        }
                        }

-                       if(isOK >= 1)
-                       {
-                               PrintAndLog("CC: %s",sprint_hex(data+8,8));
-                       }else{
-                               PrintAndLog("No CC obtained");
+                       if( readStatus & FLAG_ICLASS_READER_CC)  PrintAndLog("CC: %s",sprint_hex(data+16,8));
+                       if( readStatus & FLAG_ICLASS_READER_CONF){
+                               printIclassDumpInfo(data);

                        }
                        }

+                       if (tagFound && !loop) return 1;

                } else {
                } else {

-                       PrintAndLog("Command execute timeout");
+                       if (verbose) PrintAndLog("Command execute timeout");

                }
                }

+               if (!loop) break;

        }
        }

-

        return 0;
        return 0;

+
+}
+
+int CmdHFiClassReader(const char *Cmd)
+{
+       return HFiClassReader(Cmd, true, true);

 }
 
 int CmdHFiClassReader_Replay(const char *Cmd)
 }
 
 int CmdHFiClassReader_Replay(const char *Cmd)


@@ -269,7 +279,7 @@ int CmdHFiClassReader_Dump(const char *Cmd)
        uint8_t key_sel_p[8] = { 0 };
 
        UsbCommand c = {CMD_READER_ICLASS, {0}};
        uint8_t key_sel_p[8] = { 0 };
 
        UsbCommand c = {CMD_READER_ICLASS, {0}};

-       c.arg[0] = FLAG_ICLASS_READER_ONLY_ONCE| FLAG_ICLASS_READER_GET_CC;
+       c.arg[0] = FLAG_ICLASS_READER_ONLY_ONCE| FLAG_ICLASS_READER_CC;

        SendCommand(&c);
 
 
        SendCommand(&c);
 
 


@@ -284,7 +294,7 @@ int CmdHFiClassReader_Dump(const char *Cmd)
        uint8_t * data  = resp.d.asBytes;
 
        memcpy(CSN,data,8);
        uint8_t * data  = resp.d.asBytes;
 
        memcpy(CSN,data,8);

-       memcpy(CCNR,data+8,8);
+       memcpy(CCNR,data+16,8);

 
        PrintAndLog("isOk:%02x", isOK);
 
 
        PrintAndLog("isOk:%02x", isOK);
 


@@ -322,7 +332,7 @@ int CmdHFiClassReader_Dump(const char *Cmd)
        PrintAndLog("Hash0, a.k.a diversified key, that is computed using Ksel and stored in the card (Block 3):");
        printvar("Div key", div_key, 8);
        printvar("CC_NR:",CCNR,12);
        PrintAndLog("Hash0, a.k.a diversified key, that is computed using Ksel and stored in the card (Block 3):");
        printvar("Div key", div_key, 8);
        printvar("CC_NR:",CCNR,12);

-       doMAC(CCNR,12,div_key, MAC);
+       doMAC(CCNR,div_key, MAC);

        printvar("MAC", MAC, 4);
 
        uint8_t iclass_data[32000] = {0};
        printvar("MAC", MAC, 4);
 
        uint8_t iclass_data[32000] = {0};


@@ -348,7 +358,7 @@ int CmdHFiClassReader_Dump(const char *Cmd)
                        if(dataLength > 0)
                        {
                                PrintAndLog("Got %d bytes data (total so far %d)" ,dataLength,iclass_datalen);
                        if(dataLength > 0)
                        {
                                PrintAndLog("Got %d bytes data (total so far %d)" ,dataLength,iclass_datalen);

-                               memcpy(iclass_data, resp.d.asBytes,dataLength);
+                               memcpy(iclass_data+iclass_datalen, resp.d.asBytes,dataLength);

                                iclass_datalen += dataLength;
                        }else
                        {//Last transfer, datalength 0 means the dump is finished
                                iclass_datalen += dataLength;
                        }else
                        {//Last transfer, datalength 0 means the dump is finished


@@ -364,6 +374,8 @@ int CmdHFiClassReader_Dump(const char *Cmd)
                                        snprintf(filename, 100,"iclass_tagdump-%02x%02x%02x%02x%02x%02x%02x%02x",
                                                         CSN[0],CSN[1],CSN[2],CSN[3],
                                                        CSN[4],CSN[5],CSN[6],CSN[7]);
                                        snprintf(filename, 100,"iclass_tagdump-%02x%02x%02x%02x%02x%02x%02x%02x",
                                                         CSN[0],CSN[1],CSN[2],CSN[3],
                                                        CSN[4],CSN[5],CSN[6],CSN[7]);

+                                       //Place the div_key in block 3
+                                       memcpy(iclass_data+(3*8), div_key, 8);

                                        saveFile(filename,"bin",iclass_data, iclass_datalen );
                                }
                                //Aaaand we're finished
                                        saveFile(filename,"bin",iclass_data, iclass_datalen );
                                }
                                //Aaaand we're finished


@@ -419,9 +431,12 @@ int CmdHFiClassELoad(const char *Cmd)
        fseek(f, 0, SEEK_SET);
 
        uint8_t *dump = malloc(fsize);
        fseek(f, 0, SEEK_SET);
 
        uint8_t *dump = malloc(fsize);

+
+

        size_t bytes_read = fread(dump, 1, fsize, f);
        fclose(f);
 
        size_t bytes_read = fread(dump, 1, fsize, f);
        fclose(f);
 

+       printIclassDumpInfo(dump);

        //Validate
 
        if (bytes_read < fsize)
        //Validate
 
        if (bytes_read < fsize)


@@ -451,11 +466,12 @@ int usage_hf_iclass_decrypt()
 {
        PrintAndLog("Usage: hf iclass decrypt f <tagdump> o ");
        PrintAndLog("");
 {
        PrintAndLog("Usage: hf iclass decrypt f <tagdump> o ");
        PrintAndLog("");

-       PrintAndLog("In order to use this function, the file 'iclass_decryptionkey.bin must reside");
+       PrintAndLog("OBS! In order to use this function, the file 'iclass_decryptionkey.bin' must reside");

        PrintAndLog("in the working directory. The file should be 16 bytes binary data");
        PrintAndLog("in the working directory. The file should be 16 bytes binary data");

-       PrintAndLog("example: hf iclass decrypt tagdump_12312342343.bin");

        PrintAndLog("");
        PrintAndLog("");

-       PrintAndLog("OBS! This is pretty stupid implementation, it tries to decrypt every block after block 5. ");
+       PrintAndLog("example: hf iclass decrypt f tagdump_12312342343.bin");
+       PrintAndLog("");
+       PrintAndLog("OBS! This is pretty stupid implementation, it tries to decrypt every block after block 6. ");

        PrintAndLog("Correct behaviour would be to decrypt only the application areas where the key is valid,");
        PrintAndLog("which is defined by the configuration block.");
        return 1;
        PrintAndLog("Correct behaviour would be to decrypt only the application areas where the key is valid,");
        PrintAndLog("which is defined by the configuration block.");
        return 1;


@@ -527,7 +543,7 @@ int CmdHFiClassDecrypt(const char *Cmd)
        size_t blocknum =0;
        while(bytes_read == 8)
        {
        size_t blocknum =0;
        while(bytes_read == 8)
        {

-               if(blocknum < 6)
+               if(blocknum < 7)

                {
                        memcpy(decrypted+(blocknum*8), enc_dump, 8);
                }else{
                {
                        memcpy(decrypted+(blocknum*8), enc_dump, 8);
                }else{


@@ -601,7 +617,7 @@ int CmdHFiClass_iso14443A_write(const char *Cmd)
        diversifyKey(CSN,KEY, div_key);
 
        PrintAndLog("Div Key: %s",sprint_hex(div_key,8));
        diversifyKey(CSN,KEY, div_key);
 
        PrintAndLog("Div Key: %s",sprint_hex(div_key,8));

-       doMAC(CCNR, 12,div_key, MAC);
+       doMAC(CCNR, div_key, MAC);

 
        UsbCommand c2 = {CMD_ICLASS_ISO14443A_WRITE, {readerType,blockNo}};
        memcpy(c2.d.asBytes, bldata, 8);
 
        UsbCommand c2 = {CMD_ICLASS_ISO14443A_WRITE, {readerType,blockNo}};
        memcpy(c2.d.asBytes, bldata, 8);