move ks to authdata

[proxmark3-svn] / client / cmdhflist.h

diff --git a/client/cmdhflist.h b/client/cmdhflist.h
index 138e5590956f5115b4b28cf9d8dabfd9768f59d6..76b57392259e2ade054ad91ab277c1b1ea08d851 100644 (file)
--- a/client/cmdhflist.h
+++ b/client/cmdhflist.h
@@ -7,5 +7,35 @@
 //-----------------------------------------------------------------------------
 // Command: hf mf list. It shows data from arm buffer.
 //-----------------------------------------------------------------------------
+#ifndef CMDHFLIST_H
+#define CMDHFLIST_H
 
+#include <stdlib.h>
+#include <stdint.h>
+#include <stdbool.h>
 
+typedef struct {
+       uint32_t uid;       // UID
+       uint32_t nt;        // tag challenge
+       uint32_t nt_enc;    // encrypted tag challenge
+       uint8_t nt_enc_par; // encrypted tag challenge parity
+       uint32_t nr_enc;    // encrypted reader challenge
+       uint32_t ar_enc;    // encrypted reader response
+       uint8_t ar_enc_par; // encrypted reader response parity
+       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 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