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

CHG: Changed cardnumber printing from %d (signed) to %u (unsigned) for AWID50, it now prints correct in all cases. Thanks to @ntk for reminding me about it.

Browse source
This commit is contained in:
iceman1001 2016-05-14 14:34:35 +02:00
commit 6a4271d186
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
armsrc/lfops.c
View file

@ -898,25 +898,25 @@ void CmdAWIDdemodFSK(int findone, int *high, int *low, int ledcontrol)
fc = bytebits_to_byte(dest + 9, 8); fc = bytebits_to_byte(dest + 9, 8);
cardnum = bytebits_to_byte(dest + 17, 16); cardnum = bytebits_to_byte(dest + 17, 16);
code1 = bytebits_to_byte(dest + 8,fmtLen); code1 = bytebits_to_byte(dest + 8,fmtLen);
Dbprintf("AWID Found - BitLength: %d, FC: %d, Card: %d - Wiegand: %x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, rawHi2, rawHi, rawLo); Dbprintf("AWID Found - BitLength: %d, FC: %d, Card: %u - Wiegand: %x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, rawHi2, rawHi, rawLo);
break; break;
case 50: case 50:
fc = bytebits_to_byte(dest + 9, 16); fc = bytebits_to_byte(dest + 9, 16);
cardnum = bytebits_to_byte(dest + 25, 32); cardnum = bytebits_to_byte(dest + 25, 32);
code1 = bytebits_to_byte(dest + 8, (fmtLen-32) ); code1 = bytebits_to_byte(dest + 8, (fmtLen-32) );
code2 = bytebits_to_byte(dest + 8 + (fmtLen-32), 32); code2 = bytebits_to_byte(dest + 8 + (fmtLen-32), 32);
Dbprintf("AWID Found - BitLength: %d, FC: %d, Card: %d - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, code2, rawHi2, rawHi, rawLo); Dbprintf("AWID Found - BitLength: %d, FC: %d, Card: %u - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, code2, rawHi2, rawHi, rawLo);
break; break;
default: default:
if (fmtLen > 32 ) { if (fmtLen > 32 ) {
cardnum = bytebits_to_byte(dest+8+(fmtLen-17), 16); cardnum = bytebits_to_byte(dest+8+(fmtLen-17), 16);
code1 = bytebits_to_byte(dest+8,fmtLen-32); code1 = bytebits_to_byte(dest+8,fmtLen-32);
code2 = bytebits_to_byte(dest+8+(fmtLen-32),32); code2 = bytebits_to_byte(dest+8+(fmtLen-32),32);
Dbprintf("AWID Found - BitLength: %d -unknown BitLength- (%d) - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, cardnum, code1, code2, rawHi2, rawHi, rawLo); Dbprintf("AWID Found - BitLength: %d -unknown BitLength- (%u) - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, cardnum, code1, code2, rawHi2, rawHi, rawLo);
} else { } else {
cardnum = bytebits_to_byte(dest+8+(fmtLen-17), 16); cardnum = bytebits_to_byte(dest+8+(fmtLen-17), 16);
code1 = bytebits_to_byte(dest+8,fmtLen); code1 = bytebits_to_byte(dest+8,fmtLen);
Dbprintf("AWID Found - BitLength: %d -unknown BitLength- (%d) - Wiegand: %x, Raw: %08x%08x%08x", fmtLen, cardnum, code1, rawHi2, rawHi, rawLo); Dbprintf("AWID Found - BitLength: %d -unknown BitLength- (%u) - Wiegand: %x, Raw: %08x%08x%08x", fmtLen, cardnum, code1, rawHi2, rawHi, rawLo);
} }
break; break;
} }

14
client/cmddata.c
View file

