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

CHG; still looking at 14b, this time started to look at the tracelog times not working.

Browse source
This commit is contained in:
iceman1001 2016-08-09 23:13:18 +02:00
commit 86db8973b0
2 changed files with 50 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

81
armsrc/iso14443b.c
View file

@ -40,7 +40,7 @@
//#define SEND4STUFFBIT(x) ToSendStuffBit(x); //#define SEND4STUFFBIT(x) ToSendStuffBit(x);
// iceman, this threshold value, what makes 8 a good amplituted for this IQ values? // iceman, this threshold value, what makes 8 a good amplituted for this IQ values?
#ifndef SUBCARRIER_DETECT_THRESHOLD #ifndef SUBCARRIER_DETECT_THRESHOLD
# define SUBCARRIER_DETECT_THRESHOLD 6 # define SUBCARRIER_DETECT_THRESHOLD 8
#endif #endif
static void iso14b_set_timeout(uint32_t timeout); static void iso14b_set_timeout(uint32_t timeout);
@ -237,7 +237,7 @@ static void CodeIso14443bAsTag(const uint8_t *cmd, int len) {
* Card data transmission * Card data transmission
* - TR1 * - TR1
* - SOF * - SOF
* - data (each bytes is: 1startbit,8bits, 1stopbit) * - data (each bytes is: 1startbit, 8bits, 1stopbit)
* - CRC_B * - CRC_B
* - EOF * - EOF
* *
@ -280,13 +280,14 @@ static void CodeIso14443bAsTag(const uint8_t *cmd, int len) {
// Data bits // Data bits
b = cmd[i]; b = cmd[i];
for(j = 0; j < 8; ++j) { for(j = 0; j < 8; ++j) {
if(b & 1) { // if(b & 1) {
SEND4STUFFBIT(1); // SEND4STUFFBIT(1);
//ToSendStuffBit(1); // //ToSendStuffBit(1);
} else { // } else {
SEND4STUFFBIT(0); // SEND4STUFFBIT(0);
//ToSendStuffBit(0); // //ToSendStuffBit(0);
} // }
SEND4STUFFBIT( b & 1 );
b >>= 1; b >>= 1;
} }
@ -802,10 +803,9 @@ static RAMFUNC int Handle14443bTagSamplesDemod(int ci, int cq) {
case DEMOD_UNSYNCD: case DEMOD_UNSYNCD:
CHECK_FOR_SUBCARRIER(); CHECK_FOR_SUBCARRIER();
if (MF_DBGLEVEL >= 3) { Dbprintf("Demod.state = %d", v); }
// subcarrier detected // subcarrier detected
if(v > SUBCARRIER_DETECT_THRESHOLD) { if (v > SUBCARRIER_DETECT_THRESHOLD) {
Demod.state = DEMOD_PHASE_REF_TRAINING; Demod.state = DEMOD_PHASE_REF_TRAINING;
Demod.sumI = ci; Demod.sumI = ci;
Demod.sumQ = cq; Demod.sumQ = cq;
@ -814,7 +814,7 @@ static RAMFUNC int Handle14443bTagSamplesDemod(int ci, int cq) {
break; break;
case DEMOD_PHASE_REF_TRAINING: case DEMOD_PHASE_REF_TRAINING:
if(Demod.posCount < 8) { if (Demod.posCount < 8) {
CHECK_FOR_SUBCARRIER(); CHECK_FOR_SUBCARRIER();
@ -837,7 +837,7 @@ static RAMFUNC int Handle14443bTagSamplesDemod(int ci, int cq) {
MAKE_SOFT_DECISION(); MAKE_SOFT_DECISION();
if(v < 0) { // logic '0' detected if (v < 0) { // logic '0' detected
Demod.state = DEMOD_GOT_FALLING_EDGE_OF_SOF; Demod.state = DEMOD_GOT_FALLING_EDGE_OF_SOF;
Demod.posCount = 0; // start of SOF sequence Demod.posCount = 0; // start of SOF sequence
} else { } else {
@ -852,13 +852,13 @@ static RAMFUNC int Handle14443bTagSamplesDemod(int ci, int cq) {
MAKE_SOFT_DECISION(); MAKE_SOFT_DECISION();
if(v > 0) { if (v > 0) {
// low phase of SOF too short (< 9 etu). Note: spec is >= 10, but FPGA tends to "smear" edges // low phase of SOF too short (< 9 etu). Note: spec is >= 10, but FPGA tends to "smear" edges
if(Demod.posCount < 8*2) { if (Demod.posCount < 8*2) {
Demod.state = DEMOD_UNSYNCD; Demod.state = DEMOD_UNSYNCD;
} else { } else {
LED_C_ON(); // Got SOF LED_C_ON(); // Got SOF
Demod.startTime = GetCountSspClk(); //Demod.startTime = GetCountSspClk();
Demod.state = DEMOD_AWAITING_START_BIT; Demod.state = DEMOD_AWAITING_START_BIT;
Demod.posCount = 0; Demod.posCount = 0;
Demod.len = 0; Demod.len = 0;
@ -904,7 +904,7 @@ static RAMFUNC int Handle14443bTagSamplesDemod(int ci, int cq) {
Demod.thisBit += v; Demod.thisBit += v;
Demod.shiftReg >>= 1; Demod.shiftReg >>= 1;
// logic '1' // OR in a logic '1'
if (Demod.thisBit > 0) Demod.shiftReg |= 0x200; if (Demod.thisBit > 0) Demod.shiftReg |= 0x200;
++Demod.bitCount; ++Demod.bitCount;
@ -923,7 +923,7 @@ static RAMFUNC int Handle14443bTagSamplesDemod(int ci, int cq) {
} else { } else {
// this one is a bit hard, either its a correc byte or its unsynced. // this one is a bit hard, either its a correc byte or its unsynced.
Demod.state = DEMOD_UNSYNCD; Demod.state = DEMOD_UNSYNCD;
Demod.endTime = GetCountSspClk(); //Demod.endTime = GetCountSspClk();
LED_C_OFF(); LED_C_OFF();
// This is EOF (start, stop and all data bits == '0' // This is EOF (start, stop and all data bits == '0'
@ -1018,7 +1018,7 @@ static void GetTagSamplesFor14443bDemod() {
Dbhexdump(ISO14443B_DMA_BUFFER_SIZE, (uint8_t *)dmaBuf, FALSE); Dbhexdump(ISO14443B_DMA_BUFFER_SIZE, (uint8_t *)dmaBuf, FALSE);
if ( Demod.len > 0 ) if ( Demod.len > 0 )
LogTrace(Demod.output, Demod.len, Demod.startTime, Demod.endTime, NULL, FALSE); LogTrace(Demod.output, Demod.len, time_0, time_stop, NULL, FALSE);
} }
@ -1075,8 +1075,7 @@ static void TransmitFor14443b_AsReader(void) {
// Code a layer 2 command (string of octets, including CRC) into ToSend[], // Code a layer 2 command (string of octets, including CRC) into ToSend[],
// so that it is ready to transmit to the tag using TransmitFor14443b(). // so that it is ready to transmit to the tag using TransmitFor14443b().
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
static void CodeIso14443bAsReader(const uint8_t *cmd, int len) static void CodeIso14443bAsReader(const uint8_t *cmd, int len) {
{
/* /*
* Reader data transmission: * Reader data transmission:
* - no modulation ONES * - no modulation ONES
@ -1112,14 +1111,24 @@ static void CodeIso14443bAsReader(const uint8_t *cmd, int len)
ToSendStuffBit(0); ToSendStuffBit(0);
// Data bits // Data bits
b = cmd[i]; b = cmd[i];
if ( b & 1 ) ToSendStuffBit(1); else ToSendStuffBit(0); // if ( b & 1 ) ToSendStuffBit(1); else ToSendStuffBit(0);
if ( (b>>1) & 1) ToSendStuffBit(1); else ToSendStuffBit(0); // if ( (b>>1) & 1) ToSendStuffBit(1); else ToSendStuffBit(0);
if ( (b>>2) & 1) ToSendStuffBit(1); else ToSendStuffBit(0); // if ( (b>>2) & 1) ToSendStuffBit(1); else ToSendStuffBit(0);
if ( (b>>3) & 1) ToSendStuffBit(1); else ToSendStuffBit(0); // if ( (b>>3) & 1) ToSendStuffBit(1); else ToSendStuffBit(0);
if ( (b>>4) & 1) ToSendStuffBit(1); else ToSendStuffBit(0); // if ( (b>>4) & 1) ToSendStuffBit(1); else ToSendStuffBit(0);
if ( (b>>5) & 1) ToSendStuffBit(1); else ToSendStuffBit(0); // if ( (b>>5) & 1) ToSendStuffBit(1); else ToSendStuffBit(0);
if ( (b>>6) & 1) ToSendStuffBit(1); else ToSendStuffBit(0); // if ( (b>>6) & 1) ToSendStuffBit(1); else ToSendStuffBit(0);
if ( (b>>7) & 1) ToSendStuffBit(1); else ToSendStuffBit(0); // if ( (b>>7) & 1) ToSendStuffBit(1); else ToSendStuffBit(0);
ToSendStuffBit( b & 1);
ToSendStuffBit( (b>>1) & 1);
ToSendStuffBit( (b>>2) & 1);
ToSendStuffBit( (b>>3) & 1);
ToSendStuffBit( (b>>4) & 1);
ToSendStuffBit( (b>>5) & 1);
ToSendStuffBit( (b>>6) & 1);
ToSendStuffBit( (b>>7) & 1);
// Stop bit // Stop bit
ToSendStuffBit(1); ToSendStuffBit(1);
// EGT extra guard time // EGT extra guard time
@ -1145,19 +1154,19 @@ static void CodeIso14443bAsReader(const uint8_t *cmd, int len)
} }
/** /*
Convenience function to encode, transmit and trace iso 14443b comms * Convenience function to encode, transmit and trace iso 14443b comms
**/ */
static void CodeAndTransmit14443bAsReader(const uint8_t *cmd, int len) { static void CodeAndTransmit14443bAsReader(const uint8_t *cmd, int len) {
uint32_t time_start = GetCountSspClk();
CodeIso14443bAsReader(cmd, len); CodeIso14443bAsReader(cmd, len);
uint32_t time_start = GetCountSspClk();
TransmitFor14443b_AsReader(); TransmitFor14443b_AsReader();
if(trigger) LED_A_ON(); if(trigger) LED_A_ON();
LogTrace(cmd, len, time_start, GetCountSspClk()-time_start, NULL, TRUE); LogTrace(cmd, len, time_start, GetCountSspClk()-time_start, NULL, TRUE);
} }

10
client/cmdhf14b.c
View file

@ -136,7 +136,7 @@ int CmdHF14BSnoop(const char *Cmd) {
int CmdHF14BCmdRaw (const char *Cmd) { int CmdHF14BCmdRaw (const char *Cmd) {
bool reply = TRUE, power = FALSE, select = FALSE; bool reply = TRUE, power = FALSE, select = FALSE;
char buf[5]=""; char buf[5] = "";
int i = 0; int i = 0;
uint8_t data[USB_CMD_DATA_SIZE] = {0x00}; uint8_t data[USB_CMD_DATA_SIZE] = {0x00};
uint16_t datalen = 0; uint16_t datalen = 0;
@ -202,10 +202,10 @@ int CmdHF14BCmdRaw (const char *Cmd) {
return 0; return 0;
} }
if(!power) if (!power)
flags |= ISO14B_DISCONNECT; flags |= ISO14B_DISCONNECT;
if(datalen>0) if (datalen>0)
flags |= ISO14B_RAW; flags |= ISO14B_RAW;
// Max buffer is USB_CMD_DATA_SIZE // Max buffer is USB_CMD_DATA_SIZE
@ -249,7 +249,7 @@ static void print_atqb_resp(uint8_t *data, uint8_t cid){
if (BitRate & 0x04) PrintAndLog(" Bit Rate: 847 kbit/s PICC <- PCD supported"); if (BitRate & 0x04) PrintAndLog(" Bit Rate: 847 kbit/s PICC <- PCD supported");
if (BitRate & 0x80) PrintAndLog(" Same bit rate <-> required"); if (BitRate & 0x80) PrintAndLog(" Same bit rate <-> required");
uint16_t maxFrame = data[5]>>4; uint16_t maxFrame = data[5] >> 4;
if (maxFrame < 5) maxFrame = 8 * maxFrame + 16; if (maxFrame < 5) maxFrame = 8 * maxFrame + 16;
else if (maxFrame == 5) maxFrame = 64; else if (maxFrame == 5) maxFrame = 64;
else if (maxFrame == 6) maxFrame = 96; else if (maxFrame == 6) maxFrame = 96;
@ -257,7 +257,7 @@ static void print_atqb_resp(uint8_t *data, uint8_t cid){
else if (maxFrame == 8) maxFrame = 256; else if (maxFrame == 8) maxFrame = 256;
else maxFrame = 257; else maxFrame = 257;
PrintAndLog("Max Frame Size: %u%s bytes",maxFrame, (maxFrame == 257) ? "+ RFU" : ""); PrintAndLog("Max Frame Size: %u%s bytes", maxFrame, (maxFrame == 257) ? "+ RFU" : "");
uint8_t protocolT = data[5] & 0xF; uint8_t protocolT = data[5] & 0xF;
PrintAndLog(" Protocol Type: Protocol is %scompliant with ISO/IEC 14443-4",(protocolT) ? "" : "not " ); PrintAndLog(" Protocol Type: Protocol is %scompliant with ISO/IEC 14443-4",(protocolT) ? "" : "not " );