Add smartcard protocol T=0 (RRG repository PRs 71,72,74,75 by @merlokk) (#757)

[proxmark3-svn] / client / cmdhfmfp.c

diff --git a/client/cmdhfmfp.c b/client/cmdhfmfp.c
index c5fd8eed78267a230d8872f0c5c94f3fd87e315d..1e5bbe1a5c400c0b5c72b9db242cea9696848f1f 100644 (file)
--- a/client/cmdhfmfp.c
+++ b/client/cmdhfmfp.c
@@ -1,5 +1,6 @@
 //-----------------------------------------------------------------------------
 // Copyright (C) 2018 Merlok
 //-----------------------------------------------------------------------------
 // Copyright (C) 2018 Merlok

+// Copyright (C) 2018 drHatson

 //
 // This code is licensed to you under the terms of the GNU GPL, version 2 or,
 // at your option, any later version. See the LICENSE.txt file for the text of
 //
 // This code is licensed to you under the terms of the GNU GPL, version 2 or,
 // at your option, any later version. See the LICENSE.txt file for the text of


@@ -23,7 +24,7 @@
 #include "mifare.h"
 #include "mifare4.h"
 #include "cliparser/cliparser.h"
 #include "mifare.h"
 #include "mifare4.h"
 #include "cliparser/cliparser.h"

-#include "polarssl/libpcrypto.h"
+#include "crypto/libpcrypto.h"

 
 static const uint8_t DefaultKey[16] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
 
 
 static const uint8_t DefaultKey[16] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
 


@@ -34,13 +35,15 @@ typedef struct {
 
 static const PlusErrorsElm PlusErrors[] = {
        {0xFF, ""},
 
 static const PlusErrorsElm PlusErrors[] = {
        {0xFF, ""},

-       {0x00, "Unknown error"},
-       {0x06, "Block use error"},
-       {0x07, "Command use error"},
-       {0x08, "Invalid write command"},
-       {0x09, "Invalid block number"},
-       {0x0b, "Command code error"},
+       {0x00, "Transfer cannot be granted within the current authentication."},
+       {0x06, "Access Conditions not fulfilled. Block does not exist, block is not a value block."},
+       {0x07, "Too many read or write commands in the session or in the transaction."},
+       {0x08, "Invalid MAC in command or response"},
+       {0x09, "Block Number is not valid"},
+       {0x0a, "Invalid block number, not existing block number"},
+       {0x0b, "The current command code not available at the current card state."},

        {0x0c, "Length error"},
        {0x0c, "Length error"},

+       {0x0f, "General Manipulation Error. Failure in the operation of the PICC (cannot write to the data block), etc."},

        {0x90, "OK"},
 };
 int PlusErrorsLen = sizeof(PlusErrors) / sizeof(PlusErrorsElm);
        {0x90, "OK"},
 };
 int PlusErrorsLen = sizeof(PlusErrors) / sizeof(PlusErrorsElm);


@@ -88,14 +91,17 @@ int MFPCommitPerso(bool activateField, bool leaveSignalON, uint8_t *dataout, int
 int MFPReadBlock(mf4Session *session, bool plain, uint8_t blockNum, uint8_t blockCount, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen, uint8_t *mac) {
        uint8_t rcmd[4 + 8] = {(plain?(0x37):(0x33)), blockNum, 0x00, blockCount}; 
        if (!plain && session)
 int MFPReadBlock(mf4Session *session, bool plain, uint8_t blockNum, uint8_t blockCount, bool activateField, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen, uint8_t *mac) {
        uint8_t rcmd[4 + 8] = {(plain?(0x37):(0x33)), blockNum, 0x00, blockCount}; 
        if (!plain && session)

-               CalculateMAC(session, rcmd, 4, &rcmd[4], VerboseMode);
+               CalculateMAC(session, mtypReadCmd, blockNum, blockCount, rcmd, 4, &rcmd[4], VerboseMode);

        
        int res = intExchangeRAW14aPlus(rcmd, plain?4:sizeof(rcmd), activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
        if(res)
                return res;
 
        
        int res = intExchangeRAW14aPlus(rcmd, plain?4:sizeof(rcmd), activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
        if(res)
                return res;
 

-       if(session && mac)
-               CalculateMAC(session, dataout, *dataoutlen, mac, VerboseMode);
+       if (session) 
+               session->R_Ctr++;
+       
+       if(session && mac && *dataoutlen > 11)
+               CalculateMAC(session, mtypReadResp, blockNum, blockCount, dataout, *dataoutlen - 8 - 2, mac, VerboseMode);

        
        return 0;
 }
        
        return 0;
 }


@@ -104,14 +110,17 @@ int MFPWriteBlock(mf4Session *session, uint8_t blockNum, uint8_t *data, bool act
        uint8_t rcmd[1 + 2 + 16 + 8] = {0xA3, blockNum, 0x00};
        memmove(&rcmd[3], data, 16);
        if (session)
        uint8_t rcmd[1 + 2 + 16 + 8] = {0xA3, blockNum, 0x00};
        memmove(&rcmd[3], data, 16);
        if (session)

-               CalculateMAC(session, rcmd, 19, &rcmd[19], VerboseMode);
+               CalculateMAC(session, mtypWriteCmd, blockNum, 1, rcmd, 19, &rcmd[19], VerboseMode);

        
        int res = intExchangeRAW14aPlus(rcmd, sizeof(rcmd), activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
        if(res)
                return res;
 
        
        int res = intExchangeRAW14aPlus(rcmd, sizeof(rcmd), activateField, leaveSignalON, dataout, maxdataoutlen, dataoutlen);
        if(res)
                return res;
 

-       if(session && mac)
-               CalculateMAC(session, dataout, *dataoutlen, mac, VerboseMode);
+       if (session) 
+               session->W_Ctr++;
+
+       if(session && mac && *dataoutlen > 3)
+               CalculateMAC(session, mtypWriteResp, blockNum, 1, dataout, *dataoutlen, mac, VerboseMode);

        
        return 0;
 }
        
        return 0;
 }


@@ -420,7 +429,7 @@ int CmdHFMFPRdbl(const char *cmd) {
        int keylen = 0;
        
        CLIParserInit("hf mfp rdbl", 
        int keylen = 0;
        
        CLIParserInit("hf mfp rdbl", 

-               "Reads several blocks from Mifare Plus card in plain mode.", 
+               "Reads several blocks from Mifare Plus card.", 

                "Usage:\n\thf mfp rdbl 0 000102030405060708090a0b0c0d0e0f -> executes authentication and read block 0 data\n"
                        "\thf mfp rdbl 1 -v -> executes authentication and shows sector 1 data with default key 0xFF..0xFF and some additional data\n");
 
                "Usage:\n\thf mfp rdbl 0 000102030405060708090a0b0c0d0e0f -> executes authentication and read block 0 data\n"
                        "\thf mfp rdbl 1 -v -> executes authentication and shows sector 1 data with default key 0xFF..0xFF and some additional data\n");
 


@@ -429,7 +438,7 @@ int CmdHFMFPRdbl(const char *cmd) {
                arg_lit0("vV",  "verbose", "show internal data."),
                arg_int0("nN",  "count",   "blocks count (by default 1).", NULL),
                arg_lit0("bB",  "keyb",    "use key B (by default keyA)."),
                arg_lit0("vV",  "verbose", "show internal data."),
                arg_int0("nN",  "count",   "blocks count (by default 1).", NULL),
                arg_lit0("bB",  "keyb",    "use key B (by default keyA)."),

-               arg_lit0("pP",  "plain",   "plain communication between reader and card."),
+               arg_lit0("pP",  "plain",   "plain communication mode between reader and card."),

                arg_int1(NULL,  NULL,      "<Block Num (0..255)>", NULL),
                arg_str0(NULL,  NULL,      "<Key Value (HEX 16 bytes)>", NULL),
                arg_param_end
                arg_int1(NULL,  NULL,      "<Block Num (0..255)>", NULL),
                arg_str0(NULL,  NULL,      "<Key Value (HEX 16 bytes)>", NULL),
                arg_param_end


@@ -439,7 +448,7 @@ int CmdHFMFPRdbl(const char *cmd) {
        bool verbose = arg_get_lit(1);
        int blocksCount = arg_get_int_def(2, 1);
        bool keyB = arg_get_lit(3);
        bool verbose = arg_get_lit(1);
        int blocksCount = arg_get_int_def(2, 1);
        bool keyB = arg_get_lit(3);

-       int plain = arg_get_lit(4) | true;
+       int plain = arg_get_lit(4);

        uint32_t blockn = arg_get_int(5);
        CLIGetHexWithReturn(6, key, &keylen);
        CLIParserFree();
        uint32_t blockn = arg_get_int(5);
        CLIGetHexWithReturn(6, key, &keylen);
        CLIParserFree();


@@ -467,6 +476,10 @@ int CmdHFMFPRdbl(const char *cmd) {
                return 1;
        }
        
                return 1;
        }
        

+       if (blocksCount > 1 && mfIsSectorTrailer(blockn)) {
+               PrintAndLog("WARNING: trailer!");
+       }
+       

        uint8_t sectorNum = mfSectorNum(blockn & 0xff);
        uint16_t uKeyNum = 0x4000 + sectorNum * 2 + (keyB ? 1 : 0);
        keyn[0] = uKeyNum >> 8;
        uint8_t sectorNum = mfSectorNum(blockn & 0xff);
        uint16_t uKeyNum = 0x4000 + sectorNum * 2 + (keyB ? 1 : 0);
        keyn[0] = uKeyNum >> 8;


@@ -504,13 +517,13 @@ int CmdHFMFPRdbl(const char *cmd) {
        for(int i = 0; i < blocksCount; i++)  {
                PrintAndLog("data[%03d]: %s", indx, sprint_hex(&data[1 + i * 16], 16));
                indx++;
        for(int i = 0; i < blocksCount; i++)  {
                PrintAndLog("data[%03d]: %s", indx, sprint_hex(&data[1 + i * 16], 16));
                indx++;

-               if (mfIsSectorTrailer(indx)){
+               if (mfIsSectorTrailer(indx) && i != blocksCount - 1){

                        PrintAndLog("data[%03d]: ------------------- trailer -------------------", indx);
                        indx++;
                }
        }
 
                        PrintAndLog("data[%03d]: ------------------- trailer -------------------", indx);
                        indx++;
                }
        }
 

-       if (!memcmp(&data[blocksCount * 16 + 1], mac, 8)) {
+       if (memcmp(&data[blocksCount * 16 + 1], mac, 8)) {

                PrintAndLog("WARNING: mac not equal...");
                PrintAndLog("MAC   card: %s", sprint_hex(&data[blocksCount * 16 + 1], 8));
                PrintAndLog("MAC reader: %s", sprint_hex(mac, 8));
                PrintAndLog("WARNING: mac not equal...");
                PrintAndLog("MAC   card: %s", sprint_hex(&data[blocksCount * 16 + 1], 8));
                PrintAndLog("MAC reader: %s", sprint_hex(mac, 8));


@@ -528,7 +541,7 @@ int CmdHFMFPRdsc(const char *cmd) {
        int keylen = 0;
        
        CLIParserInit("hf mfp rdsc", 
        int keylen = 0;
        
        CLIParserInit("hf mfp rdsc", 

-               "Reads one sector from Mifare Plus card in plain mode.", 
+               "Reads one sector from Mifare Plus card.", 

                "Usage:\n\thf mfp rdsc 0 000102030405060708090a0b0c0d0e0f -> executes authentication and read sector 0 data\n"
                        "\thf mfp rdsc 1 -v -> executes authentication and shows sector 1 data with default key 0xFF..0xFF and some additional data\n");
 
                "Usage:\n\thf mfp rdsc 0 000102030405060708090a0b0c0d0e0f -> executes authentication and read sector 0 data\n"
                        "\thf mfp rdsc 1 -v -> executes authentication and shows sector 1 data with default key 0xFF..0xFF and some additional data\n");
 


@@ -536,7 +549,7 @@ int CmdHFMFPRdsc(const char *cmd) {
                arg_param_begin,
                arg_lit0("vV",  "verbose", "show internal data."),
                arg_lit0("bB",  "keyb",    "use key B (by default keyA)."),
                arg_param_begin,
                arg_lit0("vV",  "verbose", "show internal data."),
                arg_lit0("bB",  "keyb",    "use key B (by default keyA)."),

-               arg_lit0("pP",  "plain",   "plain communication between reader and card."),
+               arg_lit0("pP",  "plain",   "plain communication mode between reader and card."),

                arg_int1(NULL,  NULL,      "<Sector Num (0..255)>", NULL),
                arg_str0(NULL,  NULL,      "<Key Value (HEX 16 bytes)>", NULL),
                arg_param_end
                arg_int1(NULL,  NULL,      "<Sector Num (0..255)>", NULL),
                arg_str0(NULL,  NULL,      "<Key Value (HEX 16 bytes)>", NULL),
                arg_param_end


@@ -545,7 +558,7 @@ int CmdHFMFPRdsc(const char *cmd) {
        
        bool verbose = arg_get_lit(1);
        bool keyB = arg_get_lit(2);
        
        bool verbose = arg_get_lit(1);
        bool keyB = arg_get_lit(2);

-       bool plain = arg_get_lit(3) | true;
+       bool plain = arg_get_lit(3);

        uint32_t sectorNum = arg_get_int(4);
        CLIGetHexWithReturn(5, key, &keylen);
        CLIParserFree();
        uint32_t sectorNum = arg_get_int(4);
        CLIGetHexWithReturn(5, key, &keylen);
        CLIParserFree();


@@ -604,7 +617,7 @@ int CmdHFMFPRdsc(const char *cmd) {
 
                PrintAndLog("data[%03d]: %s", n, sprint_hex(&data[1], 16));
                        
 
                PrintAndLog("data[%03d]: %s", n, sprint_hex(&data[1], 16));
                        

-               if (!memcmp(&data[1 + 16], mac, 8)) {
+               if (memcmp(&data[1 + 16], mac, 8)) {

                        PrintAndLog("WARNING: mac on block %d not equal...", n);
                        PrintAndLog("MAC   card: %s", sprint_hex(&data[1 + 16], 8));
                        PrintAndLog("MAC reader: %s", sprint_hex(mac, 8));
                        PrintAndLog("WARNING: mac on block %d not equal...", n);
                        PrintAndLog("MAC   card: %s", sprint_hex(&data[1 + 16], 8));
                        PrintAndLog("MAC reader: %s", sprint_hex(mac, 8));


@@ -706,7 +719,7 @@ int CmdHFMFPWrbl(const char *cmd) {
                return 6;
        }
        
                return 6;
        }
        

-       if (!memcmp(&data[1], mac, 8)) {
+       if (memcmp(&data[1], mac, 8)) {

                PrintAndLog("WARNING: mac not equal...");
                PrintAndLog("MAC   card: %s", sprint_hex(&data[1], 8));
                PrintAndLog("MAC reader: %s", sprint_hex(mac, 8));
                PrintAndLog("WARNING: mac not equal...");
                PrintAndLog("MAC   card: %s", sprint_hex(&data[1], 8));
                PrintAndLog("MAC reader: %s", sprint_hex(mac, 8));


@@ -716,6 +729,7 @@ int CmdHFMFPWrbl(const char *cmd) {
        }
        
        DropField();
        }
        
        DropField();

+       PrintAndLog("Write OK.");       

        return 0;
 }
 
        return 0;
 }
 


@@ -729,7 +743,7 @@ static command_t CommandTable[] =
   {"auth",            CmdHFMFPAuth,                    0, "Authentication"},
   {"rdbl",            CmdHFMFPRdbl,                    0, "Read blocks"},
   {"rdsc",            CmdHFMFPRdsc,                    0, "Read sectors"},
   {"auth",            CmdHFMFPAuth,                    0, "Authentication"},
   {"rdbl",            CmdHFMFPRdbl,                    0, "Read blocks"},
   {"rdsc",            CmdHFMFPRdsc,                    0, "Read sectors"},

-//  {"wrbl",          CmdHFMFPWrbl,                    0, "Write blocks"},
+  {"wrbl",            CmdHFMFPWrbl,                    0, "Write blocks"},

   {NULL,               NULL,                                   0, NULL}
 };
 
   {NULL,               NULL,                                   0, NULL}
 };