Merge pull request #140 from marshmellow42/iclass

iClass major updates

diff --combined client/cmdhfmf.c
index ed26c1bdf235e4ba5267122247d0e92e43f54997,304e9c9c3b0d870e09f2f2096bec6785a7be50b3..48e78b1c2fcad2a74a90de187356d346ed54492c
--- 1/client/cmdhfmf.c
--- 2/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@@ -58,8 -58,7 +58,8 @@@ start
                                case -1 : PrintAndLog("Button pressed. Aborted.\n"); break;\r
                                case -2 : PrintAndLog("Card is not vulnerable to Darkside attack (doesn't send NACK on authentication requests).\n"); break;\r
                                case -3 : PrintAndLog("Card is not vulnerable to Darkside attack (its random number generator is not predictable).\n"); break;\r
 -                              case -4 : PrintAndLog("The card's random number generator is vulnerable but behaves somewhat weird (Mifare clone?). This needs to be fixed.\n"); break;\r
 +                              case -4 : PrintAndLog("Card is not vulnerable to Darkside attack (its random number generator seems to be based on the wellknown");\r
 +                                                      PrintAndLog("generating polynomial with 16 effective bits only, but shows unexpected behaviour.\n"); break;\r
                                default: ;\r
                        }\r
                        break;\r
@@@ -1951,6 -1950,13 +1951,13 @@@ int CmdHF14AMfSniff(const char *Cmd)
        return 0;\r
  }\r
  \r
+ //needs nt, ar, at, Data to decrypt\r
+ int CmdDecryptTraceCmds(const char *Cmd){\r
+       uint8_t data[50];\r
+       int len = 0;\r
+       param_gethex_ex(Cmd,3,data,&len);\r
+       return tryDecryptWord(param_get32ex(Cmd,0,0,16),param_get32ex(Cmd,1,0,16),param_get32ex(Cmd,2,0,16),data,len/2);\r
+ }\r
  \r
  static command_t CommandTable[] =\r
  {\r
@@@ -1979,6 -1985,7 +1986,7 @@@
    {"cgetsc",  CmdHF14AMfCGetSc,               0, "Read sector - Magic Chinese card"},\r
    {"cload",           CmdHF14AMfCLoad,                0, "Load dump into magic Chinese card"},\r
    {"csave",           CmdHF14AMfCSave,                0, "Save dump from magic Chinese card into file or emulator"},\r
+   {"decrypt", CmdDecryptTraceCmds,1, "[nt] [ar_enc] [at_enc] [data] - to decrypt snoop or trace"},\r
    {NULL, NULL, 0, NULL}\r
  };\r
  \r