git.zerfleddert.de Git - proxmark3-svn/blobdiff

diff --git a/armsrc/mifareutil.c b/armsrc/mifareutil.c

index c706e78a4a5d7f022a193e5c6d3a34a1dc1ae192..6c84377858b9daa1f9d04835d9cb0b1f107b118b 100644 (file)

--- a/armsrc/mifareutil.c

+++ b/armsrc/mifareutil.c

@@ -9,15 +9,16 @@

// Work with mifare cards.\r

//-----------------------------------------------------------------------------\r

\r

+#include "mifareutil.h"\r

#include "proxmark3.h"\r

#include "apps.h"\r

#include "util.h"\r

+#include "parity.h"\r

#include "string.h"\r

\r

#include "iso14443crc.h"\r

#include "iso14443a.h"\r

-#include "crapto1.h"\r

-#include "mifareutil.h"\r

+#include "crapto1/crapto1.h"\r

#include "des.h"\r

\r

int MF_DBGLEVEL = MF_DBG_ALL;\r

@@ -50,7 +51,7 @@ void mf_crypto1_encrypt(struct Crypto1State *pcs, uint8_t *data, uint16_t len, u

data[i] = crypto1_byte(pcs, 0x00, 0) ^ data[i];\r

if((i&0x0007) == 0) \r

par[i>>3] = 0;\r

- par[i>>3] |= (((filter(pcs->odd) ^ oddparity(bt)) & 0x01)<<(7-(i&0x0007)));\r

+ par[i>>3] |= (((filter(pcs->odd) ^ oddparity8(bt)) & 0x01)<<(7-(i&0x0007)));\r

} \r

return;\r

}\r

@@ -65,12 +66,6 @@ uint8_t mf_crypto1_encrypt4bit(struct Crypto1State *pcs, uint8_t data) {

return bt;\r

}\r

\r

-// send 2 byte commands\r

-int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t data, uint8_t* answer, uint8_t *answer_parity, uint32_t *timing)\r

-{\r

- return mifare_sendcmd_shortex(pcs, crypted, cmd, data, answer, answer_parity, timing);\r

-}\r

-\r

// send X byte basic commands\r

int mifare_sendcmd(uint8_t cmd, uint8_t* data, uint8_t data_size, uint8_t* answer, uint8_t *answer_parity, uint32_t *timing)\r

{\r

@@ -88,52 +83,8 @@ int mifare_sendcmd(uint8_t cmd, uint8_t* data, uint8_t data_size, uint8_t* answe

return len;\r

}\r

\r

-/*\r

-int mifare_sendcmd_short_mfucauth(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t *data, uint8_t *answer, uint8_t *answer_parity, uint32_t *timing)\r

-{\r

- uint8_t dcmd[19];\r

- int len; \r

- dcmd[0] = cmd;\r

- memcpy(dcmd+1,data,16);\r

- AppendCrc14443a(dcmd, 17);\r

- \r

- ReaderTransmit(dcmd, sizeof(dcmd), timing);\r

- len = ReaderReceive(answer, answer_parity);\r

- if(!len) {\r

- if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication failed. Card timeout.");\r

- len = ReaderReceive(answer,answer_parity);\r

- }\r

- if(len==1) {\r

- if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("NAK - Authentication failed.");\r

- return 1;\r

- }\r

- return len;\r

-}\r

-\r

-int mifare_sendcmd_short_mfuev1auth(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t *data, uint8_t *answer, uint8_t *answer_parity, uint32_t *timing)\r

-{\r

- uint8_t dcmd[7];\r

- int len; \r

- dcmd[0] = cmd;\r

- memcpy(dcmd+1,data,4);\r

- AppendCrc14443a(dcmd, 5);\r

-\r

- ReaderTransmit(dcmd, sizeof(dcmd), timing);\r

- len = ReaderReceive(answer, answer_parity);\r

- if(!len) {\r

- if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication failed. Card timeout.");\r

- len = ReaderReceive(answer,answer_parity);\r

- }\r

- if(len==1) {\r

- if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("NAK - Authentication failed.");\r

- return 1;\r

- }\r

- return len;\r

-}\r

-*/\r

-\r

// send 2 byte commands\r

-int mifare_sendcmd_shortex(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t data, uint8_t *answer, uint8_t *answer_parity, uint32_t *timing)\r

+int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t data, uint8_t *answer, uint8_t *answer_parity, uint32_t *timing)\r

