From a10c92267eefae49574e464af09762758971bf93 Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Fri, 25 Jun 2021 19:45:25 +0200 Subject: [PATCH] allow for 24 bytes keys to be loaded from dictionary --- client/src/fileutils.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/client/src/fileutils.c b/client/src/fileutils.c index 415a0bb3c..2f18e0845 100644 --- a/client/src/fileutils.c +++ b/client/src/fileutils.c @@ -1292,12 +1292,13 @@ out: } int loadFileDICTIONARY(const char *preferredName, void *data, size_t *datalen, uint8_t keylen, uint32_t *keycnt) { - // t5577 == 4bytes + // t5577 == 4 bytes // mifare == 6 bytes // mf plus == 16 bytes + // mf desfire == 3des3k 24 bytes // iclass == 8 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; } @@ -1404,9 +1405,10 @@ int loadFileDICTIONARY_safe(const char *preferredName, void **pdata, uint8_t key // t5577 == 4bytes // mifare == 6 bytes // mf plus == 16 bytes + // mf desfire == 3des3k 24 bytes // iclass == 8 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; }