X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/c8a0f5503172f25620670a9ba992d8c923b5df95..0d2624a0cc13dbe34392da1f8495af6c64a84ddb:/client/mifare4.h?ds=sidebyside

diff --git a/client/mifare4.h b/client/mifare4.h
index 5b789a70..5d9735da 100644
--- a/client/mifare4.h
+++ b/client/mifare4.h
@@ -1,5 +1,6 @@
 //-----------------------------------------------------------------------------
 // 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
@@ -19,14 +20,34 @@ typedef struct {
 	bool Authenticated;
 	uint8_t Key[16];
 	uint16_t KeyNum;
-	uint8_t Rnd1[16];
-	uint8_t Rnd2[16];
-	
+	uint8_t RndA[16];
+	uint8_t RndB[16];
+	uint8_t TI[4];
+	uint8_t PICCap2[6];
+	uint8_t PCDCap2[6];
+	uint8_t Kenc[16];
+	uint8_t Kmac[16];
+	uint16_t R_Ctr;
+	uint16_t W_Ctr;
 }mf4Session;
 
-extern int CalculateMAC(mf4Session *session, uint8_t *data, int datalen, uint8_t *mac, bool verbose);
+typedef enum {
+	mtypReadCmd,
+	mtypReadResp,
+	mtypWriteCmd,
+	mtypWriteResp,
+} MACType_t;
+
+typedef struct {
+	uint8_t cond;
+	char *description;
+} AccessConditions_t;
+
+extern int CalculateMAC(mf4Session *session, MACType_t mtype, uint8_t blockNum, uint8_t blockCount, uint8_t *data, int datalen, uint8_t *mac, bool verbose);
 extern int MifareAuth4(mf4Session *session, uint8_t *keyn, uint8_t *key, bool activateField, bool leaveSignalON, bool verbose);
 
+extern char *mfGetAccessConditionsDesc(uint8_t blockn, uint8_t *data);
+
 extern uint8_t mfNumBlocksPerSector(uint8_t sectorNo);
 extern uint8_t mfFirstBlockOfSector(uint8_t sectorNo);
 extern uint8_t mfSectorTrailer(uint8_t blockNo);