X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/660d641a03456e99ea83c68dbd3d03bae2b64573..46782176fc6af10c082d4eaf2e45689d9517be19:/client/mifarehost.h diff --git a/client/mifarehost.h b/client/mifarehost.h index 9e026a55..5de082ce 100644 --- a/client/mifarehost.h +++ b/client/mifarehost.h @@ -43,26 +43,14 @@ #define TRACE_ERROR 0xFF -typedef struct fnVector { uint8_t blockNo, keyType; uint32_t uid, nt, ks1; } fnVector; - typedef struct { uint64_t Key[2]; int foundKey[2]; } sector; -typedef struct { - uint64_t *possibleKeys; - uint32_t size; -} pKeys; - -typedef struct { - uint64_t key; - int count; -} countKeys; - extern char logHexFileName[200]; -int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t * ResultKeys); +int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t * ResultKeys, bool calibrate); int mfCheckKeys (uint8_t blockNo, uint8_t keyType, uint8_t keycnt, uint8_t * keyBlock, uint64_t * key); int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount);