From e0543bd612e3a9b147477dc883217702eb5c6540 Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Fri, 11 Sep 2026 12:38:16 +0200 Subject: [PATCH] hf mfdes detect: probe for LRP, and use the DESFire dictionary Two things stopped 'detect' finding keys it should have found. An AES application and an LRP application report the same key settings byte, so a card in LRP mode was only caught when the settings happened to be unreadable and the auth-command fallback ran. Probe with AuthenticateLRPFirst whenever --schann was not given, then re-select. With no -f, candidates came from g_mifare_plus_default_keys, which is 26 entries of 16 byte AES. For DES that meant authenticating with the first half of an AES key, and for 3K3DES it fabricated 24 bytes as key[0..15] + key[0..7]. Default to the bundled mfdes_default_keys dictionary instead: 7 DES, 47 2TDEA/AES and 4 real 3K3DES keys. Co-Authored-By: Claude Opus 5 (1M context) --- CHANGELOG.md | 2 + client/src/cmdhfmfdes.c | 117 ++++++++++++++++++---------------------- 2 files changed, 53 insertions(+), 66 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 93c34c2d8..76d2f6db8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ All notable changes to this project will be documented in this file. This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log... ## [unreleased][unreleased] +- Fixed `hf mfdes detect` - with no `-f` it drew candidates from the MIFARE Plus 16 byte key list,it now defaults to the bundled `mfdes_default_keys` dictionary (@iceman1001) +- Fixed `hf mfdes detect` - LRP was only found when the key settings happened to be unreadable (@iceman1001) - Added `hf mfdes chk --schann` - now detect the secure channel EV/EV2/LRP mode; detected per application and can be overridden (@iceman1001) - Fixed `hf mfdes chk` - found keys were tracked per key number instead of per application, so a key number recovered on one AID was skipped later (@iceman1001) - Fixed `data modulation` - the 160 sample antenna settle trim was never undone, so the graph buffer stayed short for everything after it (@mfcarroll) diff --git a/client/src/cmdhfmfdes.c b/client/src/cmdhfmfdes.c index 566fe3a5e..4b3db4278 100644 --- a/client/src/cmdhfmfdes.c +++ b/client/src/cmdhfmfdes.c @@ -59,6 +59,8 @@ #define MAX_KEYS_LIST_LEN 1024 // how many errors in a row from the card before we give up on a key number #define MFDES_CHK_MAX_ERRORS 10 +// bundled dictionary used when no -f is given +#define MFDES_DEFAULT_DICT "mfdes_default_keys" #define MFDES_BRUTEAID_RESELECT_ATTEMPTS 5 #define MFDES_BRUTEAID_RESELECT_WAIT_MS 200 #define MFDES_BRUTEAID_MAD_START 0xF0000FU @@ -1971,8 +1973,8 @@ static int CmdHF14aDesDetect(const char *Cmd) { CLIParserInit(&ctx, "hf mfdes detect", "Detect key type and tries to find one from the list.", "hf mfdes detect -> detect key 0 from PICC level\n" - "hf mfdes detect --schann d40 -> detect key 0 from PICC level via secure channel D40\n" - "hf mfdes detect -f mfdes_default_keys -> detect key 0 from PICC level with help of the standard dictionary\n" + "hf mfdes detect --schann d40 -> detect key 0 from PICC level via secure channel D40, skipping channel detection\n" + "hf mfdes detect -f my_keys -> detect key 0 from PICC level with your own dictionary\n" "hf mfdes detect --aid 123456 -n 2 --save -> detect key 2 from app 123456 and if succeed - save params to defaults (`default` command)\n" "hf mfdes detect --isoid df01 --save -> detect key 0 and save to defaults with card in the LRP mode"); @@ -1991,7 +1993,7 @@ static int CmdHF14aDesDetect(const char *Cmd) { arg_str0(NULL, "aid", "", "Application ID (3 hex bytes, big endian)"), arg_str0(NULL, "isoid", "", "Application ISO ID (ISO DF ID) (2 hex bytes, big endian)."), arg_str0(NULL, "dfname", "", "Application ISO DF Name (5-16 hex bytes, big endian)"), - arg_str0("f", "file", "", "Filename of dictionary"), + arg_str0("f", "file", "", "Filename of dictionary (default: `" MFDES_DEFAULT_DICT "`)"), arg_lit0(NULL, "save", "Save found key and parameters to defaults"), arg_param_end }; @@ -2020,6 +2022,16 @@ static int CmdHF14aDesDetect(const char *Cmd) { bool save = arg_get_lit(ctx, 15); + // whether the user pinned a secure channel, or we get to detect one + bool schannset = (arg_get_str(ctx, 10)->count > 0); + + // no dictionary given - use the bundled DESFire one. The built-in + // g_mifare_plus_default_keys list is 16 byte AES only, so it can produce + // neither the DES nor the 3K3DES defaults this card family ships with + if (dict_filenamelen == 0) { + dict_filenamelen = snprintf((char *)dict_filename, sizeof(dict_filename), "%s", MFDES_DEFAULT_DICT); + } + SetAPDULogging(APDULogging); CLIParserFree(ctx); @@ -2100,6 +2112,26 @@ static int CmdHF14aDesDetect(const char *Cmd) { } } + // An AES application runs either the EV1/EV2 channel or LRP, and the key + // settings byte reads the same for both, so it takes one probe to tell them + // apart. Without this an LRP card is only caught when the key settings + // happen to be unreadable and the fallback above runs. + if (schannset == false && uselrp == false && keytypes[T_AES]) { + + uselrp = DesfireCheckAuthCmd(selectway, id, dctx.keyNum, MFDES_AUTHENTICATE_EV2F, true); + if (uselrp) { + securechann = DACLRP; + } + + // the probe dropped the field behind us + res = DesfireSelectAndAuthenticateAppW(&dctx, securechann, selectway, id, true, verbose); + if (res != PM3_SUCCESS) { + DropField(); + PrintAndLogEx(FAILED, "Select or authentication %s " _RED_("failed") " after the LRP probe. Result [%d] %s", DesfireWayIDStr(selectway, id), res, DesfireAuthErrorToStr(res)); + return res; + } + } + if (verbose) { if (DesfireMFSelected(selectway, id)) { @@ -2132,27 +2164,28 @@ static int CmdHF14aDesDetect(const char *Cmd) { PrintAndLogEx(INFO, "Scan key type: %s", CLIGetOptionListStr(DesfireAlgoOpts, dctx.keyType)); } - if (dict_filenamelen == 0) { - // keys from mifaredefault.h - for (int i = 0; i < g_mifare_plus_default_keys_len; i++) { + // candidate keys come from the dictionary + uint8_t keyList[MAX_KEYS_LIST_LEN * MAX_KEY_LEN] = {0}; + uint32_t keyListLen = 0; + size_t keylen = desfire_get_key_length(dctx.keyType); + size_t endFilePosition = 0; - uint8_t key[DESFIRE_MAX_KEY_SIZE] = {0}; - if (hex_to_bytes(g_mifare_plus_default_keys[i], key, 16) != 16) { - continue; - } + while (found == false) { - if (ktype == T_3K3DES) { - memcpy(&key[16], key, 8); - } + res = loadFileDICTIONARYEx((char *)dict_filename, keyList, sizeof(keyList), NULL, keylen, &keyListLen, endFilePosition, &endFilePosition, verbose); + if (res != 1 && res != PM3_SUCCESS) { + break; + } - res = DesfireAuthCheck(&dctx, selectway, id, securechann, key); + for (int i = 0; i < keyListLen; i++) { + + res = DesfireAuthCheck(&dctx, selectway, id, securechann, &keyList[i * keylen]); if (res == PM3_SUCCESS) { found = true; break; // all the params already in the dctx } if (res == -10) { - if (verbose) { PrintAndLogEx(ERR, "Can't select AID. There is no connection with card."); } @@ -2174,60 +2207,12 @@ static int CmdHF14aDesDetect(const char *Cmd) { } else { errcount = 0; } + } - } else { - // keys from file - uint8_t keyList[MAX_KEYS_LIST_LEN * MAX_KEY_LEN] = {0}; - uint32_t keyListLen = 0; - size_t keylen = desfire_get_key_length(dctx.keyType); - size_t endFilePosition = 0; - - while (found == false) { - - res = loadFileDICTIONARYEx((char *)dict_filename, keyList, sizeof(keyList), NULL, keylen, &keyListLen, endFilePosition, &endFilePosition, verbose); - if (res != 1 && res != PM3_SUCCESS) { - break; - } - - for (int i = 0; i < keyListLen; i++) { - - res = DesfireAuthCheck(&dctx, selectway, id, securechann, &keyList[i * keylen]); - if (res == PM3_SUCCESS) { - found = true; - break; // all the params already in the dctx - } - - if (res == -10) { - if (verbose) { - PrintAndLogEx(ERR, "Can't select AID. There is no connection with card."); - } - - found = false; - break; // we can't select app after invalid 1st auth stages - } - - if (res == -11) { - - if (errcount > 10) { - if (verbose) { - PrintAndLogEx(ERR, "Too much errors (%zu) from card", errcount); - } - break; - } - errcount++; - - } else { - errcount = 0; - } - - } - - if (endFilePosition == 0) { - break; - } + if (endFilePosition == 0) { + break; } - } if (found) {