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

CHG: Missing some headers

Browse source 
FIX: some message/warning in pm3_binlib.c  @gm4tr1x
This commit is contained in:
iceman1001 2015-11-23 10:49:16 +01:00
commit 1a570b0a6a
3 changed files with 166 additions and 164 deletions
Download patch file Download diff file Expand all files Collapse all files

5
armsrc/lfops.c
View file

@ -202,8 +202,7 @@ void ReadTItag(void)
crc = update_crc16(crc, (shift1>>16)&0xff); crc = update_crc16(crc, (shift1>>16)&0xff);
crc = update_crc16(crc, (shift1>>24)&0xff); crc = update_crc16(crc, (shift1>>24)&0xff);
Dbprintf("Info: Tag data: %x%08x, crc=%x", Dbprintf("Info: Tag data: %x%08x, crc=%x", (unsigned int)shift1, (unsigned int)shift0, (unsigned int)shift2 & 0xFFFF);
(unsigned int)shift1, (unsigned int)shift0, (unsigned int)shift2 & 0xFFFF);
if (crc != (shift2&0xffff)) { if (crc != (shift2&0xffff)) {
Dbprintf("Error: CRC mismatch, expected %x", (unsigned int)crc); Dbprintf("Error: CRC mismatch, expected %x", (unsigned int)crc);
} else { } else {
@ -349,7 +348,7 @@ void WriteTItag(uint32_t idhi, uint32_t idlo, uint16_t crc)
// start by writing 0xBB (keyword) and 0xEB (password) // start by writing 0xBB (keyword) and 0xEB (password)
// then write 80 bits of data (or 64 bit data + 16 bit crc if you prefer) // then write 80 bits of data (or 64 bit data + 16 bit crc if you prefer)
// finally end with 0x0300 (write frame) // finally end with 0x0300 (write frame)
// all data is sent lsb firts // all data is sent lsb first
// finish with 15ms programming time // finish with 15ms programming time
// modulate antenna // modulate antenna

323
client/cmdlfti.c
View file

@ -17,6 +17,7 @@
#include "graph.h" #include "graph.h"
#include "cmdparser.h" #include "cmdparser.h"
#include "cmdlfti.h" #include "cmdlfti.h"
#include "cmdmain.h"
static int CmdHelp(const char *Cmd); static int CmdHelp(const char *Cmd);
@ -76,194 +77,197 @@ int CmdTIDemod(const char *Cmd)
1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1,
1, 1, 1, 1, 1, 1, 1, 1 1, 1, 1, 1, 1, 1, 1, 1
}; };
int lowLen = sizeof(LowTone)/sizeof(int); int lowLen = sizeof(LowTone)/sizeof(int);
int highLen = sizeof(HighTone)/sizeof(int); int highLen = sizeof(HighTone)/sizeof(int);
int convLen = (highLen>lowLen)?highLen:lowLen; int convLen = (highLen>lowLen)?highLen:lowLen;
uint16_t crc; uint16_t crc;
int i, j, TagType; int i, j, TagType;
int lowSum = 0, highSum = 0;; int lowSum = 0, highSum = 0;;
int lowTot = 0, highTot = 0; int lowTot = 0, highTot = 0;
for (i = 0; i < GraphTraceLen - convLen; i++) { for (i = 0; i < GraphTraceLen - convLen; i++) {
lowSum = 0; lowSum = 0;
highSum = 0;; highSum = 0;;
for (j = 0; j < lowLen; j++) { for (j = 0; j < lowLen; j++) {
lowSum += LowTone[j]*GraphBuffer[i+j]; lowSum += LowTone[j]*GraphBuffer[i+j];
} }
for (j = 0; j < highLen; j++) { for (j = 0; j < highLen; j++) {
highSum += HighTone[j]*GraphBuffer[i+j]; highSum += HighTone[j]*GraphBuffer[i+j];
} }
lowSum = abs((100*lowSum) / lowLen); lowSum = abs((100*lowSum) / lowLen);
highSum = abs((100*highSum) / highLen); highSum = abs((100*highSum) / highLen);
lowSum = (lowSum<0)?-lowSum:lowSum; lowSum = (lowSum<0)?-lowSum:lowSum;
highSum = (highSum<0)?-highSum:highSum; highSum = (highSum<0)?-highSum:highSum;
GraphBuffer[i] = (highSum << 16) | lowSum; GraphBuffer[i] = (highSum << 16) | lowSum;
} }
for (i = 0; i < GraphTraceLen - convLen - 16; i++) { for (i = 0; i < GraphTraceLen - convLen - 16; i++) {
lowTot = 0; lowTot = 0;
highTot = 0; highTot = 0;
// 16 and 15 are f_s divided by f_l and f_h, rounded // 16 and 15 are f_s divided by f_l and f_h, rounded
for (j = 0; j < 16; j++) { for (j = 0; j < 16; j++) {
lowTot += (GraphBuffer[i+j] & 0xffff); lowTot += (GraphBuffer[i+j] & 0xffff);
} }
for (j = 0; j < 15; j++) { for (j = 0; j < 15; j++) {
highTot += (GraphBuffer[i+j] >> 16); highTot += (GraphBuffer[i+j] >> 16);
} }
GraphBuffer[i] = lowTot - highTot; GraphBuffer[i] = lowTot - highTot;
} }
GraphTraceLen -= (convLen + 16); GraphTraceLen -= (convLen + 16);
RepaintGraphWindow(); RepaintGraphWindow();
// TI tag data format is 16 prebits, 8 start bits, 64 data bits, // TI tag data format is 16 prebits, 8 start bits, 64 data bits,
// 16 crc CCITT bits, 8 stop bits, 15 end bits // 16 crc CCITT bits, 8 stop bits, 15 end bits
// the 16 prebits are always low // the 16 prebits are always low
// the 8 start and stop bits of a tag must match // the 8 start and stop bits of a tag must match
// the start/stop prebits of a ro tag are 01111110 // the start/stop prebits of a ro tag are 01111110
// the start/stop prebits of a rw tag are 11111110 // the start/stop prebits of a rw tag are 11111110
// the 15 end bits of a ro tag are all low // the 15 end bits of a ro tag are all low
// the 15 end bits of a rw tag match bits 15-1 of the data bits // the 15 end bits of a rw tag match bits 15-1 of the data bits
// Okay, so now we have unsliced soft decisions; // Okay, so now we have unsliced soft decisions;
// find bit-sync, and then get some bits. // find bit-sync, and then get some bits.
// look for 17 low bits followed by 6 highs (common pattern for ro and rw tags) // look for 17 low bits followed by 6 highs (common pattern for ro and rw tags)
int max = 0, maxPos = 0; int max = 0, maxPos = 0;
for (i = 0; i < 6000; i++) { for (i = 0; i < 6000; i++) {
int j; int j;
int dec = 0; int dec = 0;
// searching 17 consecutive lows // searching 17 consecutive lows
for (j = 0; j < 17*lowLen; j++) { for (j = 0; j < 17*lowLen; j++) {
dec -= GraphBuffer[i+j]; dec -= GraphBuffer[i+j];
} }
// searching 7 consecutive highs // searching 7 consecutive highs
for (; j < 17*lowLen + 6*highLen; j++) { for (; j < 17*lowLen + 6*highLen; j++) {
dec += GraphBuffer[i+j]; dec += GraphBuffer[i+j];
} }
if (dec > max) { if (dec > max) {
max = dec; max = dec;
maxPos = i; maxPos = i;
} }
} }
// place a marker in the buffer to visually aid location // place a marker in the buffer to visually aid location
// of the start of sync // of the start of sync
GraphBuffer[maxPos] = 800; GraphBuffer[maxPos] = 800;
GraphBuffer[maxPos+1] = -800; GraphBuffer[maxPos+1] = -800;
// advance pointer to start of actual data stream (after 16 pre and 8 start bits) // advance pointer to start of actual data stream (after 16 pre and 8 start bits)
maxPos += 17*lowLen; maxPos += 17*lowLen;
maxPos += 6*highLen; maxPos += 6*highLen;
// place a marker in the buffer to visually aid location // place a marker in the buffer to visually aid location
// of the end of sync // of the end of sync
GraphBuffer[maxPos] = 800; GraphBuffer[maxPos] = 800;
GraphBuffer[maxPos+1] = -800; GraphBuffer[maxPos+1] = -800;
PrintAndLog("actual data bits start at sample %d", maxPos); PrintAndLog("actual data bits start at sample %d", maxPos);
PrintAndLog("length %d/%d", highLen, lowLen); PrintAndLog("length %d/%d", highLen, lowLen);
uint8_t bits[1+64+16+8+16]; uint8_t bits[1+64+16+8+16];
bits[sizeof(bits)-1] = '\0'; bits[sizeof(bits)-1] = '\0';
uint32_t shift3 = 0x7e000000, shift2 = 0, shift1 = 0, shift0 = 0; uint32_t shift3 = 0x7e000000, shift2 = 0, shift1 = 0, shift0 = 0;
for (i = 0; i < arraylen(bits)-1; i++) { for (i = 0; i < arraylen(bits)-1; i++) {
int high = 0; int high = 0;
int low = 0; int low = 0;
int j; int j;
for (j = 0; j < lowLen; j++) { for (j = 0; j < lowLen; j++) {
low -= GraphBuffer[maxPos+j]; low -= GraphBuffer[maxPos+j];
} }
for (j = 0; j < highLen; j++) { for (j = 0; j < highLen; j++) {
high += GraphBuffer[maxPos+j]; high += GraphBuffer[maxPos+j];
} }
if (high > low) { if (high > low) {
bits[i] = '1'; bits[i] = '1';
maxPos += highLen; maxPos += highLen;
// bitstream arrives lsb first so shift right // bitstream arrives lsb first so shift right
shift3 |= (1<<31); shift3 |= (1<<31);
} else { } else {
bits[i] = '.'; bits[i] = '.';
maxPos += lowLen; maxPos += lowLen;
} }
// 128 bit right shift register // 128 bit right shift register
shift0 = (shift0>>1) | (shift1 << 31); shift0 = (shift0>>1) | (shift1 << 31);
shift1 = (shift1>>1) | (shift2 << 31); shift1 = (shift1>>1) | (shift2 << 31);
shift2 = (shift2>>1) | (shift3 << 31); shift2 = (shift2>>1) | (shift3 << 31);
shift3 >>= 1; shift3 >>= 1;
// place a marker in the buffer between bits to visually aid location // place a marker in the buffer between bits to visually aid location
GraphBuffer[maxPos] = 800; GraphBuffer[maxPos] = 800;
GraphBuffer[maxPos+1] = -800; GraphBuffer[maxPos+1] = -800;
} }
PrintAndLog("Info: raw tag bits = %s", bits); PrintAndLog("Info: raw tag bits = %s", bits);
TagType = (shift3>>8)&0xff; TagType = (shift3>>8)&0xff;
if ( TagType != ((shift0>>16)&0xff) ) { if ( TagType != ((shift0>>16)&0xff) ) {
PrintAndLog("Error: start and stop bits do not match!"); PrintAndLog("Error: start and stop bits do not match!");
return 0; return 0;
} }
else if (TagType == 0x7e) { else if (TagType == 0x7e) {
PrintAndLog("Info: Readonly TI tag detected."); PrintAndLog("Info: Readonly TI tag detected.");
return 0; return 0;
} }
else if (TagType == 0xfe) { else if (TagType == 0xfe) {
PrintAndLog("Info: Rewriteable TI tag detected."); PrintAndLog("Info: Rewriteable TI tag detected.");
// put 64 bit data into shift1 and shift0 // put 64 bit data into shift1 and shift0
shift0 = (shift0>>24) | (shift1 << 8); shift0 = (shift0>>24) | (shift1 << 8);
shift1 = (shift1>>24) | (shift2 << 8); shift1 = (shift1>>24) | (shift2 << 8);
// align 16 bit crc into lower half of shift2 // align 16 bit crc into lower half of shift2
shift2 = ((shift2>>24) | (shift3 << 8)) & 0x0ffff; shift2 = ((shift2>>24) | (shift3 << 8)) & 0x0ffff;
// align 16 bit "end bits" or "ident" into lower half of shift3 // align 16 bit "end bits" or "ident" into lower half of shift3
shift3 >>= 16; shift3 >>= 16;
// only 15 bits compare, last bit of ident is not valid // only 15 bits compare, last bit of ident is not valid
if ( (shift3^shift0)&0x7fff ) { if ( (shift3^shift0)&0x7fff ) {
PrintAndLog("Error: Ident mismatch!"); PrintAndLog("Error: Ident mismatch!");
} }
// WARNING the order of the bytes in which we calc crc below needs checking // WARNING the order of the bytes in which we calc crc below needs checking
// i'm 99% sure the crc algorithm is correct, but it may need to eat the // i'm 99% sure the crc algorithm is correct, but it may need to eat the
// bytes in reverse or something // bytes in reverse or something
// calculate CRC // calculate CRC
crc=0; crc=0;
crc = update_crc16(crc, (shift0)&0xff); crc = update_crc16(crc, (shift0)&0xff);
crc = update_crc16(crc, (shift0>>8)&0xff); crc = update_crc16(crc, (shift0>>8)&0xff);
crc = update_crc16(crc, (shift0>>16)&0xff); crc = update_crc16(crc, (shift0>>16)&0xff);
crc = update_crc16(crc, (shift0>>24)&0xff); crc = update_crc16(crc, (shift0>>24)&0xff);
crc = update_crc16(crc, (shift1)&0xff); crc = update_crc16(crc, (shift1)&0xff);
crc = update_crc16(crc, (shift1>>8)&0xff); crc = update_crc16(crc, (shift1>>8)&0xff);
crc = update_crc16(crc, (shift1>>16)&0xff); crc = update_crc16(crc, (shift1>>16)&0xff);
crc = update_crc16(crc, (shift1>>24)&0xff); crc = update_crc16(crc, (shift1>>24)&0xff);
PrintAndLog("Info: Tag data = %08X%08X", shift1, shift0);
if (crc != (shift2&0xffff)) { //crc = crc16_ccitt(message, sizeof(message);
PrintAndLog("Error: CRC mismatch, calculated %04X, got ^04X", crc, shift2&0xffff);
} else { char *crcStr = (crc == (shift2&0xffff) ) ? "Passed" : "Failed";
PrintAndLog("Info: CRC %04X is good", crc);
} PrintAndLog("Tag data = %08X%08X [Crc %04X %s]", shift1, shift0, crc, crcStr );
}
else { if (crc != (shift2&0xffff))
PrintAndLog("Unknown tag type."); PrintAndLog("Error: CRC mismatch, calculated %04X, got ^04X", crc, shift2&0xffff);
return 0;
} }
return 0; else {
PrintAndLog("Unknown tag type.");
}
return 0;
} }
// read a TI tag and return its ID // read a TI tag and return its ID
int CmdTIRead(const char *Cmd) int CmdTIRead(const char *Cmd)
{ {
UsbCommand c = {CMD_READ_TI_TYPE}; UsbCommand c = {CMD_READ_TI_TYPE};
clearCommandbuffer(); clearCommandBuffer();
SendCommand(&c); SendCommand(&c);
return 0; return 0;
} }
@ -271,16 +275,15 @@ int CmdTIRead(const char *Cmd)
// write new data to a r/w TI tag // write new data to a r/w TI tag
int CmdTIWrite(const char *Cmd) int CmdTIWrite(const char *Cmd)
{ {
UsbCommand c = {CMD_WRITE_TI_TYPE};
int res = 0; int res = 0;
UsbCommand c = {CMD_WRITE_TI_TYPE};
res = sscanf(Cmd, "%012"llx" %012"llx" %012"llx"", &c.arg[0], &c.arg[1], &c.arg[2]); res = sscanf(Cmd, "%012"llx" %012"llx" %012"llx"", &c.arg[0], &c.arg[1], &c.arg[2]);
if (res == 2) c.arg[2]=0; if (res == 2) c.arg[2]=0;
if (res < 2) if (res < 2)
PrintAndLog("Please specify the data as two hex strings, optionally the CRC as a third"); PrintAndLog("Please specify the data as two hex strings, optionally the CRC as a third");
else else
clearCommandbuffer(); clearCommandBuffer();
SendCommand(&c); SendCommand(&c);
return 0; return 0;
} }

2
client/pm3_binlib.c
View file

@ -107,7 +107,7 @@ static int l_unpack(lua_State *L) /** unpack(f,s, [init]) */
size_t len; size_t len;
const char *s=luaL_checklstring(L,2,&len); /* switched s and f */ const char *s=luaL_checklstring(L,2,&len); /* switched s and f */
const char *f=luaL_checkstring(L,1); const char *f=luaL_checkstring(L,1);
int i_read = luaL_optint(L,3,1)-1; int i_read = (int)luaL_optint(L,(3),(1))-1;
unsigned int i; unsigned int i;
if (i_read >= 0) { if (i_read >= 0) {
i = i_read; i = i_read;