github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-24 15:05:29 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

CHG: moved a defince arraylen into util.h and changed to uppercase.

Browse source
This commit is contained in:
iceman1001 2016-08-04 21:54:11 +02:00
commit 52eeaef568
5 changed files with 44 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

32
client/cmdhf14a.c
View file

@ -23,6 +23,7 @@
#include "common.h"
#include "cmdmain.h"
#include "mifare.h"
#include "cmdhfmf.h"
#include "cmdhfmfu.h"
#include "nonce2key/nonce2key.h"
#include "cmdhf.h"
@ -500,15 +501,13 @@ int CmdHF14ACUIDs(const char *Cmd) {
// ## simulate iso14443a tag
// ## greg - added ability to specify tag UID
int CmdHF14ASim(const char *Cmd) {
#define ATTACK_KEY_COUNT 8
bool errors = FALSE;
uint8_t flags = 0;
uint8_t tagtype = 1;
uint8_t cmdp = 0;
uint8_t uid[10] = {0,0,0,0,0,0,0,0,0,0};
int uidlen = 0;
uint8_t data[40];
uint64_t key = 0;
UsbCommand resp;
bool useUIDfromEML = TRUE;
while(param_getchar(Cmd, cmdp) != 0x00) {
@ -566,27 +565,23 @@ int CmdHF14ASim(const char *Cmd) {
clearCommandBuffer();
SendCommand(&c);
while(!ukbhit()){
if ( WaitForResponseTimeout(CMD_ACK,&resp,1500)) {
if ( (resp.arg[0] & 0xffff) == CMD_SIMULATE_MIFARE_CARD ){
memset(data, 0x00, sizeof(data));
int len = (resp.arg[1] > sizeof(data)) ? sizeof(data) : resp.arg[1];
memcpy(data, resp.d.asBytes, len);
key = 0;
nonces_t data[ATTACK_KEY_COUNT*2];
UsbCommand resp;
if ( flags & FLAG_NR_AR_ATTACK ) {
bool found = tryMfk32(data, &key);
found ^= tryMfk32_moebius(data, &key);
}
}
}
while( !ukbhit() ){
if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500) ) continue;
if ( !(flags & FLAG_NR_AR_ATTACK) ) break;
if ( (resp.arg[0] & 0xffff) != CMD_SIMULATE_MIFARE_CARD ) break;
memcpy( data, resp.d.asBytes, sizeof(data) );
readerAttack(data, TRUE);
}
return 0;
}
int CmdHF14ASniff(const char *Cmd) {
int param = 0;
uint8_t ctmp = param_getchar(Cmd, 0) ;
if (ctmp == 'h' || ctmp == 'H') return usage_hf_14a_sniff();
@ -764,8 +759,7 @@ static void waitCmd(uint8_t iSelect) {
}
}
static command_t CommandTable[] =
{
static command_t CommandTable[] = {
{"help", CmdHelp, 1, "This help"},
{"list", CmdHF14AList, 0, "[Deprecated] List ISO 14443a history"},
{"reader", CmdHF14AReader, 0, "Act like an ISO14443 Type A reader"},

29
client/cmdhf15.c
View file

@ -293,7 +293,7 @@ int CmdHF15Demod(const char *Cmd)
// First, correlate for SOF
for (i = 0; i < 100; i++) {
int corr = 0;
for (j = 0; j < arraylen(FrameSOF); j += skip) {
for (j = 0; j < ARRAYLEN(FrameSOF); j += skip) {
corr += FrameSOF[j] * GraphBuffer[i + (j / skip)];
}
if (corr > max) {
@ -301,23 +301,22 @@ int CmdHF15Demod(const char *Cmd)
maxPos = i;
}
}
PrintAndLog("SOF at %d, correlation %d", maxPos,
max / (arraylen(FrameSOF) / skip));
PrintAndLog("SOF at %d, correlation %d", maxPos, max / (ARRAYLEN(FrameSOF) / skip));
i = maxPos + arraylen(FrameSOF) / skip;
i = maxPos + ARRAYLEN(FrameSOF) / skip;
int k = 0;
uint8_t outBuf[20];
memset(outBuf, 0, sizeof(outBuf));
uint8_t mask = 0x01;
for (;;) {
int corr0 = 0, corr1 = 0, corrEOF = 0;
for (j = 0; j < arraylen(Logic0); j += skip) {
for (j = 0; j < ARRAYLEN(Logic0); j += skip) {
corr0 += Logic0[j] * GraphBuffer[i + (j / skip)];
}
for (j = 0; j < arraylen(Logic1); j += skip) {
for (j = 0; j < ARRAYLEN(Logic1); j += skip) {
corr1 += Logic1[j] * GraphBuffer[i + (j / skip)];
}
for (j = 0; j < arraylen(FrameEOF); j += skip) {
for (j = 0; j < ARRAYLEN(FrameEOF); j += skip) {
corrEOF += FrameEOF[j] * GraphBuffer[i + (j / skip)];
}
// Even things out by the length of the target waveform.
@ -328,17 +327,17 @@ int CmdHF15Demod(const char *Cmd)
PrintAndLog("EOF at %d", i);
break;
} else if (corr1 > corr0) {
i += arraylen(Logic1) / skip;
i += ARRAYLEN(Logic1) / skip;
outBuf[k] |= mask;
} else {
i += arraylen(Logic0) / skip;
i += ARRAYLEN(Logic0) / skip;
}
mask <<= 1;
if (mask == 0) {
k++;
mask = 0x01;
}
if ((i + (int)arraylen(FrameEOF)) >= GraphTraceLen) {
if ((i + (int)ARRAYLEN(FrameEOF)) >= GraphTraceLen) {
PrintAndLog("ran off end!");
break;
}
@ -435,14 +434,14 @@ int CmdHF15Afi(const char *Cmd)
// Reads all memory pages
int CmdHF15DumpMem(const char*Cmd) {
UsbCommand resp;
uint8_t uid[8];
uint8_t uid[8] = {0,0,0,0,0,0,0,0};
uint8_t *recv = NULL;
UsbCommand resp;
UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}}; // len,speed,recv?
uint8_t *req = c.d.asBytes;
int reqlen=0;
int blocknum=0;
char output[80];
int reqlen = 0, blocknum = 0;
char output[80] = {0};
if (!getUID(uid)) {
PrintAndLog("No Tag found.");

2
client/cmdlf.c
View file

@ -981,7 +981,7 @@ int CmdVchDemod(const char *Cmd)
for (i = 0; i < (GraphTraceLen-2048); i++) {
int sum = 0;
int j;
for (j = 0; j < arraylen(SyncPattern); j++) {
for (j = 0; j < ARRAYLEN(SyncPattern); j++) {
sum += GraphBuffer[i+j]*SyncPattern[j];
}
if (sum > bestCorrel) {

2
client/cmdlfti.c
View file

@ -174,7 +174,7 @@ int CmdTIDemod(const char *Cmd)
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 low = 0;
int j;

7
client/data.h
View file

@ -10,14 +10,9 @@
#ifndef DATA_H__
#define DATA_H__
#include <stdint.h>
#define FILE_PATH_SIZE 1000
#include "util.h"
extern uint8_t* sample_buf;
#define arraylen(x) (sizeof(x)/sizeof((x)[0]))
void GetFromBigBuf(uint8_t *dest, int bytes, int start_index);
void GetEMLFromBigBuf(uint8_t *dest, int bytes, int start_index);
#endif