RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-01-31 04:20:28 +08:00
Code Issues Projects Releases Packages Wiki Activity

rework some defines

Browse source
This commit is contained in:
iceman1001 2021-05-16 23:03:13 +02:00
parent 451de246b7
commit 16783000f0
4 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
client/src/cmdlfem4x50.c
View file

@ -18,8 +18,7 @@
#include "commonutil.h" #include "commonutil.h"
#include "pmflash.h" #include "pmflash.h"
#include "cmdflashmemspiffs.h" #include "cmdflashmemspiffs.h"
#include "em4x50.h"
#define BYTES2UINT32(x) ((x[0] << 24) | (x[1] << 16) | (x[2] << 8) | (x[3]))
static int CmdHelp(const char *Cmd); static int CmdHelp(const char *Cmd);
@ -465,12 +464,12 @@ int CmdEM4x50Chk(const char *Cmd) {
} }
size_t datalen = 0; size_t datalen = 0;
uint8_t data[FLASH_MEM_MAX_SIZE] = {0x0}; uint8_t data[100000] = {0x0};
uint8_t *keys = data; uint8_t *keys = data;
uint32_t key_count = 0; uint32_t key_count = 0;
int res = loadFileDICTIONARY(filename, data, &datalen, 4, &key_count); int res = loadFileDICTIONARY(filename, data, &datalen, 4, &key_count);
if (res || !key_count) if ((res != PM3_SUCCESS) || (key_count == 0))
return PM3_EFILE; return PM3_EFILE;
PrintAndLogEx(INFO, "You can cancel this operation by pressing the pm3 button"); PrintAndLogEx(INFO, "You can cancel this operation by pressing the pm3 button");

3
client/src/cmdlfem4x70.c
View file

@ -19,9 +19,6 @@
#define LOCKBIT_0 BITMASK(6) #define LOCKBIT_0 BITMASK(6)
#define LOCKBIT_1 BITMASK(7) #define LOCKBIT_1 BITMASK(7)
#define BYTES2UINT16(x) ((x[1] << 8) | (x[0]))
#define BYTES2UINT32(x) ((x[3] << 24) | (x[2] << 16) | (x[1] << 8) | (x[0]))
#define INDEX_TO_BLOCK(x) (((32-x)/2)-1) #define INDEX_TO_BLOCK(x) (((32-x)/2)-1)
static int CmdHelp(const char *Cmd); static int CmdHelp(const char *Cmd);

9
include/common.h
View file

@ -131,6 +131,15 @@ extern bool tearoff_enabled;
#endif #endif
#endif #endif
// convert 2 bytes to U16
#ifndef BYTES2UINT16
# define BYTES2UINT16(x) ((x[1] << 8) | (x[0]))
#endif
// convert 4 bytes to U32
#ifndef BYTES2UINT32
# define BYTES2UINT32(x) ((x[3] << 24) | (x[2] << 16) | (x[1] << 8) | (x[0]))
#endif
#define EVEN 0 #define EVEN 0
#define ODD 1 #define ODD 1

4
include/em4x50.h
View file

@ -11,6 +11,8 @@
#ifndef EM4X50_H__ #ifndef EM4X50_H__
#define EM4X50_H__ #define EM4X50_H__
#include "common.h"
#define EM4X50_NO_WORDS 34 #define EM4X50_NO_WORDS 34
// special words // special words
@ -45,8 +47,6 @@
#define TIMEOUT_CMD 3000 #define TIMEOUT_CMD 3000
#define DUMP_FILESIZE 136 #define DUMP_FILESIZE 136
#define BYTES2UINT32(x) ((x[0] << 24) | (x[1] << 16) | (x[2] << 8) | (x[3]))
typedef struct { typedef struct {
bool addr_given; bool addr_given;
bool pwd_given; bool pwd_given;