RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-02-14 03:03:14 +08:00
Code Issues Projects Releases Packages Wiki Activity

CHG: Swapped to using the DEFINES.

Browse source
This commit is contained in:
iceman1001 2016-04-14 11:05:27 +02:00
parent 91c7a7ccb7
commit 7ee74a8ebd
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
client/mifarehost.c
View file

@ -249,14 +249,12 @@ int mfEmlSetMem(uint8_t *data, int blockNum, int blocksCount) {
int mfEmlSetMem_xt(uint8_t *data, int blockNum, int blocksCount, int blockBtWidth) { int mfEmlSetMem_xt(uint8_t *data, int blockNum, int blocksCount, int blockBtWidth) {
UsbCommand c = {CMD_MIFARE_EML_MEMSET, {blockNum, blocksCount, blockBtWidth}}; UsbCommand c = {CMD_MIFARE_EML_MEMSET, {blockNum, blocksCount, blockBtWidth}};
memcpy(c.d.asBytes, data, blocksCount * blockBtWidth); memcpy(c.d.asBytes, data, blocksCount * blockBtWidth);
clearCommandBuffer(); clearCommandBuffer();
SendCommand(&c); SendCommand(&c);
return 0; return 0;
} }
// "MAGIC" CARD // "MAGIC" CARD
int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID, uint8_t wipecard) { int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID, uint8_t wipecard) {
uint8_t params = MAGIC_SINGLE; uint8_t params = MAGIC_SINGLE;
@ -329,6 +327,7 @@ int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params) {
} }
// SNIFFER // SNIFFER
// [iceman] so many global variables....
// constants // constants
static uint8_t trailerAccessBytes[4] = {0x08, 0x77, 0x8F, 0x00}; static uint8_t trailerAccessBytes[4] = {0x08, 0x77, 0x8F, 0x00};
@ -342,7 +341,6 @@ static uint8_t traceCurBlock = 0;
static uint8_t traceCurKey = 0; static uint8_t traceCurKey = 0;
struct Crypto1State *traceCrypto1 = NULL; struct Crypto1State *traceCrypto1 = NULL;
struct Crypto1State *revstate = NULL; struct Crypto1State *revstate = NULL;
uint64_t key = 0; uint64_t key = 0;
@ -475,6 +473,7 @@ void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len, bool i
int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) { int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
uint8_t data[64]; uint8_t data[64];
memset(data, 0x00, sizeof(data));
if (traceState == TRACE_ERROR) return 1; if (traceState == TRACE_ERROR) return 1;
@ -501,7 +500,7 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
} }
// AUTHENTICATION // AUTHENTICATION
if ((len == 4) && ((data[0] == 0x60) || (data[0] == 0x61))) { if ((len == 4) && ((data[0] == MIFARE_AUTH_KEYA) || (data[0] == MIFARE_AUTH_KEYB))) {
traceState = TRACE_AUTH1; traceState = TRACE_AUTH1;
traceCurBlock = data[1]; traceCurBlock = data[1];
traceCurKey = data[0] == 60 ? 1:0; traceCurKey = data[0] == 60 ? 1:0;
@ -509,21 +508,21 @@ int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile) {
} }
// READ // READ
if ((len ==4) && ((data[0] == 0x30))) { if ((len ==4) && ((data[0] == ISO14443A_CMD_READBLOCK))) {
traceState = TRACE_READ_DATA; traceState = TRACE_READ_DATA;
traceCurBlock = data[1]; traceCurBlock = data[1];
return 0; return 0;
} }
// WRITE // WRITE
if ((len ==4) && ((data[0] == 0xA0))) { if ((len ==4) && ((data[0] == ISO14443A_CMD_WRITEBLOCK))) {
traceState = TRACE_WRITE_OK; traceState = TRACE_WRITE_OK;
traceCurBlock = data[1]; traceCurBlock = data[1];
return 0; return 0;
} }
// HALT // HALT
if ((len ==4) && ((data[0] == 0x50) && (data[1] == 0x00))) { if ((len ==4) && ((data[0] == ISO14443A_CMD_HALT) && (data[1] == 0x00))) {
traceState = TRACE_ERROR; // do not decrypt the next commands traceState = TRACE_ERROR; // do not decrypt the next commands
return 0; return 0;
} }