mirror of
https://github.com/Proxmark/proxmark3.git
synced 2025-07-07 13:41:18 -07:00
Clean up pcf7931
@iceman1001 s cleanup of pcf7931 commands on client side and split out pcf7931 from lfops.c as it is getting large
This commit is contained in:
marshmellow42
parent
be6250d31b
commit
d10e08ae6e
8 changed files with 695 additions and 640 deletions
|
|
@ -15,7 +15,7 @@ APP_CFLAGS = -DWITH_ISO14443a_StandAlone -DWITH_LF -DWITH_ISO15693 -DWITH_ISO144
|
||||||
#-DWITH_LCD
|
#-DWITH_LCD
|
||||||
|
|
||||||
#SRC_LCD = fonts.c LCD.c
|
#SRC_LCD = fonts.c LCD.c
|
||||||
SRC_LF = lfops.c hitag2.c lfsampling.c
|
SRC_LF = lfops.c hitag2.c lfsampling.c pcf7931.c
|
||||||
SRC_ISO15693 = iso15693.c iso15693tools.c
|
SRC_ISO15693 = iso15693.c iso15693tools.c
|
||||||
SRC_ISO14443a = epa.c iso14443a.c mifareutil.c mifarecmd.c mifaresniff.c
|
SRC_ISO14443a = epa.c iso14443a.c mifareutil.c mifarecmd.c mifaresniff.c
|
||||||
SRC_ISO14443b = iso14443b.c
|
SRC_ISO14443b = iso14443b.c
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,7 @@
|
||||||
#include "lfsampling.h"
|
#include "lfsampling.h"
|
||||||
#include "BigBuf.h"
|
#include "BigBuf.h"
|
||||||
#include "mifareutil.h"
|
#include "mifareutil.h"
|
||||||
|
#include "pcf7931.h"
|
||||||
#ifdef WITH_LCD
|
#ifdef WITH_LCD
|
||||||
#include "LCD.h"
|
#include "LCD.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -988,7 +989,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
|
||||||
cmd_send(CMD_ACK,0,0,0,0,0);
|
cmd_send(CMD_ACK,0,0,0,0,0);
|
||||||
break;
|
break;
|
||||||
case CMD_PCF7931_WRITE:
|
case CMD_PCF7931_WRITE:
|
||||||
WritePCF7931(c->d.asDwords[0],c->d.asDwords[1],c->d.asDwords[2],c->d.asDwords[3],c->d.asDwords[4],c->d.asDwords[5],c->d.asDwords[6], c->d.asDwords[9], c->d.asDwords[7]-128,c->d.asDwords[8]-128, c->arg[0], c->arg[1], c->arg[2]);
|
WritePCF7931(c->d.asBytes[0],c->d.asBytes[1],c->d.asBytes[2],c->d.asBytes[3],c->d.asBytes[4],c->d.asBytes[5],c->d.asBytes[6], c->d.asBytes[9], c->d.asBytes[7]-128,c->d.asBytes[8]-128, c->arg[0], c->arg[1], c->arg[2]);
|
||||||
break;
|
break;
|
||||||
case CMD_EM4X_READ_WORD:
|
case CMD_EM4X_READ_WORD:
|
||||||
EM4xReadWord(c->arg[1], c->arg[2],c->d.asBytes[0]);
|
EM4xReadWord(c->arg[1], c->arg[2],c->d.asBytes[0]);
|
||||||
|
|
|
||||||
|
|
@ -82,15 +82,6 @@ void CopyIndala224toT55x7(int uid1, int uid2, int uid3, int uid4, int uid5, int
|
||||||
void T55xxWriteBlock(uint32_t Data, uint32_t Block, uint32_t Pwd, uint8_t PwdMode);
|
void T55xxWriteBlock(uint32_t Data, uint32_t Block, uint32_t Pwd, uint8_t PwdMode);
|
||||||
void T55xxReadBlock(uint32_t Block, uint32_t Pwd, uint8_t PwdMode );
|
void T55xxReadBlock(uint32_t Block, uint32_t Pwd, uint8_t PwdMode );
|
||||||
void T55xxReadTrace(void);
|
void T55xxReadTrace(void);
|
||||||
int DemodPCF7931(uint8_t **outBlocks);
|
|
||||||
int IsBlock0PCF7931(uint8_t *Block);
|
|
||||||
int IsBlock1PCF7931(uint8_t *Block);
|
|
||||||
void ReadPCF7931();
|
|
||||||
void SendCmdPCF7931(uint32_t * tab);
|
|
||||||
bool AddBytePCF7931(uint8_t byte, uint32_t * tab, int32_t l, int32_t p);
|
|
||||||
bool AddBitPCF7931(bool b, uint32_t * tab, int32_t l, int32_t p);
|
|
||||||
bool AddPatternPCF7931(uint32_t a, uint32_t b, uint32_t c, uint32_t * tab);
|
|
||||||
void WritePCF7931(uint8_t pass1, uint8_t pass2, uint8_t pass3, uint8_t pass4, uint8_t pass5, uint8_t pass6, uint8_t pass7, uint16_t init_delay, int32_t l, int32_t p, uint8_t address, uint8_t byte, uint8_t data);
|
|
||||||
void EM4xReadWord(uint8_t Address, uint32_t Pwd, uint8_t PwdMode);
|
void EM4xReadWord(uint8_t Address, uint32_t Pwd, uint8_t PwdMode);
|
||||||
void EM4xWriteWord(uint32_t Data, uint8_t Address, uint32_t Pwd, uint8_t PwdMode);
|
void EM4xWriteWord(uint32_t Data, uint8_t Address, uint32_t Pwd, uint8_t PwdMode);
|
||||||
|
|
||||||
|
|
|
||||||
534
armsrc/lfops.c
534
armsrc/lfops.c
|
|
@ -768,7 +768,7 @@ void CmdHIDdemodFSK(int findone, int *high, int *low, int ledcontrol)
|
||||||
// Configure to go in 125Khz listen mode
|
// Configure to go in 125Khz listen mode
|
||||||
LFSetupFPGAForADC(95, true);
|
LFSetupFPGAForADC(95, true);
|
||||||
|
|
||||||
while(!BUTTON_PRESS()) {
|
while(!BUTTON_PRESS() && !usb_poll_validate_length()) {
|
||||||
|
|
||||||
WDT_HIT();
|
WDT_HIT();
|
||||||
if (ledcontrol) LED_A_ON();
|
if (ledcontrol) LED_A_ON();
|
||||||
|
|
@ -857,7 +857,7 @@ void CmdAWIDdemodFSK(int findone, int *high, int *low, int ledcontrol)
|
||||||
// Configure to go in 125Khz listen mode
|
// Configure to go in 125Khz listen mode
|
||||||
LFSetupFPGAForADC(95, true);
|
LFSetupFPGAForADC(95, true);
|
||||||
|
|
||||||
while(!BUTTON_PRESS()) {
|
while(!BUTTON_PRESS() && !usb_poll_validate_length()) {
|
||||||
|
|
||||||
WDT_HIT();
|
WDT_HIT();
|
||||||
if (ledcontrol) LED_A_ON();
|
if (ledcontrol) LED_A_ON();
|
||||||
|
|
@ -948,7 +948,7 @@ void CmdEM410xdemod(int findone, int *high, int *low, int ledcontrol)
|
||||||
// Configure to go in 125Khz listen mode
|
// Configure to go in 125Khz listen mode
|
||||||
LFSetupFPGAForADC(95, true);
|
LFSetupFPGAForADC(95, true);
|
||||||
|
|
||||||
while(!BUTTON_PRESS()) {
|
while(!BUTTON_PRESS() && !usb_poll_validate_length()) {
|
||||||
|
|
||||||
WDT_HIT();
|
WDT_HIT();
|
||||||
if (ledcontrol) LED_A_ON();
|
if (ledcontrol) LED_A_ON();
|
||||||
|
|
@ -1007,7 +1007,7 @@ void CmdIOdemodFSK(int findone, int *high, int *low, int ledcontrol)
|
||||||
// Configure to go in 125Khz listen mode
|
// Configure to go in 125Khz listen mode
|
||||||
LFSetupFPGAForADC(95, true);
|
LFSetupFPGAForADC(95, true);
|
||||||
|
|
||||||
while(!BUTTON_PRESS()) {
|
while(!BUTTON_PRESS() && !usb_poll_validate_length()) {
|
||||||
WDT_HIT();
|
WDT_HIT();
|
||||||
if (ledcontrol) LED_A_ON();
|
if (ledcontrol) LED_A_ON();
|
||||||
DoAcquisition_default(-1,true);
|
DoAcquisition_default(-1,true);
|
||||||
|
|
@ -1582,274 +1582,6 @@ void CopyIndala224toT55x7(int uid1, int uid2, int uid3, int uid4, int uid5, int
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#define abs(x) ( ((x)<0) ? -(x) : (x) )
|
|
||||||
#define max(x,y) ( x<y ? y:x)
|
|
||||||
|
|
||||||
int DemodPCF7931(uint8_t **outBlocks) {
|
|
||||||
uint8_t BitStream[256];
|
|
||||||
uint8_t Blocks[8][16];
|
|
||||||
uint8_t *GraphBuffer = BigBuf_get_addr();
|
|
||||||
int GraphTraceLen = BigBuf_max_traceLen();
|
|
||||||
int i, j, lastval, bitidx, half_switch;
|
|
||||||
int clock = 64;
|
|
||||||
int tolerance = clock / 8;
|
|
||||||
int pmc, block_done;
|
|
||||||
int lc, warnings = 0;
|
|
||||||
int num_blocks = 0;
|
|
||||||
int lmin=128, lmax=128;
|
|
||||||
uint8_t dir;
|
|
||||||
|
|
||||||
LFSetupFPGAForADC(95, true);
|
|
||||||
DoAcquisition_default(0, 0);
|
|
||||||
|
|
||||||
|
|
||||||
lmin = 64;
|
|
||||||
lmax = 192;
|
|
||||||
|
|
||||||
i = 2;
|
|
||||||
|
|
||||||
/* Find first local max/min */
|
|
||||||
if(GraphBuffer[1] > GraphBuffer[0]) {
|
|
||||||
while(i < GraphTraceLen) {
|
|
||||||
if( !(GraphBuffer[i] > GraphBuffer[i-1]) && GraphBuffer[i] > lmax)
|
|
||||||
break;
|
|
||||||
i++;
|
|
||||||
}
|
|
||||||
dir = 0;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
while(i < GraphTraceLen) {
|
|
||||||
if( !(GraphBuffer[i] < GraphBuffer[i-1]) && GraphBuffer[i] < lmin)
|
|
||||||
break;
|
|
||||||
i++;
|
|
||||||
}
|
|
||||||
dir = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
lastval = i++;
|
|
||||||
half_switch = 0;
|
|
||||||
pmc = 0;
|
|
||||||
block_done = 0;
|
|
||||||
|
|
||||||
for (bitidx = 0; i < GraphTraceLen; i++)
|
|
||||||
{
|
|
||||||
if ( (GraphBuffer[i-1] > GraphBuffer[i] && dir == 1 && GraphBuffer[i] > lmax) || (GraphBuffer[i-1] < GraphBuffer[i] && dir == 0 && GraphBuffer[i] < lmin))
|
|
||||||
{
|
|
||||||
lc = i - lastval;
|
|
||||||
lastval = i;
|
|
||||||
|
|
||||||
// Switch depending on lc length:
|
|
||||||
// Tolerance is 1/8 of clock rate (arbitrary)
|
|
||||||
if (abs(lc-clock/4) < tolerance) {
|
|
||||||
// 16T0
|
|
||||||
if((i - pmc) == lc) { /* 16T0 was previous one */
|
|
||||||
/* It's a PMC ! */
|
|
||||||
i += (128+127+16+32+33+16)-1;
|
|
||||||
lastval = i;
|
|
||||||
pmc = 0;
|
|
||||||
block_done = 1;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
pmc = i;
|
|
||||||
}
|
|
||||||
} else if (abs(lc-clock/2) < tolerance) {
|
|
||||||
// 32TO
|
|
||||||
if((i - pmc) == lc) { /* 16T0 was previous one */
|
|
||||||
/* It's a PMC ! */
|
|
||||||
i += (128+127+16+32+33)-1;
|
|
||||||
lastval = i;
|
|
||||||
pmc = 0;
|
|
||||||
block_done = 1;
|
|
||||||
}
|
|
||||||
else if(half_switch == 1) {
|
|
||||||
BitStream[bitidx++] = 0;
|
|
||||||
half_switch = 0;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
half_switch++;
|
|
||||||
} else if (abs(lc-clock) < tolerance) {
|
|
||||||
// 64TO
|
|
||||||
BitStream[bitidx++] = 1;
|
|
||||||
} else {
|
|
||||||
// Error
|
|
||||||
warnings++;
|
|
||||||
if (warnings > 10)
|
|
||||||
{
|
|
||||||
Dbprintf("Error: too many detection errors, aborting.");
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if(block_done == 1) {
|
|
||||||
if(bitidx == 128) {
|
|
||||||
for(j=0; j<16; j++) {
|
|
||||||
Blocks[num_blocks][j] = 128*BitStream[j*8+7]+
|
|
||||||
64*BitStream[j*8+6]+
|
|
||||||
32*BitStream[j*8+5]+
|
|
||||||
16*BitStream[j*8+4]+
|
|
||||||
8*BitStream[j*8+3]+
|
|
||||||
4*BitStream[j*8+2]+
|
|
||||||
2*BitStream[j*8+1]+
|
|
||||||
BitStream[j*8];
|
|
||||||
}
|
|
||||||
num_blocks++;
|
|
||||||
}
|
|
||||||
bitidx = 0;
|
|
||||||
block_done = 0;
|
|
||||||
half_switch = 0;
|
|
||||||
}
|
|
||||||
if(i < GraphTraceLen)
|
|
||||||
{
|
|
||||||
if (GraphBuffer[i-1] > GraphBuffer[i]) dir=0;
|
|
||||||
else dir = 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if(bitidx==255)
|
|
||||||
bitidx=0;
|
|
||||||
warnings = 0;
|
|
||||||
if(num_blocks == 4) break;
|
|
||||||
}
|
|
||||||
memcpy(outBlocks, Blocks, 16*num_blocks);
|
|
||||||
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
|
|
||||||
|
|
||||||
return num_blocks;
|
|
||||||
}
|
|
||||||
|
|
||||||
int IsBlock0PCF7931(uint8_t *Block) {
|
|
||||||
// Assume RFU means 0 :)
|
|
||||||
if((memcmp(Block, "\x00\x00\x00\x00\x00\x00\x00\x01", 8) == 0) && memcmp(Block+9, "\x00\x00\x00\x00\x00\x00\x00", 7) == 0) // PAC enabled
|
|
||||||
return 1;
|
|
||||||
if((memcmp(Block+9, "\x00\x00\x00\x00\x00\x00\x00", 7) == 0) && Block[7] == 0) // PAC disabled, can it *really* happen ?
|
|
||||||
return 1;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
int IsBlock1PCF7931(uint8_t *Block) {
|
|
||||||
// Assume RFU means 0 :)
|
|
||||||
if(Block[10] == 0 && Block[11] == 0 && Block[12] == 0 && Block[13] == 0)
|
|
||||||
if((Block[14] & 0x7f) <= 9 && Block[15] <= 9)
|
|
||||||
return 1;
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
#define ALLOC 16
|
|
||||||
|
|
||||||
void ReadPCF7931() {
|
|
||||||
uint8_t Blocks[8][17];
|
|
||||||
uint8_t tmpBlocks[4][16];
|
|
||||||
int i, j, ind, ind2, n;
|
|
||||||
int num_blocks = 0;
|
|
||||||
int max_blocks = 8;
|
|
||||||
int ident = 0;
|
|
||||||
int error = 0;
|
|
||||||
int tries = 0;
|
|
||||||
|
|
||||||
memset(Blocks, 0, 8*17*sizeof(uint8_t));
|
|
||||||
|
|
||||||
do {
|
|
||||||
memset(tmpBlocks, 0, 4*16*sizeof(uint8_t));
|
|
||||||
n = DemodPCF7931((uint8_t**)tmpBlocks);
|
|
||||||
if(!n)
|
|
||||||
error++;
|
|
||||||
if(error==10 && num_blocks == 0) {
|
|
||||||
Dbprintf("Error, no tag or bad tag");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
else if (tries==20 || error==10) {
|
|
||||||
Dbprintf("Error reading the tag");
|
|
||||||
Dbprintf("Here is the partial content");
|
|
||||||
goto end;
|
|
||||||
}
|
|
||||||
|
|
||||||
for(i=0; i<n; i++)
|
|
||||||
Dbprintf("(dbg) %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x",
|
|
||||||
tmpBlocks[i][0], tmpBlocks[i][1], tmpBlocks[i][2], tmpBlocks[i][3], tmpBlocks[i][4], tmpBlocks[i][5], tmpBlocks[i][6], tmpBlocks[i][7],
|
|
||||||
tmpBlocks[i][8], tmpBlocks[i][9], tmpBlocks[i][10], tmpBlocks[i][11], tmpBlocks[i][12], tmpBlocks[i][13], tmpBlocks[i][14], tmpBlocks[i][15]);
|
|
||||||
if(!ident) {
|
|
||||||
for(i=0; i<n; i++) {
|
|
||||||
if(IsBlock0PCF7931(tmpBlocks[i])) {
|
|
||||||
// Found block 0 ?
|
|
||||||
if(i < n-1 && IsBlock1PCF7931(tmpBlocks[i+1])) {
|
|
||||||
// Found block 1!
|
|
||||||
// \o/
|
|
||||||
ident = 1;
|
|
||||||
memcpy(Blocks[0], tmpBlocks[i], 16);
|
|
||||||
Blocks[0][ALLOC] = 1;
|
|
||||||
memcpy(Blocks[1], tmpBlocks[i+1], 16);
|
|
||||||
Blocks[1][ALLOC] = 1;
|
|
||||||
max_blocks = max((Blocks[1][14] & 0x7f), Blocks[1][15]) + 1;
|
|
||||||
// Debug print
|
|
||||||
Dbprintf("(dbg) Max blocks: %d", max_blocks);
|
|
||||||
num_blocks = 2;
|
|
||||||
// Handle following blocks
|
|
||||||
for(j=i+2, ind2=2; j!=i; j++, ind2++, num_blocks++) {
|
|
||||||
if(j==n) j=0;
|
|
||||||
if(j==i) break;
|
|
||||||
memcpy(Blocks[ind2], tmpBlocks[j], 16);
|
|
||||||
Blocks[ind2][ALLOC] = 1;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
for(i=0; i<n; i++) { // Look for identical block in known blocks
|
|
||||||
if(memcmp(tmpBlocks[i], "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", 16)) { // Block is not full of 00
|
|
||||||
for(j=0; j<max_blocks; j++) {
|
|
||||||
if(Blocks[j][ALLOC] == 1 && !memcmp(tmpBlocks[i], Blocks[j], 16)) {
|
|
||||||
// Found an identical block
|
|
||||||
for(ind=i-1,ind2=j-1; ind >= 0; ind--,ind2--) {
|
|
||||||
if(ind2 < 0)
|
|
||||||
ind2 = max_blocks;
|
|
||||||
if(!Blocks[ind2][ALLOC]) { // Block ind2 not already found
|
|
||||||
// Dbprintf("Tmp %d -> Block %d", ind, ind2);
|
|
||||||
memcpy(Blocks[ind2], tmpBlocks[ind], 16);
|
|
||||||
Blocks[ind2][ALLOC] = 1;
|
|
||||||
num_blocks++;
|
|
||||||
if(num_blocks == max_blocks) goto end;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for(ind=i+1,ind2=j+1; ind < n; ind++,ind2++) {
|
|
||||||
if(ind2 > max_blocks)
|
|
||||||
ind2 = 0;
|
|
||||||
if(!Blocks[ind2][ALLOC]) { // Block ind2 not already found
|
|
||||||
// Dbprintf("Tmp %d -> Block %d", ind, ind2);
|
|
||||||
memcpy(Blocks[ind2], tmpBlocks[ind], 16);
|
|
||||||
Blocks[ind2][ALLOC] = 1;
|
|
||||||
num_blocks++;
|
|
||||||
if(num_blocks == max_blocks) goto end;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
tries++;
|
|
||||||
if (BUTTON_PRESS()) return;
|
|
||||||
} while (num_blocks != max_blocks);
|
|
||||||
end:
|
|
||||||
Dbprintf("-----------------------------------------");
|
|
||||||
Dbprintf("Memory content:");
|
|
||||||
Dbprintf("-----------------------------------------");
|
|
||||||
for(i=0; i<max_blocks; i++) {
|
|
||||||
if(Blocks[i][ALLOC]==1){
|
|
||||||
Dbprintf("%02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x",
|
|
||||||
Blocks[i][0], Blocks[i][1], Blocks[i][2], Blocks[i][3], Blocks[i][4], Blocks[i][5], Blocks[i][6], Blocks[i][7],
|
|
||||||
Blocks[i][8], Blocks[i][9], Blocks[i][10], Blocks[i][11], Blocks[i][12], Blocks[i][13], Blocks[i][14], Blocks[i][15]);
|
|
||||||
}else
|
|
||||||
Dbprintf("<missing block %d>", i);
|
|
||||||
}
|
|
||||||
Dbprintf("-----------------------------------------");
|
|
||||||
|
|
||||||
|
|
||||||
return ;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//-----------------------------------
|
//-----------------------------------
|
||||||
// EM4469 / EM4305 routines
|
// EM4469 / EM4305 routines
|
||||||
//-----------------------------------
|
//-----------------------------------
|
||||||
|
|
@ -2067,261 +1799,3 @@ void EM4xWriteWord(uint32_t Data, uint8_t Address, uint32_t Pwd, uint8_t PwdMode
|
||||||
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); // field off
|
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); // field off
|
||||||
LED_D_OFF();
|
LED_D_OFF();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#define T0_PCF 8 //period for the pcf7931 in us
|
|
||||||
|
|
||||||
/* Write on a byte of a PCF7931 tag
|
|
||||||
* @param address : address of the block to write
|
|
||||||
@param byte : address of the byte to write
|
|
||||||
@param data : data to write
|
|
||||||
*/
|
|
||||||
void WritePCF7931(uint8_t pass1, uint8_t pass2, uint8_t pass3, uint8_t pass4, uint8_t pass5, uint8_t pass6, uint8_t pass7, uint16_t init_delay, int32_t l, int32_t p, uint8_t address, uint8_t byte, uint8_t data)
|
|
||||||
{
|
|
||||||
|
|
||||||
uint32_t tab[1024]={0}; // data times frame
|
|
||||||
uint32_t u = 0;
|
|
||||||
uint8_t parity = 0;
|
|
||||||
bool comp = 0;
|
|
||||||
|
|
||||||
|
|
||||||
//BUILD OF THE DATA FRAME
|
|
||||||
|
|
||||||
//alimentation of the tag (time for initializing)
|
|
||||||
AddPatternPCF7931(init_delay, 0, 8192/2*T0_PCF, tab);
|
|
||||||
|
|
||||||
//PMC
|
|
||||||
Dbprintf("Initialization delay : %d us", init_delay);
|
|
||||||
AddPatternPCF7931(8192/2*T0_PCF + 319*T0_PCF+70, 3*T0_PCF, 29*T0_PCF, tab);
|
|
||||||
|
|
||||||
Dbprintf("Offsets : %d us on the low pulses width, %d us on the low pulses positions", l, p);
|
|
||||||
|
|
||||||
//password indication bit
|
|
||||||
AddBitPCF7931(1, tab, l, p);
|
|
||||||
|
|
||||||
|
|
||||||
//password (on 56 bits)
|
|
||||||
Dbprintf("Password (LSB first on each byte) : %02x %02x %02x %02x %02x %02x %02x", pass1,pass2,pass3,pass4,pass5,pass6,pass7);
|
|
||||||
AddBytePCF7931(pass1, tab, l, p);
|
|
||||||
AddBytePCF7931(pass2, tab, l, p);
|
|
||||||
AddBytePCF7931(pass3, tab, l, p);
|
|
||||||
AddBytePCF7931(pass4, tab, l, p);
|
|
||||||
AddBytePCF7931(pass5, tab, l, p);
|
|
||||||
AddBytePCF7931(pass6, tab, l, p);
|
|
||||||
AddBytePCF7931(pass7, tab, l, p);
|
|
||||||
|
|
||||||
|
|
||||||
//programming mode (0 or 1)
|
|
||||||
AddBitPCF7931(0, tab, l, p);
|
|
||||||
|
|
||||||
//block adress on 6 bits
|
|
||||||
Dbprintf("Block address : %02x", address);
|
|
||||||
for (u=0; u<6; u++)
|
|
||||||
{
|
|
||||||
if (address&(1<<u)) { // bit 1
|
|
||||||
parity++;
|
|
||||||
AddBitPCF7931(1, tab, l, p);
|
|
||||||
} else{ // bit 0
|
|
||||||
AddBitPCF7931(0, tab, l, p);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//byte address on 4 bits
|
|
||||||
Dbprintf("Byte address : %02x", byte);
|
|
||||||
for (u=0; u<4; u++)
|
|
||||||
{
|
|
||||||
if (byte&(1<<u)) { // bit 1
|
|
||||||
parity++;
|
|
||||||
AddBitPCF7931(1, tab, l, p);
|
|
||||||
} else{ // bit 0
|
|
||||||
AddBitPCF7931(0, tab, l, p);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//data on 8 bits
|
|
||||||
Dbprintf("Data : %02x", data);
|
|
||||||
for (u=0; u<8; u++)
|
|
||||||
{
|
|
||||||
if (data&(1<<u)) { // bit 1
|
|
||||||
parity++;
|
|
||||||
AddBitPCF7931(1, tab, l, p);
|
|
||||||
} else{ //bit 0
|
|
||||||
AddBitPCF7931(0, tab, l, p);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//parity bit
|
|
||||||
if((parity%2)==0){
|
|
||||||
AddBitPCF7931(0, tab, l, p); //even parity
|
|
||||||
}else{
|
|
||||||
AddBitPCF7931(1, tab, l, p);//odd parity
|
|
||||||
}
|
|
||||||
|
|
||||||
//time access memory
|
|
||||||
AddPatternPCF7931(5120+2680, 0, 0, tab);
|
|
||||||
|
|
||||||
//conversion of the scale time
|
|
||||||
for(u=0;u<500;u++){
|
|
||||||
tab[u]=(tab[u] * 3)/2;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//compennsation of the counter reload
|
|
||||||
while (!comp){
|
|
||||||
comp = 1;
|
|
||||||
for(u=0;tab[u]!=0;u++){
|
|
||||||
if(tab[u] > 0xFFFF){
|
|
||||||
tab[u] -= 0xFFFF;
|
|
||||||
comp = 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
SendCmdPCF7931(tab);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/* Send a trame to a PCF7931 tags
|
|
||||||
* @param tab : array of the data frame
|
|
||||||
*/
|
|
||||||
|
|
||||||
void SendCmdPCF7931(uint32_t * tab){
|
|
||||||
uint16_t u=0;
|
|
||||||
uint16_t tempo=0;
|
|
||||||
|
|
||||||
Dbprintf("SENDING DATA FRAME...");
|
|
||||||
|
|
||||||
FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
|
|
||||||
|
|
||||||
FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
|
|
||||||
|
|
||||||
FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_PASSTHRU );
|
|
||||||
|
|
||||||
LED_A_ON();
|
|
||||||
|
|
||||||
// steal this pin from the SSP and use it to control the modulation
|
|
||||||
AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
|
|
||||||
AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
|
|
||||||
|
|
||||||
//initialization of the timer
|
|
||||||
AT91C_BASE_PMC->PMC_PCER |= (0x1 << 12) | (0x1 << 13) | (0x1 << 14);
|
|
||||||
AT91C_BASE_TCB->TCB_BMR = AT91C_TCB_TC0XC0S_NONE | AT91C_TCB_TC1XC1S_TIOA0 | AT91C_TCB_TC2XC2S_NONE;
|
|
||||||
AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS; // timer disable
|
|
||||||
AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV3_CLOCK; //clock at 48/32 MHz
|
|
||||||
AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN;
|
|
||||||
AT91C_BASE_TCB->TCB_BCR = 1;
|
|
||||||
|
|
||||||
|
|
||||||
tempo = AT91C_BASE_TC0->TC_CV;
|
|
||||||
for(u=0;tab[u]!= 0;u+=3){
|
|
||||||
|
|
||||||
|
|
||||||
// modulate antenna
|
|
||||||
HIGH(GPIO_SSC_DOUT);
|
|
||||||
while(tempo != tab[u]){
|
|
||||||
tempo = AT91C_BASE_TC0->TC_CV;
|
|
||||||
}
|
|
||||||
|
|
||||||
// stop modulating antenna
|
|
||||||
LOW(GPIO_SSC_DOUT);
|
|
||||||
while(tempo != tab[u+1]){
|
|
||||||
tempo = AT91C_BASE_TC0->TC_CV;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// modulate antenna
|
|
||||||
HIGH(GPIO_SSC_DOUT);
|
|
||||||
while(tempo != tab[u+2]){
|
|
||||||
tempo = AT91C_BASE_TC0->TC_CV;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
LED_A_OFF();
|
|
||||||
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
|
|
||||||
SpinDelay(200);
|
|
||||||
|
|
||||||
|
|
||||||
AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS; // timer disable
|
|
||||||
DbpString("FINISH !");
|
|
||||||
DbpString("(Could be usefull to send the same trame many times)");
|
|
||||||
LED(0xFFFF, 1000);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/* Add a byte for building the data frame of PCF7931 tags
|
|
||||||
* @param b : byte to add
|
|
||||||
* @param tab : array of the data frame
|
|
||||||
* @param l : offset on low pulse width
|
|
||||||
* @param p : offset on low pulse positioning
|
|
||||||
*/
|
|
||||||
|
|
||||||
bool AddBytePCF7931(uint8_t byte, uint32_t * tab, int32_t l, int32_t p){
|
|
||||||
|
|
||||||
uint32_t u;
|
|
||||||
for (u=0; u<8; u++)
|
|
||||||
{
|
|
||||||
if (byte&(1<<u)) { //bit à 1
|
|
||||||
if(AddBitPCF7931(1, tab, l, p)==1)return 1;
|
|
||||||
} else { //bit à 0
|
|
||||||
if(AddBitPCF7931(0, tab, l, p)==1)return 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Add a bits for building the data frame of PCF7931 tags
|
|
||||||
* @param b : bit to add
|
|
||||||
* @param tab : array of the data frame
|
|
||||||
* @param l : offset on low pulse width
|
|
||||||
* @param p : offset on low pulse positioning
|
|
||||||
*/
|
|
||||||
bool AddBitPCF7931(bool b, uint32_t * tab, int32_t l, int32_t p){
|
|
||||||
uint8_t u = 0;
|
|
||||||
|
|
||||||
for(u=0;tab[u]!=0;u+=3){} //we put the cursor at the last value of the array
|
|
||||||
|
|
||||||
|
|
||||||
if(b==1){ //add a bit 1
|
|
||||||
if(u==0) tab[u] = 34*T0_PCF+p;
|
|
||||||
else tab[u] = 34*T0_PCF+tab[u-1]+p;
|
|
||||||
|
|
||||||
tab[u+1] = 6*T0_PCF+tab[u]+l;
|
|
||||||
tab[u+2] = 88*T0_PCF+tab[u+1]-l-p;
|
|
||||||
return 0;
|
|
||||||
}else{ //add a bit 0
|
|
||||||
|
|
||||||
if(u==0) tab[u] = 98*T0_PCF+p;
|
|
||||||
else tab[u] = 98*T0_PCF+tab[u-1]+p;
|
|
||||||
|
|
||||||
tab[u+1] = 6*T0_PCF+tab[u]+l;
|
|
||||||
tab[u+2] = 24*T0_PCF+tab[u+1]-l-p;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Add a custom pattern in the data frame
|
|
||||||
* @param a : delay of the first high pulse
|
|
||||||
* @param b : delay of the low pulse
|
|
||||||
* @param c : delay of the last high pulse
|
|
||||||
* @param tab : array of the data frame
|
|
||||||
*/
|
|
||||||
bool AddPatternPCF7931(uint32_t a, uint32_t b, uint32_t c, uint32_t * tab){
|
|
||||||
uint32_t u = 0;
|
|
||||||
for(u=0;tab[u]!=0;u+=3){} //we put the cursor at the last value of the array
|
|
||||||
|
|
||||||
if(u==0) tab[u] = a;
|
|
||||||
else tab[u] = a + tab[u-1];
|
|
||||||
|
|
||||||
tab[u+1] = b+tab[u];
|
|
||||||
tab[u+2] = c+tab[u+1];
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
526
armsrc/pcf7931.c
Normal file
526
armsrc/pcf7931.c
Normal file
|
|
@ -0,0 +1,526 @@
|
||||||
|
#include "proxmark3.h"
|
||||||
|
#include "apps.h"
|
||||||
|
#include "lfsampling.h"
|
||||||
|
#include "pcf7931.h"
|
||||||
|
#include "string.h"
|
||||||
|
|
||||||
|
#define T0_PCF 8 //period for the pcf7931 in us
|
||||||
|
#define ALLOC 16
|
||||||
|
|
||||||
|
#define abs(x) ( ((x)<0) ? -(x) : (x) )
|
||||||
|
#define max(x,y) ( x<y ? y:x)
|
||||||
|
|
||||||
|
int DemodPCF7931(uint8_t **outBlocks) {
|
||||||
|
|
||||||
|
uint8_t bits[256] = {0x00};
|
||||||
|
uint8_t blocks[8][16];
|
||||||
|
uint8_t *dest = BigBuf_get_addr();
|
||||||
|
|
||||||
|
int GraphTraceLen = BigBuf_max_traceLen();
|
||||||
|
if ( GraphTraceLen > 18000 )
|
||||||
|
GraphTraceLen = 18000;
|
||||||
|
|
||||||
|
|
||||||
|
int i, j, lastval, bitidx, half_switch;
|
||||||
|
int clock = 64;
|
||||||
|
int tolerance = clock / 8;
|
||||||
|
int pmc, block_done;
|
||||||
|
int lc, warnings = 0;
|
||||||
|
int num_blocks = 0;
|
||||||
|
int lmin=128, lmax=128;
|
||||||
|
uint8_t dir;
|
||||||
|
|
||||||
|
LFSetupFPGAForADC(95, true);
|
||||||
|
DoAcquisition_default(0, true);
|
||||||
|
|
||||||
|
lmin = 64;
|
||||||
|
lmax = 192;
|
||||||
|
|
||||||
|
i = 2;
|
||||||
|
|
||||||
|
/* Find first local max/min */
|
||||||
|
if(dest[1] > dest[0]) {
|
||||||
|
while(i < GraphTraceLen) {
|
||||||
|
if( !(dest[i] > dest[i-1]) && dest[i] > lmax)
|
||||||
|
break;
|
||||||
|
i++;
|
||||||
|
}
|
||||||
|
dir = 0;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
while(i < GraphTraceLen) {
|
||||||
|
if( !(dest[i] < dest[i-1]) && dest[i] < lmin)
|
||||||
|
break;
|
||||||
|
i++;
|
||||||
|
}
|
||||||
|
dir = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
lastval = i++;
|
||||||
|
half_switch = 0;
|
||||||
|
pmc = 0;
|
||||||
|
block_done = 0;
|
||||||
|
|
||||||
|
for (bitidx = 0; i < GraphTraceLen; i++)
|
||||||
|
{
|
||||||
|
if ( (dest[i-1] > dest[i] && dir == 1 && dest[i] > lmax) || (dest[i-1] < dest[i] && dir == 0 && dest[i] < lmin))
|
||||||
|
{
|
||||||
|
lc = i - lastval;
|
||||||
|
lastval = i;
|
||||||
|
|
||||||
|
// Switch depending on lc length:
|
||||||
|
// Tolerance is 1/8 of clock rate (arbitrary)
|
||||||
|
if (abs(lc-clock/4) < tolerance) {
|
||||||
|
// 16T0
|
||||||
|
if((i - pmc) == lc) { /* 16T0 was previous one */
|
||||||
|
/* It's a PMC ! */
|
||||||
|
i += (128+127+16+32+33+16)-1;
|
||||||
|
lastval = i;
|
||||||
|
pmc = 0;
|
||||||
|
block_done = 1;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
pmc = i;
|
||||||
|
}
|
||||||
|
} else if (abs(lc-clock/2) < tolerance) {
|
||||||
|
// 32TO
|
||||||
|
if((i - pmc) == lc) { /* 16T0 was previous one */
|
||||||
|
/* It's a PMC ! */
|
||||||
|
i += (128+127+16+32+33)-1;
|
||||||
|
lastval = i;
|
||||||
|
pmc = 0;
|
||||||
|
block_done = 1;
|
||||||
|
}
|
||||||
|
else if(half_switch == 1) {
|
||||||
|
bits[bitidx++] = 0;
|
||||||
|
half_switch = 0;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
half_switch++;
|
||||||
|
} else if (abs(lc-clock) < tolerance) {
|
||||||
|
// 64TO
|
||||||
|
bits[bitidx++] = 1;
|
||||||
|
} else {
|
||||||
|
// Error
|
||||||
|
warnings++;
|
||||||
|
if (warnings > 10)
|
||||||
|
{
|
||||||
|
Dbprintf("Error: too many detection errors, aborting.");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(block_done == 1) {
|
||||||
|
if(bitidx == 128) {
|
||||||
|
for(j=0; j<16; j++) {
|
||||||
|
blocks[num_blocks][j] = 128*bits[j*8+7]+
|
||||||
|
64*bits[j*8+6]+
|
||||||
|
32*bits[j*8+5]+
|
||||||
|
16*bits[j*8+4]+
|
||||||
|
8*bits[j*8+3]+
|
||||||
|
4*bits[j*8+2]+
|
||||||
|
2*bits[j*8+1]+
|
||||||
|
bits[j*8];
|
||||||
|
|
||||||
|
}
|
||||||
|
num_blocks++;
|
||||||
|
}
|
||||||
|
bitidx = 0;
|
||||||
|
block_done = 0;
|
||||||
|
half_switch = 0;
|
||||||
|
}
|
||||||
|
if(i < GraphTraceLen)
|
||||||
|
dir =(dest[i-1] > dest[i]) ? 0 : 1;
|
||||||
|
}
|
||||||
|
if(bitidx==255)
|
||||||
|
bitidx=0;
|
||||||
|
warnings = 0;
|
||||||
|
if(num_blocks == 4) break;
|
||||||
|
}
|
||||||
|
memcpy(outBlocks, blocks, 16*num_blocks);
|
||||||
|
return num_blocks;
|
||||||
|
}
|
||||||
|
|
||||||
|
int IsBlock0PCF7931(uint8_t *Block) {
|
||||||
|
// Assume RFU means 0 :)
|
||||||
|
if((memcmp(Block, "\x00\x00\x00\x00\x00\x00\x00\x01", 8) == 0) && memcmp(Block+9, "\x00\x00\x00\x00\x00\x00\x00", 7) == 0) // PAC enabled
|
||||||
|
return 1;
|
||||||
|
if((memcmp(Block+9, "\x00\x00\x00\x00\x00\x00\x00", 7) == 0) && Block[7] == 0) // PAC disabled, can it *really* happen ?
|
||||||
|
return 1;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int IsBlock1PCF7931(uint8_t *Block) {
|
||||||
|
// Assume RFU means 0 :)
|
||||||
|
if(Block[10] == 0 && Block[11] == 0 && Block[12] == 0 && Block[13] == 0)
|
||||||
|
if((Block[14] & 0x7f) <= 9 && Block[15] <= 9)
|
||||||
|
return 1;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
void ReadPCF7931() {
|
||||||
|
uint8_t Blocks[8][17];
|
||||||
|
uint8_t tmpBlocks[4][16];
|
||||||
|
int i, j, ind, ind2, n;
|
||||||
|
int num_blocks = 0;
|
||||||
|
int max_blocks = 8;
|
||||||
|
int ident = 0;
|
||||||
|
int error = 0;
|
||||||
|
int tries = 0;
|
||||||
|
|
||||||
|
memset(Blocks, 0, 8*17*sizeof(uint8_t));
|
||||||
|
|
||||||
|
do {
|
||||||
|
memset(tmpBlocks, 0, 4*16*sizeof(uint8_t));
|
||||||
|
n = DemodPCF7931((uint8_t**)tmpBlocks);
|
||||||
|
if(!n)
|
||||||
|
error++;
|
||||||
|
if(error==10 && num_blocks == 0) {
|
||||||
|
Dbprintf("Error, no tag or bad tag");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
else if (tries==20 || error==10) {
|
||||||
|
Dbprintf("Error reading the tag");
|
||||||
|
Dbprintf("Here is the partial content");
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
|
|
||||||
|
for(i=0; i<n; i++)
|
||||||
|
Dbprintf("(dbg) %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x",
|
||||||
|
tmpBlocks[i][0], tmpBlocks[i][1], tmpBlocks[i][2], tmpBlocks[i][3], tmpBlocks[i][4], tmpBlocks[i][5], tmpBlocks[i][6], tmpBlocks[i][7],
|
||||||
|
tmpBlocks[i][8], tmpBlocks[i][9], tmpBlocks[i][10], tmpBlocks[i][11], tmpBlocks[i][12], tmpBlocks[i][13], tmpBlocks[i][14], tmpBlocks[i][15]);
|
||||||
|
if(!ident) {
|
||||||
|
for(i=0; i<n; i++) {
|
||||||
|
if(IsBlock0PCF7931(tmpBlocks[i])) {
|
||||||
|
// Found block 0 ?
|
||||||
|
if(i < n-1 && IsBlock1PCF7931(tmpBlocks[i+1])) {
|
||||||
|
// Found block 1!
|
||||||
|
// \o/
|
||||||
|
ident = 1;
|
||||||
|
memcpy(Blocks[0], tmpBlocks[i], 16);
|
||||||
|
Blocks[0][ALLOC] = 1;
|
||||||
|
memcpy(Blocks[1], tmpBlocks[i+1], 16);
|
||||||
|
Blocks[1][ALLOC] = 1;
|
||||||
|
max_blocks = max((Blocks[1][14] & 0x7f), Blocks[1][15]) + 1;
|
||||||
|
// Debug print
|
||||||
|
Dbprintf("(dbg) Max blocks: %d", max_blocks);
|
||||||
|
num_blocks = 2;
|
||||||
|
// Handle following blocks
|
||||||
|
for(j=i+2, ind2=2; j!=i; j++, ind2++, num_blocks++) {
|
||||||
|
if(j==n) j=0;
|
||||||
|
if(j==i) break;
|
||||||
|
memcpy(Blocks[ind2], tmpBlocks[j], 16);
|
||||||
|
Blocks[ind2][ALLOC] = 1;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
for(i=0; i<n; i++) { // Look for identical block in known blocks
|
||||||
|
if(memcmp(tmpBlocks[i], "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", 16)) { // Block is not full of 00
|
||||||
|
for(j=0; j<max_blocks; j++) {
|
||||||
|
if(Blocks[j][ALLOC] == 1 && !memcmp(tmpBlocks[i], Blocks[j], 16)) {
|
||||||
|
// Found an identical block
|
||||||
|
for(ind=i-1,ind2=j-1; ind >= 0; ind--,ind2--) {
|
||||||
|
if(ind2 < 0)
|
||||||
|
ind2 = max_blocks;
|
||||||
|
if(!Blocks[ind2][ALLOC]) { // Block ind2 not already found
|
||||||
|
// Dbprintf("Tmp %d -> Block %d", ind, ind2);
|
||||||
|
memcpy(Blocks[ind2], tmpBlocks[ind], 16);
|
||||||
|
Blocks[ind2][ALLOC] = 1;
|
||||||
|
num_blocks++;
|
||||||
|
if(num_blocks == max_blocks) goto end;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for(ind=i+1,ind2=j+1; ind < n; ind++,ind2++) {
|
||||||
|
if(ind2 > max_blocks)
|
||||||
|
ind2 = 0;
|
||||||
|
if(!Blocks[ind2][ALLOC]) { // Block ind2 not already found
|
||||||
|
// Dbprintf("Tmp %d -> Block %d", ind, ind2);
|
||||||
|
memcpy(Blocks[ind2], tmpBlocks[ind], 16);
|
||||||
|
Blocks[ind2][ALLOC] = 1;
|
||||||
|
num_blocks++;
|
||||||
|
if(num_blocks == max_blocks) goto end;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
tries++;
|
||||||
|
if (BUTTON_PRESS()) return;
|
||||||
|
} while (num_blocks != max_blocks);
|
||||||
|
end:
|
||||||
|
Dbprintf("-----------------------------------------");
|
||||||
|
Dbprintf("Memory content:");
|
||||||
|
Dbprintf("-----------------------------------------");
|
||||||
|
for(i=0; i<max_blocks; i++) {
|
||||||
|
if(Blocks[i][ALLOC]==1)
|
||||||
|
Dbprintf("%02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x",
|
||||||
|
Blocks[i][0], Blocks[i][1], Blocks[i][2], Blocks[i][3], Blocks[i][4], Blocks[i][5], Blocks[i][6], Blocks[i][7],
|
||||||
|
Blocks[i][8], Blocks[i][9], Blocks[i][10], Blocks[i][11], Blocks[i][12], Blocks[i][13], Blocks[i][14], Blocks[i][15]);
|
||||||
|
else
|
||||||
|
Dbprintf("<missing block %d>", i);
|
||||||
|
}
|
||||||
|
Dbprintf("-----------------------------------------");
|
||||||
|
|
||||||
|
return ;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/* Write on a byte of a PCF7931 tag
|
||||||
|
* @param address : address of the block to write
|
||||||
|
@param byte : address of the byte to write
|
||||||
|
@param data : data to write
|
||||||
|
*/
|
||||||
|
void WritePCF7931(uint8_t pass1, uint8_t pass2, uint8_t pass3, uint8_t pass4, uint8_t pass5, uint8_t pass6, uint8_t pass7, uint16_t init_delay, int32_t l, int32_t p, uint8_t address, uint8_t byte, uint8_t data)
|
||||||
|
{
|
||||||
|
|
||||||
|
uint32_t tab[1024]={0}; // data times frame
|
||||||
|
uint32_t u = 0;
|
||||||
|
uint8_t parity = 0;
|
||||||
|
bool comp = 0;
|
||||||
|
|
||||||
|
//BUILD OF THE DATA FRAME
|
||||||
|
|
||||||
|
//alimentation of the tag (time for initializing)
|
||||||
|
AddPatternPCF7931(init_delay, 0, 8192/2*T0_PCF, tab);
|
||||||
|
|
||||||
|
//PMC
|
||||||
|
Dbprintf("Initialization delay : %d us", init_delay);
|
||||||
|
AddPatternPCF7931(8192/2*T0_PCF + 319*T0_PCF+70, 3*T0_PCF, 29*T0_PCF, tab);
|
||||||
|
|
||||||
|
Dbprintf("Offsets : %d us on the low pulses width, %d us on the low pulses positions", l, p);
|
||||||
|
|
||||||
|
//password indication bit
|
||||||
|
AddBitPCF7931(1, tab, l, p);
|
||||||
|
|
||||||
|
|
||||||
|
//password (on 56 bits)
|
||||||
|
Dbprintf("Password (LSB first on each byte) : %02x %02x %02x %02x %02x %02x %02x", pass1,pass2,pass3,pass4,pass5,pass6,pass7);
|
||||||
|
AddBytePCF7931(pass1, tab, l, p);
|
||||||
|
AddBytePCF7931(pass2, tab, l, p);
|
||||||
|
AddBytePCF7931(pass3, tab, l, p);
|
||||||
|
AddBytePCF7931(pass4, tab, l, p);
|
||||||
|
AddBytePCF7931(pass5, tab, l, p);
|
||||||
|
AddBytePCF7931(pass6, tab, l, p);
|
||||||
|
AddBytePCF7931(pass7, tab, l, p);
|
||||||
|
|
||||||
|
//programming mode (0 or 1)
|
||||||
|
AddBitPCF7931(0, tab, l, p);
|
||||||
|
|
||||||
|
//block adress on 6 bits
|
||||||
|
Dbprintf("Block address : %02x", address);
|
||||||
|
for (u=0; u<6; u++)
|
||||||
|
{
|
||||||
|
if (address&(1<<u)) { // bit 1
|
||||||
|
parity++;
|
||||||
|
AddBitPCF7931(1, tab, l, p);
|
||||||
|
} else{ // bit 0
|
||||||
|
AddBitPCF7931(0, tab, l, p);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//byte address on 4 bits
|
||||||
|
Dbprintf("Byte address : %02x", byte);
|
||||||
|
for (u=0; u<4; u++)
|
||||||
|
{
|
||||||
|
if (byte&(1<<u)) { // bit 1
|
||||||
|
parity++;
|
||||||
|
AddBitPCF7931(1, tab, l, p);
|
||||||
|
} else{ // bit 0
|
||||||
|
AddBitPCF7931(0, tab, l, p);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//data on 8 bits
|
||||||
|
Dbprintf("Data : %02x", data);
|
||||||
|
for (u=0; u<8; u++)
|
||||||
|
{
|
||||||
|
if (data&(1<<u)) { // bit 1
|
||||||
|
parity++;
|
||||||
|
AddBitPCF7931(1, tab, l, p);
|
||||||
|
} else{ //bit 0
|
||||||
|
AddBitPCF7931(0, tab, l, p);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
//parity bit
|
||||||
|
if((parity%2)==0){
|
||||||
|
AddBitPCF7931(0, tab, l, p); //even parity
|
||||||
|
}else{
|
||||||
|
AddBitPCF7931(1, tab, l, p);//odd parity
|
||||||
|
}
|
||||||
|
|
||||||
|
//time access memory
|
||||||
|
AddPatternPCF7931(5120+2680, 0, 0, tab);
|
||||||
|
|
||||||
|
//conversion of the scale time
|
||||||
|
for(u=0;u<500;u++){
|
||||||
|
tab[u]=(tab[u] * 3)/2;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
//compennsation of the counter reload
|
||||||
|
while (!comp){
|
||||||
|
comp = 1;
|
||||||
|
for(u=0;tab[u]!=0;u++){
|
||||||
|
if(tab[u] > 0xFFFF){
|
||||||
|
tab[u] -= 0xFFFF;
|
||||||
|
comp = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
SendCmdPCF7931(tab);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/* Send a trame to a PCF7931 tags
|
||||||
|
* @param tab : array of the data frame
|
||||||
|
*/
|
||||||
|
|
||||||
|
void SendCmdPCF7931(uint32_t * tab){
|
||||||
|
uint16_t u=0;
|
||||||
|
uint16_t tempo=0;
|
||||||
|
|
||||||
|
Dbprintf("SENDING DATA FRAME...");
|
||||||
|
|
||||||
|
FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
|
||||||
|
|
||||||
|
FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
|
||||||
|
|
||||||
|
FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_PASSTHRU );
|
||||||
|
|
||||||
|
LED_A_ON();
|
||||||
|
|
||||||
|
// steal this pin from the SSP and use it to control the modulation
|
||||||
|
AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DOUT;
|
||||||
|
AT91C_BASE_PIOA->PIO_OER = GPIO_SSC_DOUT;
|
||||||
|
|
||||||
|
//initialization of the timer
|
||||||
|
AT91C_BASE_PMC->PMC_PCER |= (0x1 << 12) | (0x1 << 13) | (0x1 << 14);
|
||||||
|
AT91C_BASE_TCB->TCB_BMR = AT91C_TCB_TC0XC0S_NONE | AT91C_TCB_TC1XC1S_TIOA0 | AT91C_TCB_TC2XC2S_NONE;
|
||||||
|
AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS; // timer disable
|
||||||
|
AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV3_CLOCK; //clock at 48/32 MHz
|
||||||
|
AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN;
|
||||||
|
AT91C_BASE_TCB->TCB_BCR = 1;
|
||||||
|
|
||||||
|
|
||||||
|
tempo = AT91C_BASE_TC0->TC_CV;
|
||||||
|
for(u=0;tab[u]!= 0;u+=3){
|
||||||
|
|
||||||
|
|
||||||
|
// modulate antenna
|
||||||
|
HIGH(GPIO_SSC_DOUT);
|
||||||
|
while(tempo != tab[u]){
|
||||||
|
tempo = AT91C_BASE_TC0->TC_CV;
|
||||||
|
}
|
||||||
|
|
||||||
|
// stop modulating antenna
|
||||||
|
LOW(GPIO_SSC_DOUT);
|
||||||
|
while(tempo != tab[u+1]){
|
||||||
|
tempo = AT91C_BASE_TC0->TC_CV;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// modulate antenna
|
||||||
|
HIGH(GPIO_SSC_DOUT);
|
||||||
|
while(tempo != tab[u+2]){
|
||||||
|
tempo = AT91C_BASE_TC0->TC_CV;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
LED_A_OFF();
|
||||||
|
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
|
||||||
|
SpinDelay(200);
|
||||||
|
|
||||||
|
|
||||||
|
AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS; // timer disable
|
||||||
|
DbpString("FINISH !");
|
||||||
|
DbpString("(Could be usefull to send the same trame many times)");
|
||||||
|
LED(0xFFFF, 1000);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/* Add a byte for building the data frame of PCF7931 tags
|
||||||
|
* @param b : byte to add
|
||||||
|
* @param tab : array of the data frame
|
||||||
|
* @param l : offset on low pulse width
|
||||||
|
* @param p : offset on low pulse positioning
|
||||||
|
*/
|
||||||
|
|
||||||
|
bool AddBytePCF7931(uint8_t byte, uint32_t * tab, int32_t l, int32_t p){
|
||||||
|
|
||||||
|
uint32_t u;
|
||||||
|
for (u=0; u<8; u++)
|
||||||
|
{
|
||||||
|
if (byte&(1<<u)) { //bit à 1
|
||||||
|
if(AddBitPCF7931(1, tab, l, p)==1)return 1;
|
||||||
|
} else { //bit à 0
|
||||||
|
if(AddBitPCF7931(0, tab, l, p)==1)return 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Add a bits for building the data frame of PCF7931 tags
|
||||||
|
* @param b : bit to add
|
||||||
|
* @param tab : array of the data frame
|
||||||
|
* @param l : offset on low pulse width
|
||||||
|
* @param p : offset on low pulse positioning
|
||||||
|
*/
|
||||||
|
bool AddBitPCF7931(bool b, uint32_t * tab, int32_t l, int32_t p){
|
||||||
|
uint8_t u = 0;
|
||||||
|
|
||||||
|
for(u=0;tab[u]!=0;u+=3){} //we put the cursor at the last value of the array
|
||||||
|
|
||||||
|
|
||||||
|
if(b==1){ //add a bit 1
|
||||||
|
if(u==0) tab[u] = 34*T0_PCF+p;
|
||||||
|
else tab[u] = 34*T0_PCF+tab[u-1]+p;
|
||||||
|
|
||||||
|
tab[u+1] = 6*T0_PCF+tab[u]+l;
|
||||||
|
tab[u+2] = 88*T0_PCF+tab[u+1]-l-p;
|
||||||
|
return 0;
|
||||||
|
}else{ //add a bit 0
|
||||||
|
|
||||||
|
if(u==0) tab[u] = 98*T0_PCF+p;
|
||||||
|
else tab[u] = 98*T0_PCF+tab[u-1]+p;
|
||||||
|
|
||||||
|
tab[u+1] = 6*T0_PCF+tab[u]+l;
|
||||||
|
tab[u+2] = 24*T0_PCF+tab[u+1]-l-p;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Add a custom pattern in the data frame
|
||||||
|
* @param a : delay of the first high pulse
|
||||||
|
* @param b : delay of the low pulse
|
||||||
|
* @param c : delay of the last high pulse
|
||||||
|
* @param tab : array of the data frame
|
||||||
|
*/
|
||||||
|
bool AddPatternPCF7931(uint32_t a, uint32_t b, uint32_t c, uint32_t * tab){
|
||||||
|
uint32_t u = 0;
|
||||||
|
for(u=0;tab[u]!=0;u+=3){} //we put the cursor at the last value of the array
|
||||||
|
|
||||||
|
if(u==0) tab[u] = a;
|
||||||
|
else tab[u] = a + tab[u-1];
|
||||||
|
|
||||||
|
tab[u+1] = b+tab[u];
|
||||||
|
tab[u+2] = c+tab[u+1];
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
14
armsrc/pcf7931.h
Normal file
14
armsrc/pcf7931.h
Normal file
|
|
@ -0,0 +1,14 @@
|
||||||
|
#ifndef __PCF7931_H
|
||||||
|
#define __PCF7931_H
|
||||||
|
|
||||||
|
int DemodPCF7931(uint8_t **outBlocks);
|
||||||
|
int IsBlock0PCF7931(uint8_t *Block);
|
||||||
|
int IsBlock1PCF7931(uint8_t *Block);
|
||||||
|
void ReadPCF7931();
|
||||||
|
void SendCmdPCF7931(uint32_t * tab);
|
||||||
|
bool AddBytePCF7931(uint8_t byte, uint32_t * tab, int32_t l, int32_t p);
|
||||||
|
bool AddBitPCF7931(bool b, uint32_t * tab, int32_t l, int32_t p);
|
||||||
|
bool AddPatternPCF7931(uint32_t a, uint32_t b, uint32_t c, uint32_t * tab);
|
||||||
|
void WritePCF7931(uint8_t pass1, uint8_t pass2, uint8_t pass3, uint8_t pass4, uint8_t pass5, uint8_t pass6, uint8_t pass7, uint16_t init_delay, int32_t l, int32_t p, uint8_t address, uint8_t byte, uint8_t data);
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
@ -8,11 +8,11 @@
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
// Low frequency PCF7931 commands
|
// Low frequency PCF7931 commands
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include "proxmark3.h"
|
#include "proxmark3.h"
|
||||||
#include "ui.h"
|
#include "ui.h"
|
||||||
|
#include "util.h"
|
||||||
#include "graph.h"
|
#include "graph.h"
|
||||||
#include "cmdparser.h"
|
#include "cmdparser.h"
|
||||||
#include "cmddata.h"
|
#include "cmddata.h"
|
||||||
|
|
@ -22,103 +22,146 @@
|
||||||
|
|
||||||
static int CmdHelp(const char *Cmd);
|
static int CmdHelp(const char *Cmd);
|
||||||
|
|
||||||
struct pcf7931_config configPcf = {{0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF},17500,{0,0}};
|
#define PCF7931_DEFAULT_INITDELAY 17500
|
||||||
|
#define PCF7931_DEFAULT_OFFSET_WIDTH 0
|
||||||
|
#define PCF7931_DEFAULT_OFFSET_POSITION 0
|
||||||
|
|
||||||
|
// Default values - Configuration
|
||||||
|
struct pcf7931_config configPcf = {
|
||||||
|
{0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF},
|
||||||
|
PCF7931_DEFAULT_INITDELAY,
|
||||||
|
PCF7931_DEFAULT_OFFSET_WIDTH,
|
||||||
|
PCF7931_DEFAULT_OFFSET_POSITION
|
||||||
|
};
|
||||||
|
|
||||||
|
// Resets the configuration settings to default values.
|
||||||
|
int pcf7931_resetConfig(){
|
||||||
|
memset(configPcf.Pwd, 0xFF, sizeof(configPcf.Pwd) );
|
||||||
|
configPcf.InitDelay = PCF7931_DEFAULT_INITDELAY;
|
||||||
|
configPcf.OffsetWidth = PCF7931_DEFAULT_OFFSET_WIDTH;
|
||||||
|
configPcf.OffsetPosition = PCF7931_DEFAULT_OFFSET_POSITION;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int pcf7931_printConfig(){
|
||||||
|
PrintAndLog("Password (LSB first on bytes) : %s", sprint_hex( configPcf.Pwd, sizeof(configPcf.Pwd)));
|
||||||
|
PrintAndLog("Tag initialization delay : %d us", configPcf.InitDelay);
|
||||||
|
PrintAndLog("Offset low pulses width : %d us", configPcf.OffsetWidth);
|
||||||
|
PrintAndLog("Offset low pulses position : %d us", configPcf.OffsetPosition);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int usage_pcf7931_read(){
|
||||||
|
PrintAndLog("Usage: lf pcf7931 read [h] ");
|
||||||
|
PrintAndLog("This command tries to read a PCF7931 tag.");
|
||||||
|
PrintAndLog("Options:");
|
||||||
|
PrintAndLog(" h This help");
|
||||||
|
PrintAndLog("Examples:");
|
||||||
|
PrintAndLog(" lf pcf7931 read");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int usage_pcf7931_write(){
|
||||||
|
PrintAndLog("Usage: lf pcf7931 write [h] <block address> <byte address> <data>");
|
||||||
|
PrintAndLog("This command tries to write a PCF7931 tag.");
|
||||||
|
PrintAndLog("Options:");
|
||||||
|
PrintAndLog(" h This help");
|
||||||
|
PrintAndLog(" blockaddress Block to save [0-7]");
|
||||||
|
PrintAndLog(" byteaddress Index of byte inside block to write [0-3]");
|
||||||
|
PrintAndLog(" data one byte of data (hex)");
|
||||||
|
PrintAndLog("Examples:");
|
||||||
|
PrintAndLog(" lf pcf7931 write 2 1 FF");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int usage_pcf7931_config(){
|
||||||
|
PrintAndLog("Usage: lf pcf7931 config [h] [r] <pwd> <delay> <offset width> <offset position>");
|
||||||
|
PrintAndLog("This command tries to set the configuration used with PCF7931 commands");
|
||||||
|
PrintAndLog("The time offsets could be useful to correct slew rate generated by the antenna");
|
||||||
|
PrintAndLog("Caling without some parameter will print the current configuration.");
|
||||||
|
PrintAndLog("Options:");
|
||||||
|
PrintAndLog(" h This help");
|
||||||
|
PrintAndLog(" r Reset configuration to default values");
|
||||||
|
PrintAndLog(" pwd Password, hex, 7bytes, LSB-order");
|
||||||
|
PrintAndLog(" delay Tag initialization delay (in us) decimal");
|
||||||
|
PrintAndLog(" offset Low pulses width (in us) decimal");
|
||||||
|
PrintAndLog(" offset Low pulses position (in us) decimal");
|
||||||
|
PrintAndLog("Examples:");
|
||||||
|
PrintAndLog(" lf pcf7931 config");
|
||||||
|
PrintAndLog(" lf pcf7931 config r");
|
||||||
|
PrintAndLog(" lf pcf7931 config 11223344556677 20000");
|
||||||
|
PrintAndLog(" lf pcf7931 config 11223344556677 17500 -10 30");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int CmdLFPCF7931Read(const char *Cmd){
|
||||||
|
|
||||||
|
uint8_t ctmp = param_getchar(Cmd, 0);
|
||||||
|
if ( ctmp == 'H' || ctmp == 'h' ) return usage_pcf7931_read();
|
||||||
|
|
||||||
int CmdLFPCF7931Read(const char *Cmd)
|
|
||||||
{
|
|
||||||
UsbCommand c = {CMD_PCF7931_READ};
|
|
||||||
SendCommand(&c);
|
|
||||||
UsbCommand resp;
|
UsbCommand resp;
|
||||||
WaitForResponse(CMD_ACK,&resp);
|
UsbCommand c = {CMD_PCF7931_READ, {0, 0, 0}};
|
||||||
return 0;
|
clearCommandBuffer();
|
||||||
}
|
|
||||||
|
|
||||||
int CmdLFPCF7931Config(const char *Cmd)
|
|
||||||
{
|
|
||||||
int res = 0;
|
|
||||||
res = sscanf(Cmd, "%02x %02x %02x %02x %02x %02x %02x %d %d %d", &configPcf.password[0], &configPcf.password[1], &configPcf.password[2], &configPcf.password[3], &configPcf.password[4], &configPcf.password[5], &configPcf.password[6], &configPcf.init_delay, &configPcf.offset[0], &configPcf.offset[1]);
|
|
||||||
|
|
||||||
if (res >= 7 || res < 1){
|
|
||||||
if(res == 7) configPcf.init_delay = 17500; //default value
|
|
||||||
|
|
||||||
if(res<=8){
|
|
||||||
configPcf.offset[0] = 0; //default value
|
|
||||||
configPcf.offset[1] = 0; //default value
|
|
||||||
}
|
|
||||||
|
|
||||||
if(res < 1){
|
|
||||||
PrintAndLog("Usage: <password byte 1 (in hex, lsb first)> <password byte 2 (in hex, lsb first)> [...] <password byte 7 (in hex, lsb first)> <tag initialization delay (in us)> <optional : offset on the low pulses width (in us)> <optional : offset on the low pulses position (in us)>");
|
|
||||||
PrintAndLog("The time offsets could be usefull to correct slew rate generated by the antenna.");
|
|
||||||
}
|
|
||||||
|
|
||||||
PrintAndLog("Current configuration :");
|
|
||||||
PrintAndLog("Password (LSB first on each byte) : %02x %02x %02x %02x %02x %02x %02x", configPcf.password[0], configPcf.password[1], configPcf.password[2], configPcf.password[3], configPcf.password[4], configPcf.password[5], configPcf.password[6]);
|
|
||||||
PrintAndLog("Tag initialization delay : %d us", configPcf.init_delay);
|
|
||||||
PrintAndLog("Offsets : %d us on the low pulses width, %d us on the low pulses positions", configPcf.offset[0], configPcf.offset[1]);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
//default values
|
|
||||||
configPcf.password[0] = 0xFF;
|
|
||||||
configPcf.password[1] = 0xFF;
|
|
||||||
configPcf.password[2] = 0xFF;
|
|
||||||
configPcf.password[3] = 0xFF;
|
|
||||||
configPcf.password[4] = 0xFF;
|
|
||||||
configPcf.password[5] = 0xFF;
|
|
||||||
configPcf.password[6] = 0xFF;
|
|
||||||
|
|
||||||
configPcf.init_delay = 17500;
|
|
||||||
configPcf.offset[0] = 0;
|
|
||||||
configPcf.offset[1] = 0;
|
|
||||||
|
|
||||||
PrintAndLog("Incorrect format");
|
|
||||||
PrintAndLog("Examples of right usage : lf pcf7931 config 11 22 33 44 55 66 77 20000");
|
|
||||||
PrintAndLog(" lf pcf7931 config FF FF FF FF FF FF FF 17500 -10 30");
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
int CmdLFPCF7931Write(const char *Cmd)
|
|
||||||
{
|
|
||||||
UsbCommand c = {CMD_PCF7931_WRITE};
|
|
||||||
|
|
||||||
int res = 0;
|
|
||||||
res = sscanf(Cmd, "%x %x %x", &c.arg[0], &c.arg[1], &c.arg[2]);
|
|
||||||
|
|
||||||
if(res < 1) {
|
|
||||||
PrintAndLog("Please specify the block address in hex");
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
if (res == 1){
|
|
||||||
PrintAndLog("Please specify the byte address in hex");
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
if(res == 2) {
|
|
||||||
PrintAndLog("Please specify the data in hex (1 byte)");
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
if(res == 3) {
|
|
||||||
uint8_t n=0;
|
|
||||||
for(n=0;n<7;n++) c.d.asDwords[n] = configPcf.password[n];
|
|
||||||
c.d.asDwords[7] = (configPcf.offset[0]+128);
|
|
||||||
c.d.asDwords[8] = (configPcf.offset[1]+128);
|
|
||||||
c.d.asDwords[9] = configPcf.init_delay;
|
|
||||||
SendCommand(&c);
|
SendCommand(&c);
|
||||||
return 0;
|
if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2500) ) {
|
||||||
|
PrintAndLog("command execution time out");
|
||||||
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
PrintAndLog("INCORRECT FORMAT");
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int CmdLFPCF7931Config(const char *Cmd){
|
||||||
|
|
||||||
|
uint8_t ctmp = param_getchar(Cmd, 0);
|
||||||
|
if ( ctmp == 0) return pcf7931_printConfig();
|
||||||
|
if ( ctmp == 'H' || ctmp == 'h' ) return usage_pcf7931_config();
|
||||||
|
if ( ctmp == 'R' || ctmp == 'r' ) return pcf7931_resetConfig();
|
||||||
|
|
||||||
|
if ( param_gethex(Cmd, 0, configPcf.Pwd, 14) ) return usage_pcf7931_config();
|
||||||
|
|
||||||
|
configPcf.InitDelay = (param_get32ex(Cmd,1,0,10) & 0xFFFF);
|
||||||
|
configPcf.OffsetWidth = (int)(param_get32ex(Cmd,2,0,10) & 0xFFFF);
|
||||||
|
configPcf.OffsetPosition = (int)(param_get32ex(Cmd,3,0,10) & 0xFFFF);
|
||||||
|
|
||||||
|
pcf7931_printConfig();
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int CmdLFPCF7931Write(const char *Cmd){
|
||||||
|
|
||||||
|
uint8_t ctmp = param_getchar(Cmd, 0);
|
||||||
|
if (strlen(Cmd) < 1 || ctmp == 'h' || ctmp == 'H') return usage_pcf7931_write();
|
||||||
|
|
||||||
|
uint8_t block = 0, bytepos = 0, data = 0;
|
||||||
|
|
||||||
|
if ( param_getdec(Cmd, 0, &block) ) return usage_pcf7931_write();
|
||||||
|
if ( param_getdec(Cmd, 1, &bytepos) ) return usage_pcf7931_write();
|
||||||
|
|
||||||
|
if ( (block > 7) || (bytepos > 3) ) return usage_pcf7931_write();
|
||||||
|
|
||||||
|
data = param_get8ex(Cmd, 2, 0, 16);
|
||||||
|
|
||||||
|
PrintAndLog("Writing block: %d", block);
|
||||||
|
PrintAndLog(" pos: %d", bytepos);
|
||||||
|
PrintAndLog(" data: 0x%02X", data);
|
||||||
|
|
||||||
|
UsbCommand c = {CMD_PCF7931_WRITE, { block, bytepos, data} };
|
||||||
|
memcpy(c.d.asDwords, configPcf.Pwd, sizeof(configPcf.Pwd) );
|
||||||
|
c.d.asDwords[7] = (configPcf.OffsetWidth + 128);
|
||||||
|
c.d.asDwords[8] = (configPcf.OffsetPosition + 128);
|
||||||
|
c.d.asDwords[9] = configPcf.InitDelay;
|
||||||
|
|
||||||
|
clearCommandBuffer();
|
||||||
|
SendCommand(&c);
|
||||||
|
//no ack?
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
static command_t CommandTable[] =
|
static command_t CommandTable[] =
|
||||||
{
|
{
|
||||||
{"help", CmdHelp, 1, "This help"},
|
{"help", CmdHelp, 1, "This help"},
|
||||||
{"read", CmdLFPCF7931Read, 1, "Read content of a PCF7931 transponder"},
|
{"read", CmdLFPCF7931Read, 0, "Read content of a PCF7931 transponder"},
|
||||||
{"write", CmdLFPCF7931Write, 1, "Write data on a PCF7931 transponder. Usage : lf pcf7931 write <bloc address> <byte address> <data>"},
|
{"write", CmdLFPCF7931Write, 0, "Write data on a PCF7931 transponder."},
|
||||||
{"config", CmdLFPCF7931Config, 1, "Configure the password, the tags initialization delay and time offsets (optional)"},
|
{"config", CmdLFPCF7931Config, 1, "Configure the password, the tags initialization delay and time offsets (optional)"},
|
||||||
{NULL, NULL, 0, NULL}
|
{NULL, NULL, 0, NULL}
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -13,17 +13,23 @@
|
||||||
#define CMDLFPCF7931_H__
|
#define CMDLFPCF7931_H__
|
||||||
|
|
||||||
struct pcf7931_config{
|
struct pcf7931_config{
|
||||||
uint8_t password[7];
|
uint8_t Pwd[7];
|
||||||
uint16_t init_delay;
|
uint16_t InitDelay;
|
||||||
int16_t offset[2];
|
int16_t OffsetWidth;
|
||||||
|
int16_t OffsetPosition;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
int pcf7931_resetConfig();
|
||||||
|
int pcf7931_printConfig();
|
||||||
|
|
||||||
|
int usage_pcf7931_read();
|
||||||
|
int usage_pcf7931_write();
|
||||||
|
int usage_pcf7931_config();
|
||||||
|
|
||||||
int CmdLFPCF7931(const char *Cmd);
|
int CmdLFPCF7931(const char *Cmd);
|
||||||
|
|
||||||
int CmdLFPCF7931Read(const char *Cmd);
|
int CmdLFPCF7931Read(const char *Cmd);
|
||||||
|
|
||||||
int CmdLFPCF7931Write(const char *Cmd);
|
int CmdLFPCF7931Write(const char *Cmd);
|
||||||
|
|
||||||
int CmdLFPCF7931Config(const char *Cmd);
|
int CmdLFPCF7931Config(const char *Cmd);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue