github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-20 21:33:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

ADD: added triplesided UID to "hf mf sniff"

Browse source
This commit is contained in:
iceman1001 2016-04-14 11:35:49 +02:00
commit 13fc2e9c71
2 changed files with 68 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

88
armsrc/mifaresniff.c
View file

@ -12,68 +12,71 @@
#include "apps.h" #include "apps.h"
static int sniffState = SNF_INIT; static int sniffState = SNF_INIT;
static uint8_t sniffUIDType; static uint8_t sniffUIDType = 0;
static uint8_t sniffUID[8]; static uint8_t sniffUID[10] = {0,0,0,0,0,0,0,0,0,0};
static uint8_t sniffATQA[2]; static uint8_t sniffATQA[2] = {0,0};
static uint8_t sniffSAK; static uint8_t sniffSAK = 0;
static uint8_t sniffBuf[16]; static uint8_t sniffBuf[19];
static uint32_t timerData; static uint32_t timerData = 0;
bool MfSniffInit(void){ void MfSniffInit(void){
memset(sniffUID, 0x00, 8); memset(sniffUID, 0x00, sizeof(sniffUID));
memset(sniffATQA, 0x00, 2); memset(sniffATQA, 0x00, sizeof(sniffATQA));
memset(sniffBuf, 0x00, sizeof(sniffBuf));
sniffSAK = 0; sniffSAK = 0;
sniffUIDType = SNF_UID_4; sniffUIDType = SNF_UID_4;
return FALSE;
} }
bool MfSniffEnd(void){ void MfSniffEnd(void){
LED_B_ON(); LED_B_ON();
cmd_send(CMD_ACK,0,0,0,0,0); cmd_send(CMD_ACK,0,0,0,0,0);
LED_B_OFF(); LED_B_OFF();
return FALSE;
} }
bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint8_t *parity, uint16_t bitCnt, bool reader) { bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint8_t *parity, uint16_t bitCnt, bool reader) {
if (reader && (len == 1) && (bitCnt == 7)) { // reset on 7-Bit commands from reader // reset on 7-Bit commands from reader
if (reader && (len == 1) && (bitCnt == 7)) {
sniffState = SNF_INIT; sniffState = SNF_INIT;
} }
switch (sniffState) { switch (sniffState) {
case SNF_INIT:{ case SNF_INIT:{
if ((len == 1) && (reader) && (bitCnt == 7) ) { // REQA or WUPA from reader // REQA or WUPA from reader
sniffUIDType = SNF_UID_4; if ((len == 1) && (reader) && (bitCnt == 7) ) {
memset(sniffUID, 0x00, 8); MfSniffInit();
memset(sniffATQA, 0x00, 2);
sniffSAK = 0;
sniffState = SNF_WUPREQ; sniffState = SNF_WUPREQ;
} }
break; break;
} }
case SNF_WUPREQ:{ case SNF_WUPREQ:{
if ((!reader) && (len == 2)) { // ATQA from tag // ATQA from tag
memcpy(sniffATQA, data, 2); if ((!reader) && (len == 2)) {
sniffATQA[0] = data[0];
sniffATQA[1] = data[1];
sniffState = SNF_ATQA; sniffState = SNF_ATQA;
} }
break; break;
} }
case SNF_ATQA:{ case SNF_ATQA:{
if ((reader) && (len == 2) && (data[0] == 0x93) && (data[1] == 0x20)) { // Select ALL from reader // Select ALL from reader
if ((reader) && (len == 2) && (data[0] == 0x93) && (data[1] == 0x20)) {
sniffState = SNF_ANTICOL1; sniffState = SNF_ANTICOL1;
} }
break; break;
} }
case SNF_ANTICOL1:{ case SNF_ANTICOL1:{
if ((!reader) && (len == 5) && ((data[0] ^ data[1] ^ data[2] ^ data[3]) == data[4])) { // UID from tag (CL1) // UID from tag (CL1)
if ((!reader) && (len == 5) && ((data[0] ^ data[1] ^ data[2] ^ data[3]) == data[4])) {
memcpy(sniffUID + 3, data, 4); memcpy(sniffUID + 3, data, 4);
sniffState = SNF_UID1; sniffState = SNF_UID1;
} }
break; break;
} }
case SNF_UID1:{ case SNF_UID1:{
if ((reader) && (len == 9) && (data[0] == 0x93) && (data[1] == 0x70) && (CheckCrc14443(CRC_14443_A, data, 9))) { // Select 4 Byte UID from reader // Select 4 Byte UID from reader
if ((reader) && (len == 9) && (data[0] == 0x93) && (data[1] == 0x70) && (CheckCrc14443(CRC_14443_A, data, 9))) {
sniffState = SNF_SAK; sniffState = SNF_SAK;
} }
break; break;
@ -90,7 +93,8 @@ bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint8_t *parity, ui
break; break;
} }
case SNF_ANTICOL2:{ case SNF_ANTICOL2:{
if ((!reader) && (len == 5) && ((data[0] ^ data[1] ^ data[2] ^ data[3]) == data[4])) { // CL2 UID // CL2 UID
if ((!reader) && (len == 5) && ((data[0] ^ data[1] ^ data[2] ^ data[3]) == data[4])) {
memcpy(sniffUID, sniffUID+4, 3); memcpy(sniffUID, sniffUID+4, 3);
memcpy(sniffUID+3, data, 4); memcpy(sniffUID+3, data, 4);
sniffUIDType = SNF_UID_7; sniffUIDType = SNF_UID_7;
@ -99,7 +103,25 @@ bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint8_t *parity, ui
break; break;
} }
case SNF_UID2:{ case SNF_UID2:{
if ((reader) && (len == 9) && (data[0] == 0x95) && (data[1] == 0x70) && (CheckCrc14443(CRC_14443_A, data, 9))) { // Select 2nd part of 7 Byte UID // Select 2nd part of 7 Byte UID
if ((reader) && (len == 9) && (data[0] == 0x95) && (data[1] == 0x70) && (CheckCrc14443(CRC_14443_A, data, 9))) {
sniffState = SNF_SAK;
}
break;
}
case SNF_ANTICOL3:{
// CL3 UID
if ((!reader) && (len == 5) && ((data[0] ^ data[1] ^ data[2] ^ data[3]) == data[4])) {
memcpy(sniffUID, sniffUID+4, 3);
memcpy(sniffUID+3, data, 4);
sniffUIDType = SNF_UID_10;
sniffState = SNF_UID3;
}
break;
}
case SNF_UID3:{
// Select 3nd part of 10 Byte UID
if ((reader) && (len == 9) && (data[0] == 0x97) && (data[1] == 0x70) && (CheckCrc14443(CRC_14443_A, data, 9))) {
sniffState = SNF_SAK; sniffState = SNF_SAK;
} }
break; break;
@ -107,12 +129,12 @@ bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint8_t *parity, ui
case SNF_CARD_IDLE:{ // trace the card select sequence case SNF_CARD_IDLE:{ // trace the card select sequence
sniffBuf[0] = 0xFF; sniffBuf[0] = 0xFF;
sniffBuf[1] = 0xFF; sniffBuf[1] = 0xFF;
memcpy(sniffBuf + 2, sniffUID, 7); memcpy(sniffBuf + 2, sniffUID, sizeof(sniffUID));
memcpy(sniffBuf + 9, sniffATQA, 2); memcpy(sniffBuf + 9, sniffATQA, sizeof(sniffATQA));
sniffBuf[11] = sniffSAK; sniffBuf[14] = sniffSAK;
sniffBuf[12] = 0xFF; sniffBuf[15] = 0xFF;
sniffBuf[13] = 0xFF; sniffBuf[16] = 0xFF;
LogTrace(sniffBuf, 14, 0, 0, NULL, TRUE); LogTrace(sniffBuf, sizeof(sniffBuf), 0, 0, NULL, TRUE);
} // intentionally no break; } // intentionally no break;
case SNF_CARD_CMD:{ case SNF_CARD_CMD:{
LogTrace(data, len, 0, 0, NULL, TRUE); LogTrace(data, len, 0, 0, NULL, TRUE);
@ -126,13 +148,10 @@ bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint8_t *parity, ui
timerData = GetTickCount(); timerData = GetTickCount();
break; break;
} }
default: default:
sniffState = SNF_INIT; sniffState = SNF_INIT;
break; break;
} }
return FALSE; return FALSE;
} }
@ -157,7 +176,6 @@ bool intMfSniffSend() {
LED_B_ON(); LED_B_ON();
cmd_send(CMD_ACK, 1, BigBuf_get_traceLen(), pckSize, trace + BigBuf_get_traceLen() - pckLen, pckSize); cmd_send(CMD_ACK, 1, BigBuf_get_traceLen(), pckSize, trace + BigBuf_get_traceLen() - pckLen, pckSize);
LED_B_OFF(); LED_B_OFF();
pckLen -= pckSize; pckLen -= pckSize;
pckNum++; pckNum++;
} }

16
armsrc/mifaresniff.h
View file

@ -15,7 +15,6 @@
#include "apps.h" #include "apps.h"
#include "util.h" #include "util.h"
#include "string.h" #include "string.h"
#include "iso14443crc.h" #include "iso14443crc.h"
#include "iso14443a.h" #include "iso14443a.h"
#include "crapto1.h" #include "crapto1.h"
@ -30,18 +29,21 @@
#define SNF_UID1 5 #define SNF_UID1 5
#define SNF_ANTICOL2 6 #define SNF_ANTICOL2 6
#define SNF_UID2 7 #define SNF_UID2 7
#define SNF_SAK 8 #define SNF_ANTICOL3 8
#define SNF_CARD_IDLE 9 #define SNF_UID3 9
#define SNF_CARD_CMD 10 #define SNF_SAK 10
#define SNF_CARD_RESP 11 #define SNF_CARD_IDLE 11
#define SNF_CARD_CMD 12
#define SNF_CARD_RESP 13
#define SNF_UID_4 0 #define SNF_UID_4 0
#define SNF_UID_7 0 #define SNF_UID_7 0
#define SNF_UID_10 0
bool MfSniffInit(void); void MfSniffInit(void);
bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint8_t *parity, uint16_t bitCnt, bool reader); bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint8_t *parity, uint16_t bitCnt, bool reader);
bool RAMFUNC MfSniffSend(uint16_t maxTimeoutMs); bool RAMFUNC MfSniffSend(uint16_t maxTimeoutMs);
bool intMfSniffSend(); bool intMfSniffSend();
bool MfSniffEnd(void); void MfSniffEnd(void);
#endif #endif