From 9f77f2741f4ab88d10558a04963022482cbc7359 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Fri, 30 Nov 2018 14:16:34 +0200
Subject: [PATCH 1/2] added trailer decoding

---
 client/cmdhfmf.c | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 1e43ff81e..48a235ffd 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -545,14 +545,25 @@ int CmdHF14AMfRdBl(const char *Cmd) {
 		uint8_t isOK  = resp.arg[0] & 0xff;
 		uint8_t *data = resp.d.asBytes;
 
-		if (isOK)
+		if (isOK) {
 			PrintAndLogEx(NORMAL, "isOk:%02x data:%s", isOK, sprint_hex(data, 16));
-		else
+		} else {
 			PrintAndLogEx(NORMAL, "isOk:%02x", isOK);
+			return 1;
+		}
+
+		if (mfIsSectorTrailer(blockNo) && (data[6] || data[7] || data[8])) {
+			PrintAndLogEx(NORMAL, "Trailer decoded:");
+			for (int i = 0; i < 4; i++) {
+				PrintAndLogEx(NORMAL, "Access block %d: %s", i + mfFirstBlockOfSector(mfSectorNum(blockNo)), mfGetAccessConditionsDesc(i, &data[6]));
+			}
+			PrintAndLogEx(NORMAL, "UserData: %s", sprint_hex_inrow(&data[9], 1));
+		}
 	} else {
 		PrintAndLogEx(WARNING, "Command execute timeout");
+		return 2;
 	}
-
+	
   return 0;
 }
 
@@ -2759,6 +2770,17 @@ int CmdHF14AMfCGetBlk(const char *Cmd) {
 	}
 	
 	PrintAndLogEx(NORMAL, "data: %s", sprint_hex(data, sizeof(data)));
+	
+	if (mfIsSectorTrailer(blockNo)) {
+		PrintAndLogEx(NORMAL, "Trailer decoded:");
+		PrintAndLogEx(NORMAL, "Key A: %s", sprint_hex_inrow(data, 6));
+		PrintAndLogEx(NORMAL, "Key B: %s", sprint_hex_inrow(&data[10], 6));
+		for (int i = 0; i < 4; i++) {
+			PrintAndLogEx(NORMAL, "Access block %d: %s", i + mfFirstBlockOfSector(mfSectorNum(blockNo)), mfGetAccessConditionsDesc(i, &data[6]));
+		}
+		PrintAndLogEx(NORMAL, "UserData: %s", sprint_hex_inrow(&data[9], 1));
+	}
+		
 	return 0;
 }
 

From a10bf3ac05383adea99d6bd59b889a8ad7f7c6f4 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Fri, 30 Nov 2018 14:17:46 +0200
Subject: [PATCH 2/2] added changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 296fd14e3..64377c383 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -87,6 +87,7 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
  - Added `hf emv scan` - save card's data to json file (@merlokk)
  - Added `hf emv` `gpo`, `readrec`, `genac`, `challenge`, `intauth` - separate commands from `hf emc exec` (@merlokk)
  - Added  `hf fido` `assert` and `make` commands from fido2 protocol (authenticatorMakeCredential and authenticatorGetAssertion) (@merlokk)
+ - Added trailer block decoding to `hf mf rdbl` and `hf mf cgetbl` (@merlokk)
  
 ### Fixed
 - Changed driver file proxmark3.inf to support both old and new Product/Vendor IDs (piwi)