move ks to authdata

[proxmark3-svn] / client / cmdhflist.h

diff --git a/client/cmdhflist.h b/client/cmdhflist.h
index 7d95cc1c2b888f73c7cddbb8380a5a569fda9c81..76b57392259e2ade054ad91ab277c1b1ea08d851 100644 (file)
--- a/client/cmdhflist.h
+++ b/client/cmdhflist.h
@@ -25,6 +25,8 @@ 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();
 
@@ -33,5 +35,7 @@ extern uint8_t mifare_CRC_check(bool isResponse, uint8_t* data, uint8_t len);
 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 NTParityChk(TAuthData *ad, uint32_t ntx);
+extern bool NestedCheckKey(uint64_t key, TAuthData *ad, uint8_t *cmd, uint8_t cmdsize);
 
 #endif // CMDHFLIST