Added loclass-functionality into the pm3,the functionality provided by loclass can...

diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index 5146401bb7493f7485339b64de1ea84a7d481bdc..dba4f1132597bb8ff9ed8ad0aef4b6279bbf6966 100644 (file)
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -42,42 +42,6 @@ int xorbits_8(uint8_t val)
     return res & 1;
 }
 
     return res & 1;
 }
 

-#define ICLASS_CMD_ACTALL 0x0A
-#define ICLASS_CMD_IDENTIFY 0x0C
-#define ICLASS_CMD_READ 0x0C
-
-#define ICLASS_CMD_SELECT 0x81
-#define ICLASS_CMD_PAGESEL 0x84
-#define ICLASS_CMD_READCHECK 0x88
-#define ICLASS_CMD_CHECK 0x05
-#define ICLASS_CMD_SOF 0x0F
-#define ICLASS_CMD_HALT 0x00
-
-
-void explain(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize)
-{
-
-       if(cmdsize > 1 && cmd[0] == ICLASS_CMD_READ)
-       {
-                 snprintf(exp,size,"READ(%d)",cmd[1]);
-                 return;
-       }
-
-    switch(cmd[0])
-    {
-       case ICLASS_CMD_ACTALL:            snprintf(exp,size,"ACTALL"); break;
-       case ICLASS_CMD_IDENTIFY:    snprintf(exp,size,"IDENTIFY"); break;
-       case ICLASS_CMD_SELECT:         snprintf(exp,size,"SELECT"); break;
-       case ICLASS_CMD_PAGESEL:         snprintf(exp,size,"PAGESEL"); break;
-       case ICLASS_CMD_READCHECK:         snprintf(exp,size,"READCHECK"); break;
-       case ICLASS_CMD_CHECK:         snprintf(exp,size,"CHECK"); break;
-       case ICLASS_CMD_SOF:            snprintf(exp,size,"SOF"); break;
-       case ICLASS_CMD_HALT:            snprintf(exp,size,"HALT"); break;
-       default:                        snprintf(exp,size,"?"); break;
-    }
-    return;
-}
-

 int CmdHFiClassList(const char *Cmd)
 {
        PrintAndLog("Deprecated command, use 'hf list iclass' instead");
 int CmdHFiClassList(const char *Cmd)
 {
        PrintAndLog("Deprecated command, use 'hf list iclass' instead");


@@ -470,19 +434,64 @@ int CmdHFiClass_iso14443A_write(const char *Cmd)
   }
   return 0;
 }
   }
   return 0;
 }

+int CmdHFiClass_loclass(const char *Cmd)
+{
+       char opt = param_getchar(Cmd, 0);
+
+       if (strlen(Cmd)<1 || opt == 'h') {
+               PrintAndLog("Usage: hf iclass loclass [options]");
+               PrintAndLog("Options:");
+               PrintAndLog("h             Show this help");
+               PrintAndLog("t             Perform self-test");
+               PrintAndLog("f <filename>  Bruteforce iclass dumpfile");
+               PrintAndLog("                   An iclass dumpfile is assumed to consist of an arbitrary number of");
+               PrintAndLog("                   malicious CSNs, and their protocol responses");
+               PrintAndLog("                   The the binary format of the file is expected to be as follows: ");
+               PrintAndLog("                   <8 byte CSN><8 byte CC><4 byte NR><4 byte MAC>");
+               PrintAndLog("                   <8 byte CSN><8 byte CC><4 byte NR><4 byte MAC>");
+               PrintAndLog("                   <8 byte CSN><8 byte CC><4 byte NR><4 byte MAC>");
+               PrintAndLog("                  ... totalling N*24 bytes");
+               return 0;
+       }
+       char fileName[255] = {0};
+       if(opt == 'f')
+       {
+                       if(param_getstr(Cmd, 1, fileName) > 0)
+                       {
+                               return bruteforceFileNoKeys(fileName);
+                       }else
+                       {
+                               PrintAndLog("You must specify a filename");
+                       }
+       }
+       else if(opt == 't')
+       {
+               int errors = testCipherUtils();
+               errors += testMAC();
+               errors += doKeyTests(0);
+               errors += testElite();
+               if(errors)
+               {
+                       prnlog("OBS! There were errors!!!");
+               }
+               return errors;
+       }

 
 

+       return 0;
+}

 
 static command_t CommandTable[] = 
 {
 
 static command_t CommandTable[] = 
 {

-  {"help",     CmdHelp,                        1,      "This help"},
-  {"list",     CmdHFiClassList,        0,      "[Deprecated] List iClass history"},
-  {"snoop",    CmdHFiClassSnoop,       0,      "Eavesdrop iClass communication"},
-  {"sim",      CmdHFiClassSim,         0,      "Simulate iClass tag"},
-  {"reader",CmdHFiClassReader, 0,      "Read an iClass tag"},
-  {"replay",CmdHFiClassReader_Replay,  0,      "Read an iClass tag via Reply Attack"},
-  {"dump",     CmdHFiClassReader_Dump, 0,              "Authenticate and Dump iClass tag"},
-  {"write",    CmdHFiClass_iso14443A_write,    0,      "Authenticate and Write iClass block"},
-  {NULL, NULL, 0, NULL}
+       {"help",        CmdHelp,                        1,      "This help"},
+       {"list",        CmdHFiClassList,        0,      "[Deprecated] List iClass history"},
+       {"snoop",       CmdHFiClassSnoop,       0,      "Eavesdrop iClass communication"},
+       {"sim", CmdHFiClassSim,         0,      "Simulate iClass tag"},
+       {"reader",CmdHFiClassReader,    0,      "Read an iClass tag"},
+       {"replay",CmdHFiClassReader_Replay,     0,      "Read an iClass tag via Reply Attack"},
+       {"dump",        CmdHFiClassReader_Dump, 0,              "Authenticate and Dump iClass tag"},
+       {"write",       CmdHFiClass_iso14443A_write,    0,      "Authenticate and Write iClass block"},
+       {"loclass",     CmdHFiClass_loclass,    1,      "Use loclass to perform bruteforce of reader attack dump"},
+       {NULL, NULL, 0, NULL}

 };
 
 int CmdHFiClass(const char *Cmd)
 };
 
 int CmdHFiClass(const char *Cmd)

