Fix some printf/scanf format strings

[proxmark3-svn] / armsrc / mifareutil.h

diff --git a/armsrc/mifareutil.h b/armsrc/mifareutil.h
index 856040ca527c6adedc419f9cb16994cc5b0ad8c1..c2bfc634d40de805c584bb8cce53d1b7504a5d54 100644 (file)
--- a/armsrc/mifareutil.h
+++ b/armsrc/mifareutil.h
@@ -9,8 +9,8 @@
 // code for work with mifare cards.\r
 //-----------------------------------------------------------------------------\r
 \r
-#ifndef __MIFAREUTIL_H\r
-#define __MIFAREUTIL_H\r
+#ifndef MIFAREUTIL_H__\r
+#define MIFAREUTIL_H__\r
 \r
 #include <stdint.h>\r
 #include <stdbool.h>\r
@@ -19,11 +19,11 @@
 #include "usb_cdc.h"\r
 \r
 // mifare authentication\r
-#define CRYPT_NONE    0\r
-#define CRYPT_ALL     1\r
-#define CRYPT_REQUEST 2\r
-#define AUTH_FIRST    0        \r
-#define AUTH_NESTED   2\r
+#define CRYPT_NONE           0\r
+#define CRYPT_ALL            1\r
+#define CRYPT_REQUEST        2\r
+#define AUTH_FIRST           0\r
+#define AUTH_NESTED          2\r
 \r
 // reader voltage field detector\r
 #define MF_MINFIELDV      4000\r
@@ -42,10 +42,10 @@ int mifare_sendcmd(uint8_t cmd, uint8_t *data, uint8_t data_size, uint8_t* answe
 int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t data, uint8_t* answer, uint8_t *answer_parity, uint32_t *timing);\r
 \r
 // mifare classic\r
-int mifare_classic_auth(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint8_t isNested);\r
-int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint8_t isNested, uint32_t * ntptr, uint32_t *timing);\r
+int mifare_classic_auth(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint8_t isNested, uint32_t *auth_timeout);\r
+int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint8_t isNested, uint32_t * ntptr, uint32_t *timing, uint32_t *auth_timeout);\r
 int mifare_classic_readblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData);\r
-int mifare_classic_halt(struct Crypto1State *pcs, uint32_t uid); \r
+int mifare_classic_halt(struct Crypto1State *pcs, uint32_t uid);\r
 int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData);\r
 \r
 // Ultralight/NTAG...\r
@@ -87,8 +87,8 @@ int emlCheckValBl(int blockNum);
 \r
 // mifare check keys\r
 typedef uint8_t TKeyIndex[2][40];\r
-int MifareChkBlockKey(uint8_t *uid, uint32_t *cuid, uint8_t *cascade_levels, uint64_t ui64Key, uint8_t blockNo, uint8_t keyType, uint8_t debugLevel);\r
-int MifareChkBlockKeys(uint8_t *keys, uint8_t keyCount, uint8_t blockNo, uint8_t keyType, uint8_t debugLevel);\r
-int MifareMultisectorChk(uint8_t *keys, uint8_t keyCount, uint8_t SectorCount, uint8_t keyType, uint8_t debugLevel, TKeyIndex *keyIndex);\r
+int MifareChkBlockKeysFixedNonce(uint8_t *ar_par, uint8_t ar_par_cnt, uint8_t blockNo, uint8_t keyType, uint32_t *auth_timeout, uint8_t debugLevel);\r
+int MifareChkBlockKeys(uint8_t *keys, uint8_t keyCount, uint8_t blockNo, uint8_t keyType, uint32_t *auth_timeout, uint8_t debugLevel);\r
+int MifareMultisectorChk(uint8_t *keys, uint8_t keyCount, uint8_t SectorCount, uint8_t keyType, uint32_t *auth_timeout, uint8_t debugLevel, TKeyIndex *keyIndex);\r
 \r
 #endif\r