changes to mifare plus code (#706)

[proxmark3-svn] / client / mifare4.h

diff --git a/client/mifare4.h b/client/mifare4.h
index 5b789a700639c0cb9aded38f01c385e7cadfc233..2453797b24ba9f972f09cc380ed4a098a1a87ff6 100644 (file)
--- 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,12 +20,25 @@ 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;
+
+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 uint8_t mfNumBlocksPerSector(uint8_t sectorNo);