RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-03-29 08:27:44 +08:00
Code Issues Projects Releases Packages Wiki Activity

CHG: the "indent" software warns about some assingments. I've tried to fix them.

Browse source
This commit is contained in:
iceman1001 2016-09-26 10:37:00 +02:00
parent 25d52dd261
commit 7d0efb37d8
4 changed files with 38 additions and 39 deletions

14
client/cmddata.c
View file

@ -969,17 +969,17 @@ int CmdUndec(const char *Cmd)
//shift graph zero up or down based on input + or - //shift graph zero up or down based on input + or -
int CmdGraphShiftZero(const char *Cmd) int CmdGraphShiftZero(const char *Cmd)
{ {
int shift=0; int shift = 0, shiftedVal = 0;
//set options from parameters entered with the command //set options from parameters entered with the command
sscanf(Cmd, "%i", &shift); sscanf(Cmd, "%i", &shift);
int shiftedVal=0;
for(int i = 0; i<GraphTraceLen; i++){ for(int i = 0; i<GraphTraceLen; i++){
shiftedVal=GraphBuffer[i]+shift; shiftedVal=GraphBuffer[i]+shift;
if (shiftedVal>127) if (shiftedVal > 127)
shiftedVal=127; shiftedVal = 127;
else if (shiftedVal<-127) else if (shiftedVal < -127)
shiftedVal=-127; shiftedVal = -127;
GraphBuffer[i]= shiftedVal; GraphBuffer[i] = shiftedVal;
} }
CmdNorm(""); CmdNorm("");
return 0; return 0;

41
client/cmdhf15.c
View file

@ -207,23 +207,22 @@ int getUID(uint8_t *buf)
UsbCommand resp; UsbCommand resp;
uint8_t *recv; uint8_t *recv;
UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}}; // len,speed,recv? UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}}; // len,speed,recv?
uint8_t *req=c.d.asBytes; uint8_t *req = c.d.asBytes;
int reqlen=0; int reqlen = 0;
for (int retry=0;retry<3; retry++) { // don't give up the at the first try for (int retry = 0; retry <3; retry++) { // don't give up the at the first try
req[0]= ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | req[0] = ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | ISO15_REQ_INVENTORY | ISO15_REQINV_SLOT1;
ISO15_REQ_INVENTORY | ISO15_REQINV_SLOT1; req[1] = ISO15_CMD_INVENTORY;
req[1]=ISO15_CMD_INVENTORY; req[2] = 0; // mask length
req[2]=0; // mask length reqlen = AddCrc(req, 3);
reqlen=AddCrc(req,3); c.arg[0] = reqlen;
c.arg[0]=reqlen;
SendCommand(&c); SendCommand(&c);
if (WaitForResponseTimeout(CMD_ACK,&resp,1000)) { if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {
recv = resp.d.asBytes; recv = resp.d.asBytes;
if (resp.arg[0]>=12 && ISO15_CRC_CHECK==Crc(recv,12)) { if (resp.arg[0] >= 12 && ISO15_CRC_CHECK == Crc(recv,12)) {
memcpy(buf,&recv[2],8); memcpy(buf,&recv[2],8);
return 1; return 1;
} }
@ -238,16 +237,16 @@ int getUID(uint8_t *buf)
// uid[8] tag uid // uid[8] tag uid
// returns description of the best match // returns description of the best match
static char* getTagInfo(uint8_t *uid) { static char* getTagInfo(uint8_t *uid) {
uint64_t myuid,mask; uint64_t myuid, mask;
int i=0, best=-1; int i = 0, best = -1;
memcpy(&myuid,uid,sizeof(uint64_t)); memcpy(&myuid, uid, sizeof(uint64_t));
while (uidmapping[i].mask>0) { while (uidmapping[i].mask > 0) {
mask=(~0LL) <<(64-uidmapping[i].mask); mask = (~0LL) << (64-uidmapping[i].mask);
if ((myuid & mask) == uidmapping[i].uid) { if ((myuid & mask) == uidmapping[i].uid) {
if (best==-1) { if (best == -1) {
best=i; best = i;
} else { } else {
if (uidmapping[i].mask>uidmapping[best].mask) { if (uidmapping[i].mask > uidmapping[best].mask) {
best=i; best=i;
} }
} }
@ -255,8 +254,8 @@ static char* getTagInfo(uint8_t *uid) {
i++; i++;
} }
if (best>=0) return uidmapping[best].desc; if (best >= 0)
return uidmapping[best].desc;
return uidmapping[i].desc; return uidmapping[i].desc;
} }

4
client/mifarehost.c
View file

@ -125,8 +125,8 @@ int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo
p4->even = 0; p4->odd = 0; p4->even = 0; p4->odd = 0;
statelists[0].len = p3 - statelists[0].head.slhead; statelists[0].len = p3 - statelists[0].head.slhead;
statelists[1].len = p4 - statelists[1].head.slhead; statelists[1].len = p4 - statelists[1].head.slhead;
statelists[0].tail.sltail=--p3; statelists[0].tail.sltail = --p3;
statelists[1].tail.sltail=--p4; statelists[1].tail.sltail = --p4;
// the statelists now contain possible keys. The key we are searching for must be in the // the statelists now contain possible keys. The key we are searching for must be in the
// intersection of both lists. Create the intersection: // intersection of both lists. Create the intersection:

18
client/pm3_binlib.c
View file

@ -48,8 +48,8 @@ static void badcode(lua_State *L, int c)
static int doendian(int c) static int doendian(int c)
{ {
int x=1; int x = 1;
int e=*(char*)&x; int e = *(char*)&x;
if (c==OP_LITTLEENDIAN) return !e; if (c==OP_LITTLEENDIAN) return !e;
if (c==OP_BIGENDIAN) return e; if (c==OP_BIGENDIAN) return e;
if (c==OP_NATIVE) return 0; if (c==OP_NATIVE) return 0;
@ -60,7 +60,7 @@ static void doswap(int swap, void *p, size_t n)
{ {
if (swap) if (swap)
{ {
char *a=(char*)p; char *a = (char*)p;
int i,j; int i,j;
for (i=0, j=n-1, n=n/2; n--; i++, j--) for (i=0, j=n-1, n=n/2; n--; i++, j--)
{ {
@ -87,14 +87,14 @@ static void doswap(int swap, void *p, size_t n)
case OP: \ case OP: \
{ \ { \
T l; \ T l; \
int m=sizeof(l); \ int m = sizeof(l); \
if (i+m>len) { done = 1; break; } \ if (i + m > len) { done = 1; break; } \
memcpy(&l,s+i,m); \ memcpy(&l, s+i, m); \
doswap(swap,&l,m); \ doswap(swap,&l,m); \
if (i+m+l>len) { done = 1; break;} \ if (i + m + l > len) { done = 1; break;} \
i+=m; \ i += m; \
lua_pushlstring(L,s+i,l); \ lua_pushlstring(L,s+i,l); \
i+=l; \ i += l; \
++n; \ ++n; \
break; \ break; \
} }