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

move defines

Browse source
This commit is contained in:
iceman1001 2023-06-23 18:59:16 +02:00
commit 55b780074f
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/src/fileutils.c
View file

@ -29,7 +29,7 @@
#include "cmdhficlass.h" // pagemap #include "cmdhficlass.h" // pagemap
#include "protocols.h" // iclass defines #include "protocols.h" // iclass defines
#include "cmdhftopaz.h" // TOPAZ defines #include "cmdhftopaz.h" // TOPAZ defines
#include "cmdhfmfp.h" // MFP / AES defines #include "mifare/mifaredefault.h" // MFP / AES defines
#ifdef _WIN32 #ifdef _WIN32
#include "scandir.h" #include "scandir.h"

9
client/src/mifare/mifaredefault.h
View file

@ -21,6 +21,9 @@
#include "common.h" #include "common.h"
#define AES_KEY_LEN 16
#define MAX_AES_KEYS_LIST_LEN 1024
#define MFKEY_SIZE 6 #define MFKEY_SIZE 6
#define MFBLOCK_SIZE 16 #define MFBLOCK_SIZE 16
@ -41,6 +44,12 @@
#define MIFARE_KEY_SIZE 6 #define MIFARE_KEY_SIZE 6
#define MIFARE_MINI_MAX_KEY_SIZE (MIFARE_MINI_MAXSECTOR * 2 * MIFARE_KEY_SIZE)
#define MIFARE_1K_MAX_KEY_SIZE (MIFARE_1K_MAXSECTOR * 2 * MIFARE_KEY_SIZE)
#define MIFARE_2K_MAX_KEY_SIZE (MIFARE_2K_MAXSECTOR * 2 * MIFARE_KEY_SIZE)
#define MIFARE_4K_MAX_KEY_SIZE (MIFARE_4K_MAXSECTOR * 2 * MIFARE_KEY_SIZE)
static const uint64_t g_mifare_default_keys[] = { static const uint64_t g_mifare_default_keys[] = {
0xffffffffffff, // Default key (first key used by program if no user defined key) 0xffffffffffff, // Default key (first key used by program if no user defined key)
0xa0a1a2a3a4a5, // NFCForum MAD key 0xa0a1a2a3a4a5, // NFCForum MAD key