mirror of
https://github.com/Proxmark/proxmark3.git
synced 2025-07-16 02:03:00 -07:00
FIXME: will crash if sample buffer does not contain valid legic data (fixed by Sourcerer)
This commit is contained in:
parent
41dab15305
commit
313322658c
1 changed files with 3 additions and 4 deletions
|
@ -33,7 +33,6 @@ int CmdHelp(const char *Cmd)
|
||||||
* Output BigBuf and deobfuscate LEGIC RF tag data.
|
* Output BigBuf and deobfuscate LEGIC RF tag data.
|
||||||
* This is based on information given in the talk held
|
* This is based on information given in the talk held
|
||||||
* by Henryk Ploetz and Karsten Nohl at 26c3
|
* by Henryk Ploetz and Karsten Nohl at 26c3
|
||||||
* FIXME: will crash if sample buffer does not contain valid legic data
|
|
||||||
*/
|
*/
|
||||||
int CmdLegicDecode(const char *Cmd)
|
int CmdLegicDecode(const char *Cmd)
|
||||||
{
|
{
|
||||||
|
@ -162,7 +161,7 @@ int CmdLegicDecode(const char *Cmd)
|
||||||
|
|
||||||
if (wrc>0) {
|
if (wrc>0) {
|
||||||
PrintAndLog("WRC protected area:");
|
PrintAndLog("WRC protected area:");
|
||||||
for (k=0, j=0; k < wrc; k++, i++, j += 3) {
|
for (k=0, j=0; k < wrc && j<(sizeof(out_string)-3); k++, i++, j += 3) {
|
||||||
sprintf(&out_string[j], "%02x", (data_buf[i]^crc));
|
sprintf(&out_string[j], "%02x", (data_buf[i]^crc));
|
||||||
out_string[j+2] = ' ';
|
out_string[j+2] = ' ';
|
||||||
};
|
};
|
||||||
|
@ -175,7 +174,7 @@ int CmdLegicDecode(const char *Cmd)
|
||||||
if (wrp>wrc) {
|
if (wrp>wrc) {
|
||||||
PrintAndLog("Remaining write protected area:");
|
PrintAndLog("Remaining write protected area:");
|
||||||
|
|
||||||
for (k=0, j=0; k < (wrp-wrc); k++, i++, j += 3) {
|
for (k=0, j=0; k < (wrp-wrc) && j<(sizeof(out_string)-3); k++, i++, j += 3) {
|
||||||
sprintf(&out_string[j], "%02x", (data_buf[i]^crc));
|
sprintf(&out_string[j], "%02x", (data_buf[i]^crc));
|
||||||
out_string[j+2] = ' ';
|
out_string[j+2] = ' ';
|
||||||
};
|
};
|
||||||
|
@ -190,7 +189,7 @@ int CmdLegicDecode(const char *Cmd)
|
||||||
}
|
}
|
||||||
|
|
||||||
PrintAndLog("Remaining segment payload:");
|
PrintAndLog("Remaining segment payload:");
|
||||||
for (k=0, j=0; k < (segment_len - wrp - 5); k++, i++, j += 3) {
|
for (k=0, j=0; k < (segment_len - wrp - 5) && j<(sizeof(out_string)-3); k++, i++, j += 3) {
|
||||||
sprintf(&out_string[j], "%02x", (data_buf[i]^crc));
|
sprintf(&out_string[j], "%02x", (data_buf[i]^crc));
|
||||||
out_string[j+2] = ' ';
|
out_string[j+2] = ' ';
|
||||||
};
|
};
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue