From 55b780074fed9b169124bdfae134fbe60284d846 Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Fri, 23 Jun 2023 18:59:16 +0200 Subject: [PATCH] move defines --- client/src/fileutils.c | 2 +- client/src/mifare/mifaredefault.h | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/client/src/fileutils.c b/client/src/fileutils.c index aad9b9cce..917a7ee77 100644 --- a/client/src/fileutils.c +++ b/client/src/fileutils.c @@ -29,7 +29,7 @@ #include "cmdhficlass.h" // pagemap #include "protocols.h" // iclass defines #include "cmdhftopaz.h" // TOPAZ defines -#include "cmdhfmfp.h" // MFP / AES defines +#include "mifare/mifaredefault.h" // MFP / AES defines #ifdef _WIN32 #include "scandir.h" diff --git a/client/src/mifare/mifaredefault.h b/client/src/mifare/mifaredefault.h index e3590329d..7bb7e144a 100644 --- a/client/src/mifare/mifaredefault.h +++ b/client/src/mifare/mifaredefault.h @@ -21,6 +21,9 @@ #include "common.h" +#define AES_KEY_LEN 16 +#define MAX_AES_KEYS_LIST_LEN 1024 + #define MFKEY_SIZE 6 #define MFBLOCK_SIZE 16 @@ -41,6 +44,12 @@ #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[] = { 0xffffffffffff, // Default key (first key used by program if no user defined key) 0xa0a1a2a3a4a5, // NFCForum MAD key