diff --git a/client/loclass/elite_crack.c b/client/loclass/elite_crack.c
index 7dc60396fe777d8218ce9142d5e0af9288dab4ac..f0eb964bc554b2fc5227f8a4626fc8755a34677f 100644 (file)
--- a/client/loclass/elite_crack.c
+++ b/client/loclass/elite_crack.c
@@ -526,7 +526,7 @@ int bruteforceFile(const char *filename, uint16_t keytable[])
        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, fsize, 1, f);
+       size_t bytes_read = fread(dump, 1, fsize, f);

 
        fclose(f);
     if (bytes_read < fsize)
 
        fclose(f);
     if (bytes_read < fsize)


@@ -577,9 +577,18 @@ int _testBruteforce()
                        **** The 64-bit HS Custom Key Value = 5B7C62C491C11B39 ****
                **/
                uint16_t keytable[128] = {0};
                        **** The 64-bit HS Custom Key Value = 5B7C62C491C11B39 ****
                **/
                uint16_t keytable[128] = {0};

-               //save some time...
-               startvalue = 0x7B0000;
-               errors |= bruteforceFile("iclass_dump.bin",keytable);
+
+               //Test a few variants
+               if(fileExists("iclass_dump.bin"))
+               {
+                       errors |= bruteforceFile("iclass_dump.bin",keytable);
+               }else if(fileExists("loclass/iclass_dump.bin")){
+                       errors |= bruteforceFile("loclass/iclass_dump.bin",keytable);
+               }else if(fileExists("client/loclass/iclass_dump.bin")){
+                       errors |= bruteforceFile("client/loclass/iclass_dump.bin",keytable);
+               }else{
+                       prnlog("Error: The file iclass_dump.bin was not found!");
+               }

        }
        return errors;
 }
        }
        return errors;
 }

diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index 255aa313700ef12ced86f1b79d9c2f0584bd3277..9ea9d1454df2af9861fcb20fc061ce5bdd8e53fa 100644 (file)
--- a/client/loclass/fileutils.c
+++ b/client/loclass/fileutils.c
@@ -57,11 +57,11 @@ int saveFile(const char *preferredName, const char *suffix, const void* data, si
  */
 void prnlog(char *fmt, ...)
 {
  */
 void prnlog(char *fmt, ...)
 {

-
+       char buffer[2048] = {0};

        va_list args;
        va_start(args,fmt);
        va_list args;
        va_start(args,fmt);

-    PrintAndLog(fmt, args);
-    //vprintf(fmt,args);
+       vsprintf (buffer,fmt, args);

        va_end(args);
        va_end(args);

-    //printf("\n");
+       PrintAndLog(buffer);
+

 }
 }

diff --git a/client/loclass/fileutils.h b/client/loclass/fileutils.h
index a0f5a799e246e4f7a9a80fb1d3545098b14a0b8e..e02079d52a91c6d40ee8c60f13efb1ea2486cf43 100644 (file)
--- a/client/loclass/fileutils.h
+++ b/client/loclass/fileutils.h
@@ -21,4 +21,5 @@ int saveFile(const char *preferredName, const char *suffix, const void* data, si
  * @param fmt
  */
 void prnlog(char *fmt, ...);
  * @param fmt
  */
 void prnlog(char *fmt, ...);

+int fileExists(const char *filename);

 #endif // FILEUTILS_H
 #endif // FILEUTILS_H

diff --git a/client/loclass/iclass_dump.bin b/client/loclass/iclass_dump.bin
new file mode 100644 (file)
index 0000000..bfecd1b
Binary files /dev/null and b/client/loclass/iclass_dump.bin differ