{\r

uint8_t dcmd[4], ecmd[4];\r

uint16_t pos, res;\r

@@ -149,7 +100,7 @@ int mifare_sendcmd_shortex(struct Crypto1State *pcs, uint8_t crypted, uint8_t cm

for (pos = 0; pos < 4; pos++)\r

{\r

ecmd[pos] = crypto1_byte(pcs, 0x00, 0) ^ dcmd[pos];\r

- par[0] |= (((filter(pcs->odd) ^ oddparity(dcmd[pos])) & 0x01) << (7-pos));\r

+ par[0] |= (((filter(pcs->odd) ^ oddparity8(dcmd[pos])) & 0x01) << (7-pos));\r

} \r

\r

ReaderTransmitPar(ecmd, sizeof(ecmd), par, timing);\r

@@ -243,7 +194,7 @@ int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockN

for (pos = 0; pos < 4; pos++)\r

{\r

mf_nr_ar[pos] = crypto1_byte(pcs, nr[pos], 0) ^ nr[pos];\r

- par[0] |= (((filter(pcs->odd) ^ oddparity(nr[pos])) & 0x01) << (7-pos));\r

+ par[0] |= (((filter(pcs->odd) ^ oddparity8(nr[pos])) & 0x01) << (7-pos));\r

} \r

\r

// Skip 32 bits in pseudo random generator\r

@@ -254,7 +205,7 @@ int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockN

{\r

nt = prng_successor(nt,8);\r

mf_nr_ar[pos] = crypto1_byte(pcs,0x00,0) ^ (nt & 0xff);\r

- par[0] |= (((filter(pcs->odd) ^ oddparity(nt & 0xff)) & 0x01) << (7-pos));\r

+ par[0] |= (((filter(pcs->odd) ^ oddparity8(nt)) & 0x01) << (7-pos));\r

} \r

\r

// Transmit reader nonce and reader answer\r

@@ -319,7 +270,8 @@ int mifare_ul_ev1_auth(uint8_t *keybytes, uint8_t *pack){

uint8_t key[4] = {0x00};\r

memcpy(key, keybytes, 4);\r

\r

- Dbprintf("EV1 Auth : %02x%02x%02x%02x", key[0], key[1], key[2], key[3]);\r

+ if (MF_DBGLEVEL >= MF_DBG_EXTENDED)\r

+ Dbprintf("EV1 Auth : %02x%02x%02x%02x", key[0], key[1], key[2], key[3]);\r

len = mifare_sendcmd(0x1B, key, sizeof(key), resp, respPar, NULL);\r

//len = mifare_sendcmd_short_mfuev1auth(NULL, 0, 0x1B, key, resp, respPar, NULL);\r

if (len != 4) {\r

@@ -476,7 +428,7 @@ int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t bl

for (pos = 0; pos < 18; pos++)\r

{\r

d_block_enc[pos] = crypto1_byte(pcs, 0x00, 0) ^ d_block[pos];\r

- par[pos>>3] |= (((filter(pcs->odd) ^ oddparity(d_block[pos])) & 0x01) << (7 - (pos&0x0007)));\r

+ par[pos>>3] |= (((filter(pcs->odd) ^ oddparity8(d_block[pos])) & 0x01) << (7 - (pos&0x0007)));\r

} \r

\r

ReaderTransmitPar(d_block_enc, sizeof(d_block_enc), par, NULL);\r