Added ATR decoding (RfidResearchGroup PRs 67/68 by @merlokk) (#749)

[proxmark3-svn] / client / cmdhflist.h

diff --git a/client/cmdhflist.h b/client/cmdhflist.h
index aa037658f42c4dbc9dfd3bc591efb8c6971d5cf1..8f289b4865dd55c19ae968445ec7c5be9ed55cb4 100644 (file)
--- a/client/cmdhflist.h
+++ b/client/cmdhflist.h
@@ -25,15 +25,23 @@ typedef struct {
        uint32_t at_enc;    // encrypted tag response
        uint8_t at_enc_par; // encrypted tag response parity
        bool first_auth;    // is first authentication
+       uint32_t ks2;           // ar ^ ar_enc
+       uint32_t ks3;       // at ^ at_enc
 } TAuthData;
 extern void ClearAuthData();
 
 extern uint8_t iso14443A_CRC_check(bool isResponse, uint8_t* data, uint8_t len);
 extern uint8_t mifare_CRC_check(bool isResponse, uint8_t* data, uint8_t len);
+extern void annotateIclass(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize);
+extern void annotateIso15693(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize);
+extern void annotateTopaz(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize);
+extern void annotateIso14443b(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize);
 extern void annotateIso14443a(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize);
 extern void annotateMifare(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize, uint8_t* parity, uint8_t paritysize, bool isResponse);
-extern bool DecodeMifareData(uint8_t *cmd, uint8_t cmdsize, bool isResponse, uint8_t *mfData, size_t *mfDataLen);
+extern bool DecodeMifareData(uint8_t *cmd, uint8_t cmdsize, uint8_t *parity, bool isResponse, uint8_t *mfData, size_t *mfDataLen);
 extern bool NTParityChk(TAuthData *ad, uint32_t ntx);
-extern bool NestedCheckKey(uint64_t key, TAuthData *ad, uint8_t *cmd, uint8_t cmdsize);
+extern bool NestedCheckKey(uint64_t key, TAuthData *ad, uint8_t *cmd, uint8_t cmdsize, uint8_t *parity);
+extern bool CheckCrypto1Parity(uint8_t *cmd_enc, uint8_t cmdsize, uint8_t *cmd, uint8_t *parity_enc);
+extern uint64_t GetCrypto1ProbableKey(TAuthData *ad);
 
 #endif // CMDHFLIST