@ -1315,9 +1315,9 @@ int CmdFSKdemodAWID(const char *Cmd)
// bbbbbbbb w ffffffff cccccccccccccccc w xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx // bbbbbbbb w ffffffff cccccccccccccccc w xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
// |26 bit| |-117--| |-----142------| // |26 bit| |-117--| |-----142------|
// //
// 00110010 0 0000011111010000000000000001000100101000100001111 0 00000000 // 00110010 0 0000111110100000 00000000000100010010100010000111 1 000000000
// bbbbbbbb w ffffffffffffffffccccccccccccccccccccccccccccccccc w xxxxxxxx // bbbbbbbb w ffffffffffffffff cccccccccccccccccccccccccccccccc w xxxxxxxxx
// |50 bit| |----4000------||-----------2248975-------------| // |50 bit| |----4000------| |-----------2248975------------|
// b = format bit len, o = odd parity of last 3 bits // b = format bit len, o = odd parity of last 3 bits
// f = facility code, c = card number // f = facility code, c = card number
// w = wiegand parity // w = wiegand parity
@ -1332,25 +1332,25 @@ int CmdFSKdemodAWID(const char *Cmd)
fc = bytebits_to_byte(BitStream + 9, 8); fc = bytebits_to_byte(BitStream + 9, 8);
cardnum = bytebits_to_byte(BitStream + 17, 16); cardnum = bytebits_to_byte(BitStream + 17, 16);
code1 = bytebits_to_byte(BitStream + 8,fmtLen); code1 = bytebits_to_byte(BitStream + 8,fmtLen);
PrintAndLog("AWID Found - BitLength: %d, FC: %d, Card: %d - Wiegand: %x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, rawHi2, rawHi, rawLo); PrintAndLog("AWID Found - BitLength: %d, FC: %d, Card: %u - Wiegand: %x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, rawHi2, rawHi, rawLo);
break; break;
case 50: case 50:
fc = bytebits_to_byte(BitStream + 9, 16); fc = bytebits_to_byte(BitStream + 9, 16);
cardnum = bytebits_to_byte(BitStream + 25, 32); cardnum = bytebits_to_byte(BitStream + 25, 32);
code1 = bytebits_to_byte(BitStream + 8, (fmtLen-32) ); code1 = bytebits_to_byte(BitStream + 8, (fmtLen-32) );
code2 = bytebits_to_byte(BitStream + 8 + (fmtLen-32), 32); code2 = bytebits_to_byte(BitStream + 8 + (fmtLen-32), 32);
PrintAndLog("AWID Found - BitLength: %d, FC: %d, Card: %d - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, code2, rawHi2, rawHi, rawLo); PrintAndLog("AWID Found - BitLength: %d, FC: %d, Card: %u - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, code2, rawHi2, rawHi, rawLo);
break; break;
default: default:
if (fmtLen > 32 ) { if (fmtLen > 32 ) {
cardnum = bytebits_to_byte(BitStream+8+(fmtLen-17), 16); cardnum = bytebits_to_byte(BitStream+8+(fmtLen-17), 16);
code1 = bytebits_to_byte(BitStream+8,fmtLen-32); code1 = bytebits_to_byte(BitStream+8,fmtLen-32);
code2 = bytebits_to_byte(BitStream+8+(fmtLen-32),32); code2 = bytebits_to_byte(BitStream+8+(fmtLen-32),32);
PrintAndLog("AWID Found - BitLength: %d -unknown BitLength- (%d) - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, cardnum, code1, code2, rawHi2, rawHi, rawLo); PrintAndLog("AWID Found - BitLength: %d -unknown BitLength- (%u) - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, cardnum, code1, code2, rawHi2, rawHi, rawLo);
} else { } else {
cardnum = bytebits_to_byte(BitStream+8+(fmtLen-17), 16); cardnum = bytebits_to_byte(BitStream+8+(fmtLen-17), 16);
code1 = bytebits_to_byte(BitStream+8,fmtLen); code1 = bytebits_to_byte(BitStream+8,fmtLen);
PrintAndLog("AWID Found - BitLength: %d -unknown BitLength- (%d) - Wiegand: %x, Raw: %08x%08x%08x", fmtLen, cardnum, code1, rawHi2, rawHi, rawLo); PrintAndLog("AWID Found - BitLength: %d -unknown BitLength- (%u) - Wiegand: %x, Raw: %08x%08x%08x", fmtLen, cardnum, code1, rawHi2, rawHi, rawLo);
} }
break; break;
} }