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

chg: resized flashmem offset for dictionaries to fit

Browse source
This commit is contained in:
iceman1001 2019-05-23 18:50:24 -04:00
commit d32c4d5267
2 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
client/cmdflashmem.c
View file

@ -307,7 +307,7 @@ static int CmdFlashMemLoad(const char *Cmd) {
conn.block_after_ACK = false; conn.block_after_ACK = false;
free(data); free(data);
PrintAndLogEx(SUCCESS, "Wrote %u bytes to offset %u", datalen, start_index); PrintAndLogEx(SUCCESS, "Wrote "_GREEN_("%u")"bytes to offset "_GREEN_("%u"), datalen, start_index);
return PM3_SUCCESS; return PM3_SUCCESS;
} }
static int CmdFlashMemSave(const char *Cmd) { static int CmdFlashMemSave(const char *Cmd) {
@ -357,9 +357,9 @@ static int CmdFlashMemSave(const char *Cmd) {
return PM3_EMALLOC; return PM3_EMALLOC;
} }
PrintAndLogEx(NORMAL, "downloading %u bytes from flashmem", len); PrintAndLogEx(NORMAL, "downloading"_YELLOW_("%u")"bytes from flashmem", len);
if (!GetFromDevice(FLASH_MEM, dump, len, start_index, NULL, -1, true)) { if (!GetFromDevice(FLASH_MEM, dump, len, start_index, NULL, -1, true)) {
PrintAndLogEx(FAILED, "ERROR; downloading flashmem"); PrintAndLogEx(FAILED, "ERROR; downloading from flashmemory");
free(dump); free(dump);
return PM3_EFLASH; return PM3_EFLASH;
} }

13
include/common.h
View file

@ -90,18 +90,23 @@ extern uint32_t FLASHMEM_SPIBAUDRATE;
# define T55XX_CONFIG_OFFSET (FLASH_MEM_MAX_4K_SECTOR - 0x2000) # define T55XX_CONFIG_OFFSET (FLASH_MEM_MAX_4K_SECTOR - 0x2000)
#endif #endif
// Reserved space for T55XX PWD = 4 kb
#ifndef DEFAULT_T55XX_KEYS_OFFSET #ifndef DEFAULT_T55XX_KEYS_OFFSET
# define DEFAULT_T55XX_KEYS_OFFSET (FLASH_MEM_MAX_4K_SECTOR - 0x3000) # define DEFAULT_T55XX_KEYS_OFFSET (FLASH_MEM_MAX_4K_SECTOR - 0x3000)
#endif #endif
#ifndef DEFAULT_MF_KEYS_OFFSET // Reserved space for iClass keys = 4 kb
# define DEFAULT_MF_KEYS_OFFSET (FLASH_MEM_MAX_4K_SECTOR - 0x4000) #ifndef DEFAULT_ICLASS_KEYS_OFFSET
# define DEFAULT_ICLASS_KEYS_OFFSET (FLASH_MEM_MAX_4K_SECTOR - 0x4000)
#endif #endif
#ifndef DEFAULT_ICLASS_KEYS_OFFSET // Reserved space for MIFARE Keys = 8 kb
# define DEFAULT_ICLASS_KEYS_OFFSET (FLASH_MEM_MAX_4K_SECTOR - 0x5000) #ifndef DEFAULT_MF_KEYS_OFFSET
# define DEFAULT_MF_KEYS_OFFSET (FLASH_MEM_MAX_4K_SECTOR - 0x6000)
#endif #endif
// RDV40, validation structure to help identifying that client/firmware is talking with RDV40 // RDV40, validation structure to help identifying that client/firmware is talking with RDV40
typedef struct { typedef struct {
uint8_t magic[4]; uint8_t magic[4];