From: Fl0-0 <Fl0-0@users.noreply.github.com>
Date: Fri, 7 Dec 2018 13:09:41 +0000 (+0100)
Subject: Added mifare trailer block decoding for sector commands (#734)
X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/daccbcdc8d57d451323e19842aa7cf877a65829c?hp=aa0b1c431f5f1562041a27c06d61f54c14fe4b02;ds=sidebyside

Added mifare trailer block decoding for sector commands (#734)
---

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index fa952cb9..b5c1b006 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -215,6 +215,15 @@ int CmdHF14AMfRdSc(const char *Cmd)
 				PrintAndLog("data   : %s", sprint_hex(data + i * 16, 16));
 			}
 			PrintAndLog("trailer: %s", sprint_hex(data + (sectorNo<32?3:15) * 16, 16));
+			
+			PrintAndLogEx(NORMAL, "Trailer decoded:");
+                        int bln = mfFirstBlockOfSector(sectorNo);
+                        int blinc = (mfNumBlocksPerSector(sectorNo) > 4) ? 5 : 1;
+                        for (i = 0; i < 4; i++) {
+                                PrintAndLogEx(NORMAL, "Access block %d%s: %s", bln, ((blinc > 1) && (i < 3) ? "+" : "") , mfGetAccessConditionsDesc(i, &(data + (sectorNo<32?3:15) * 16)[6]));
+                                bln += blinc;
+                        }
+                        PrintAndLogEx(NORMAL, "UserData: %s", sprint_hex_inrow(&(data + (sectorNo<32?3:15) * 16)[9], 1));
 		}
 	} else {
 		PrintAndLog("Command execute timeout");
@@ -2350,6 +2359,19 @@ int CmdHF14AMfCGetSc(const char *Cmd) {
 		}
 
 		PrintAndLog("block %3d data:%s", baseblock + i, sprint_hex(memBlock, 16));
+		
+		if (mfIsSectorTrailer(baseblock + i)) {
+                PrintAndLogEx(NORMAL, "Trailer decoded:");
+                PrintAndLogEx(NORMAL, "Key A: %s", sprint_hex_inrow(memBlock, 6));
+                PrintAndLogEx(NORMAL, "Key B: %s", sprint_hex_inrow(&memBlock[10], 6));
+                int bln = baseblock;
+                int blinc = (mfNumBlocksPerSector(sectorNo) > 4) ? 5 : 1;
+                for (int i = 0; i < 4; i++) {
+                        PrintAndLogEx(NORMAL, "Access block %d%s: %s", bln, ((blinc > 1) && (i < 3) ? "+" : "") , mfGetAccessConditionsDesc(i, &memBlock[6]));
+                        bln += blinc;
+                }
+                PrintAndLogEx(NORMAL, "UserData: %s", sprint_hex_inrow(&memBlock[9], 1));
+        }
 	}
 	return 0;
 }