mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2025-08-21 13:53:55 -07:00
FIX: I did a clean up of the "LF PCF7931" code. The write command is not quite done.
FIX: Added some more "clearCommandBuffer" calls before sending..
This commit is contained in:
iceman1001
parent
5ee53a0e75
commit
2285d9dd94
5 changed files with 151 additions and 146 deletions
|
|
@ -21,132 +21,146 @@
|
|||
|
||||
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
|
||||
|
||||
int usage_pcf7931_read()
|
||||
{
|
||||
// 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.Offset[0] = PCF7931_DEFAULT_OFFSET_WIDTH;
|
||||
configPcf.Offset[1] = 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.Offset[0]);
|
||||
PrintAndLog("Offset low pulses position : %d us", configPcf.Offset[1]);
|
||||
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("Options:");
|
||||
PrintAndLog(" h This help");
|
||||
PrintAndLog("Examples:");
|
||||
PrintAndLog(" lf pcf7931 read");
|
||||
return 0;
|
||||
}
|
||||
|
||||
int CmdLFPCF7931Read(const char *Cmd)
|
||||
{
|
||||
uint8_t cmdp = 0;
|
||||
|
||||
if (param_getchar(Cmd, cmdp) == 'H' || param_getchar(Cmd, cmdp) == 'h')
|
||||
return usage_pcf7931_read();
|
||||
|
||||
UsbCommand c = {CMD_PCF7931_READ};
|
||||
clearCommandBuffer();
|
||||
SendCommand(&c);
|
||||
UsbCommand resp;
|
||||
WaitForResponse(CMD_ACK,&resp);
|
||||
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");
|
||||
PrintAndLog(" byteaddress Index of byte inside block to overwrite");
|
||||
PrintAndLog(" data one byte of data");
|
||||
PrintAndLog("Examples:");
|
||||
PrintAndLog(" lf pcf7931 write 10 1 FF");
|
||||
return 0;
|
||||
}
|
||||
|
||||
int CmdLFPCF7931Config(const char *Cmd)
|
||||
{
|
||||
int res = 0;
|
||||
// res = sscanf(Cmd,
|
||||
// "%02x %02x %hu %hu %hu %hu %hu %hhu %hd %hd",
|
||||
// &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 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 CmdLFPCF7931Write(const char *Cmd)
|
||||
{
|
||||
UsbCommand c = {CMD_PCF7931_WRITE};
|
||||
int CmdLFPCF7931Read(const char *Cmd){
|
||||
|
||||
int res = 0;
|
||||
res = sscanf(Cmd, "%" SCNu64 " %" SCNu64 " %" SCNu64 , &c.arg[0], &c.arg[1], &c.arg[2]);
|
||||
uint8_t ctmp = param_getchar(Cmd, 0);
|
||||
if ( ctmp == 'H' || ctmp == 'h' ) return usage_pcf7931_read();
|
||||
|
||||
if(res < 1) {
|
||||
PrintAndLog("Please specify the block address in hex");
|
||||
return 1;
|
||||
}
|
||||
if (res == 1){
|
||||
PrintAndLog("Please specify the byte address in hex");
|
||||
return 2;
|
||||
}
|
||||
if(res == 2) {
|
||||
PrintAndLog("Please specify the data in hex (1 byte)");
|
||||
return 3;
|
||||
}
|
||||
if(res == 3) {
|
||||
UsbCommand resp;
|
||||
UsbCommand c = {CMD_PCF7931_READ, {0, 0, 0}};
|
||||
clearCommandBuffer();
|
||||
SendCommand(&c);
|
||||
if ( !WaitForResponseTimeout(CMD_ACK, &resp, 2500) ) {
|
||||
PrintAndLog("command execution time out");
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
memcpy(c.d.asDwords, configPcf.password, 7);
|
||||
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();
|
||||
|
||||
c.d.asDwords[7] = (configPcf.offset[0]+128);
|
||||
c.d.asDwords[8] = (configPcf.offset[1]+128);
|
||||
c.d.asDwords[9] = configPcf.init_delay;
|
||||
configPcf.InitDelay = (param_get32ex(Cmd,1,0,10) & 0xFFFF);
|
||||
configPcf.Offset[0] = (int)(param_get32ex(Cmd,2,0,10) & 0xFFFF);
|
||||
configPcf.Offset[1] = (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();
|
||||
|
||||
uint64_t blockaddress = param_get64ex(Cmd, 0, 0, 16);
|
||||
uint64_t byteaddress = param_get64ex(Cmd, 1, 0, 16);
|
||||
uint8_t data = param_get8ex(Cmd,2,0,16);
|
||||
|
||||
PrintAndLog("Please specify the block address in hex");
|
||||
PrintAndLog("Please specify the byte address in hex");
|
||||
PrintAndLog("Please specify the data in hex (1 byte)");
|
||||
|
||||
PrintAndLog("", blockaddress, byteaddress, data);
|
||||
return 3;
|
||||
|
||||
UsbCommand c = {CMD_PCF7931_WRITE, { blockaddress, byteaddress, data} };
|
||||
memcpy(c.d.asDwords, configPcf.Pwd, 7);
|
||||
c.d.asDwords[7] = (configPcf.Offset[0]+128);
|
||||
c.d.asDwords[8] = (configPcf.Offset[1]+128);
|
||||
c.d.asDwords[9] = configPcf.InitDelay;
|
||||
|
||||
clearCommandBuffer();
|
||||
SendCommand(&c);
|
||||
return 0;
|
||||
}
|
||||
|
||||
PrintAndLog("INCORRECT FORMAT");
|
||||
return 0;
|
||||
SendCommand(&c);
|
||||
//no ack?
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static command_t CommandTable[] =
|
||||
{
|
||||
{"help", CmdHelp, 1, "This help"},
|
||||
{"read", CmdLFPCF7931Read, 1, "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, 1, "Write data on a PCF7931 transponder."},
|
||||
{"config", CmdLFPCF7931Config, 1, "Configure the password, the tags initialization delay and time offsets (optional)"},
|
||||
{NULL, NULL, 0, NULL}
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue