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

allow for 24 bytes keys to be loaded from dictionary

Browse source
This commit is contained in:
iceman1001 2021-06-25 19:45:25 +02:00
parent a86bd9464f
commit a10c92267e
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
client/src/fileutils.c
View file

@ -1292,12 +1292,13 @@ out:
} }
int loadFileDICTIONARY(const char *preferredName, void *data, size_t *datalen, uint8_t keylen, uint32_t *keycnt) { int loadFileDICTIONARY(const char *preferredName, void *data, size_t *datalen, uint8_t keylen, uint32_t *keycnt) {
// t5577 == 4bytes // t5577 == 4 bytes
// mifare == 6 bytes // mifare == 6 bytes
// mf plus == 16 bytes // mf plus == 16 bytes
// mf desfire == 3des3k 24 bytes
// iclass == 8 bytes // iclass == 8 bytes
// default to 6 bytes. // default to 6 bytes.
if (keylen != 4 && keylen != 6 && keylen != 8 && keylen != 16) { if (keylen != 4 && keylen != 6 && keylen != 8 && keylen != 16 && keylen != 24) {
keylen = 6; keylen = 6;
} }
@ -1404,9 +1405,10 @@ int loadFileDICTIONARY_safe(const char *preferredName, void **pdata, uint8_t key
// t5577 == 4bytes // t5577 == 4bytes
// mifare == 6 bytes // mifare == 6 bytes
// mf plus == 16 bytes // mf plus == 16 bytes
// mf desfire == 3des3k 24 bytes
// iclass == 8 bytes // iclass == 8 bytes
// default to 6 bytes. // default to 6 bytes.
if (keylen != 4 && keylen != 6 && keylen != 8 && keylen != 16) { if (keylen != 4 && keylen != 6 && keylen != 8 && keylen != 16 && keylen != 24) {
keylen = 6; keylen = 6;
} }