projects
/
proxmark3-svn
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FIX: introduced a bug in a loop by uint8_t inside crapto1.c
[proxmark3-svn]
/
client
/
mifarehost.h
diff --git
a/client/mifarehost.h
b/client/mifarehost.h
index 3e946cd9279550cdd2cd8e9d2fbddd98af57bce6..a214ede48868cf3f04e3ea23282cb2d92ecf2c80 100644
(file)
--- a/
client/mifarehost.h
+++ b/
client/mifarehost.h
@@
-19,44
+19,38
@@
#include "nonce2key/nonce2key.h"
\r
#include "nonce2key/crapto1.h"
\r
#include "iso14443crc.h"
\r
#include "nonce2key/nonce2key.h"
\r
#include "nonce2key/crapto1.h"
\r
#include "iso14443crc.h"
\r
+#include "protocols.h"
\r
\r
#define MEM_CHUNK 1000000
\r
#define NESTED_SECTOR_RETRY 10
\r
\r
\r
#define MEM_CHUNK 1000000
\r
#define NESTED_SECTOR_RETRY 10
\r
\r
-// mfCSetBlock work flags
\r
-#define CSETBLOCK_UID 0x01
\r
-#define CSETBLOCK_WUPC 0x02
\r
-#define CSETBLOCK_HALT 0x04
\r
-#define CSETBLOCK_INIT_FIELD 0x08
\r
-#define CSETBLOCK_RESET_FIELD 0x10
\r
-#define CSETBLOCK_SINGLE_OPER 0x1F
\r
-
\r
// mifare tracer flags
\r
// mifare tracer flags
\r
-#define TRACE_IDLE
0x00
\r
-#define TRACE_AUTH1
0x01
\r
-#define TRACE_AUTH2
0x02
\r
-#define TRACE_AUTH_OK
0x03
\r
-#define TRACE_READ_DATA
0x04
\r
-#define TRACE_WRITE_OK
0x05
\r
-#define TRACE_WRITE_DATA
0x06
\r
+#define TRACE_IDLE 0x00
\r
+#define TRACE_AUTH1 0x01
\r
+#define TRACE_AUTH2 0x02
\r
+#define TRACE_AUTH_OK 0x03
\r
+#define TRACE_READ_DATA 0x04
\r
+#define TRACE_WRITE_OK 0x05
\r
+#define TRACE_WRITE_DATA 0x06
\r
\r
\r
-#define TRACE_ERROR
0xFF
\r
+#define TRACE_ERROR 0xFF
\r
\r
typedef struct {
\r
uint64_t Key[2];
\r
int foundKey[2];
\r
} sector;
\r
\r
\r
typedef struct {
\r
uint64_t Key[2];
\r
int foundKey[2];
\r
} sector;
\r
\r
-extern char logHexFileName[
200
];
\r
+extern char logHexFileName[
FILE_PATH_SIZE
];
\r
\r
int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t * ResultKeys, bool calibrate);
\r
\r
int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t * ResultKeys, bool calibrate);
\r
-int mfCheckKeys (uint8_t blockNo, uint8_t keyType, uint8_t keycnt, uint8_t * keyBlock, uint64_t * key);
\r
+int mfCheckKeys (uint8_t blockNo, uint8_t keyType,
bool clear_trace,
uint8_t keycnt, uint8_t * keyBlock, uint64_t * key);
\r
\r
int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount);
\r
int mfEmlSetMem(uint8_t *data, int blockNum, int blocksCount);
\r
\r
int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount);
\r
int mfEmlSetMem(uint8_t *data, int blockNum, int blocksCount);
\r
+int mfEmlSetMem_xt(uint8_t *data, int blockNum, int blocksCount, int blockBtWidth);
\r
\r
\r
-int mfCSetUID(uint8_t *uid, uint8_t *
oldUID, bool wantWipe
);
\r
-int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid,
bool wantWipe,
uint8_t params);
\r
+int mfCSetUID(uint8_t *uid, uint8_t *
atqa, uint8_t *sak, uint8_t *oldUID, uint8_t wipecard
);
\r
+int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, uint8_t params);
\r
int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params);
\r
\r
int mfTraceInit(uint8_t *tuid, uint8_t *atqa, uint8_t sak, bool wantSaveToEmlFile);
\r
int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params);
\r
\r
int mfTraceInit(uint8_t *tuid, uint8_t *atqa, uint8_t sak, bool wantSaveToEmlFile);
\r
@@
-67,3
+61,4
@@
int isBlockEmpty(int blockN);
int isBlockTrailer(int blockN);
\r
int loadTraceCard(uint8_t *tuid);
\r
int saveTraceCard(void);
\r
int isBlockTrailer(int blockN);
\r
int loadTraceCard(uint8_t *tuid);
\r
int saveTraceCard(void);
\r
+int tryDecryptWord(uint32_t nt, uint32_t ar_enc, uint32_t at_enc, uint8_t *data, int len);
\r
Impressum
,
Datenschutz