projects
/
proxmark3-svn
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ADD: @marshmellow42's decrypt crypto-1 method,
[proxmark3-svn]
/
client
/
cmdlft55xx.c
diff --git
a/client/cmdlft55xx.c
b/client/cmdlft55xx.c
index 2953e7802726094cfef7a8005796765ec0daf9e4..3611cd4ff9f6f19ee6dc1e1b6bae1a93e03e3339 100644
(file)
--- a/
client/cmdlft55xx.c
+++ b/
client/cmdlft55xx.c
@@
-37,7
+37,7
@@
int usage_t55xx_config(){
PrintAndLog("Options: ");
\r
PrintAndLog(" h This help");
\r
PrintAndLog(" b <8|16|32|40|50|64|100|128> Set bitrate");
\r
PrintAndLog("Options: ");
\r
PrintAndLog(" h This help");
\r
PrintAndLog(" b <8|16|32|40|50|64|100|128> Set bitrate");
\r
- PrintAndLog(" d <FSK|FSK1|FSK1a|FSK2|FSK2a|ASK|PSK1|PSK2|N
Z|BI|BIa> Set demodulation FSK / ASK / PSK / N
Z / Biphase / Biphase A");
\r
+ PrintAndLog(" d <FSK|FSK1|FSK1a|FSK2|FSK2a|ASK|PSK1|PSK2|N
RZ|BI|BIa> Set demodulation FSK / ASK / PSK / NR
Z / Biphase / Biphase A");
\r
PrintAndLog(" i [1] Invert data signal, defaults to normal");
\r
PrintAndLog(" o [offset] Set offset, where data should start decode in bitstream");
\r
PrintAndLog("");
\r
PrintAndLog(" i [1] Invert data signal, defaults to normal");
\r
PrintAndLog(" o [offset] Set offset, where data should start decode in bitstream");
\r
PrintAndLog("");
\r
@@
-242,6
+242,7
@@
int CmdT55xxReadBlock(const char *Cmd) {
c.d.asBytes[0] = 0x1;
\r
}
\r
\r
c.d.asBytes[0] = 0x1;
\r
}
\r
\r
+ clearCommandBuffer();
\r
SendCommand(&c);
\r
if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {
\r
PrintAndLog("command execution time out");
\r
SendCommand(&c);
\r
if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {
\r
PrintAndLog("command execution time out");
\r
@@
-367,6
+368,7
@@
bool tryDetectModulation(){
}
\r
} else {
\r
clk = GetAskClock("", FALSE, FALSE);
\r
}
\r
} else {
\r
clk = GetAskClock("", FALSE, FALSE);
\r
+
\r
if (clk>0) {
\r
sprintf(cmdStr,"%d", clk/2);
\r
CmdLtrim(cmdStr);
\r
if (clk>0) {
\r
sprintf(cmdStr,"%d", clk/2);
\r
CmdLtrim(cmdStr);
\r
@@
-666,9
+668,10
@@
int CmdT55xxWriteBlock(const char *Cmd)
\r
if (block > 7) {
\r
PrintAndLog("Block number must be between 0 and 7");
\r
\r
if (block > 7) {
\r
PrintAndLog("Block number must be between 0 and 7");
\r
- return
1
;
\r
+ return
2
;
\r
}
\r
\r
}
\r
\r
+ UsbCommand resp;
\r
UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {data, block, 0}};
\r
c.d.asBytes[0] = 0x0;
\r
\r
UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {data, block, 0}};
\r
c.d.asBytes[0] = 0x0;
\r
\r
@@
-680,7
+683,12
@@
int CmdT55xxWriteBlock(const char *Cmd)
c.d.asBytes[0] = 0x1;
\r
PrintAndLog("pwd : 0x%08X", password);
\r
}
\r
c.d.asBytes[0] = 0x1;
\r
PrintAndLog("pwd : 0x%08X", password);
\r
}
\r
+ clearCommandBuffer();
\r
SendCommand(&c);
\r
SendCommand(&c);
\r
+ if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000)){
\r
+ PrintAndLog("Error occurred, device did not ACK write operation. (May be due to old firmware)");
\r
+ return -1;
\r
+ }
\r
return 0;
\r
}
\r
\r
return 0;
\r
}
\r
\r
@@
-878,6
+886,7
@@
int AquireData( uint8_t block ){
// c.d.asBytes[0] = 0x1;
\r
// }
\r
\r
// c.d.asBytes[0] = 0x1;
\r
// }
\r
\r
+ clearCommandBuffer();
\r
SendCommand(&c);
\r
if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {
\r
PrintAndLog("command execution time out");
\r
SendCommand(&c);
\r
if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {
\r
PrintAndLog("command execution time out");
\r
@@
-1050,6
+1059,12
@@
char * GetSelectedModulationStr( uint8_t id){
return buf;
\r
}
\r
\r
return buf;
\r
}
\r
\r
+void t55x7_create_config_block( int tagtype ){
\r
+ //switch?
\r
+
\r
+
\r
+}
\r
+
\r
/*
\r
uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits){
\r
\r
/*
\r
uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits){
\r
\r
Impressum
,
Datenschutz