diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c index 070d691d1..f81faec4b 100644 --- a/armsrc/mifarecmd.c +++ b/armsrc/mifarecmd.c @@ -287,7 +287,7 @@ static int MifareUFastRead0(void) { // 1 = failed auth // 0 = correct -static uint8_t chkKey3Pass(uint8_t keyno, uint8_t *keybytes, bool use_schann, bool try_auth, bool check_answer, bool use_fastread0, uint8_t *nonce) { +static uint8_t chkKey3Pass(uint8_t keyno, uint8_t *keybytes, bool use_schann, bool try_auth, bool check_answer, bool use_fastread0, uint8_t *nonce, uint8_t available_pairs, uint8_t *pairs) { uint8_t i = 0, res = 2; bool selected = false; @@ -313,7 +313,7 @@ static uint8_t chkKey3Pass(uint8_t keyno, uint8_t *keybytes, bool use_schann, bo if (g_dbglevel >= DBG_EXTENDED) Dbhexdump(MIFAREU3P_KEY_SIZE, keybytes, false); if (keyno == MIFAREULC_KEY_INDEX) { - res = mifare_ultra_3des_auth(keybytes, try_auth, check_answer, nonce) == 1 ? 0 : 1; // 0 = correct, 1 = failed auth + res = mifare_ultra_3des_auth(keybytes, try_auth, check_answer, nonce, available_pairs, pairs) == 1 ? 0 : 1; // 0 = correct, 1 = failed auth } else { res = mifare_ultra_aes_auth(keyno, keybytes, use_schann, try_auth, check_answer, nonce) == 1 ? 0 : 1; // 0 = correct, 1 = failed auth } @@ -357,7 +357,7 @@ void MifareU3PassAuth(mful_3passauth_t *packet) { FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); SpinDelayUsPrecision(500); } - if (chkKey3Pass(packet->keyno, packet->key, packet->use_schann, packet->try_auth, packet->check_answer, packet->use_fastread0, packet->get_nonces ? (rpayload.nonces + auths * nonce_size) : NULL) == 0) { + if (chkKey3Pass(packet->keyno, packet->key, packet->use_schann, packet->try_auth, packet->check_answer, packet->use_fastread0, packet->get_nonces ? (rpayload.nonces + auths * nonce_size) : NULL, packet->available_pairs, packet->pairs) == 0) { if (packet->try_auth) { auths++; res = PM3_SUCCESS; @@ -464,7 +464,7 @@ void MifareU3PassChkKeys(mful_3passchk_t *packet) { memcpy(fullkeybytes + (packet->segment * keysize), packet->data + (i * keysize), keysize); } } - if (chkKey3Pass(packet->key_index, fullkeybytes, false, true, packet->check_answer, packet->use_fastread0, NULL) == 0) { + if (chkKey3Pass(packet->key_index, fullkeybytes, false, true, packet->check_answer, packet->use_fastread0, NULL, 0, NULL) == 0) { auths++; foundkeys++; memcpy(rpayload.key, fullkeybytes, MIFAREU3P_KEY_SIZE); @@ -512,7 +512,7 @@ void MifareUReadBlock(mful_readblock_t *packet) { // UL-C authentication if (useCKey) { - if (mifare_ultra_3des_auth(packet->key, true, true, NULL) == 0) { + if (mifare_ultra_3des_auth(packet->key, true, true, NULL, 0, NULL) == 0) { OnErrorNG(CMD_HF_MIFAREU_READBL, PM3_ESOFT); return; } @@ -593,7 +593,7 @@ void MifareUReadCard(mful_readblock_t *packet) { // UL-C authentication if (useCKey) { - if (mifare_ultra_3des_auth(packet->key, true, true, NULL) == 0) { + if (mifare_ultra_3des_auth(packet->key, true, true, NULL, 0, NULL) == 0) { OnErrorNG(CMD_HF_MIFAREU_READCARD, PM3_ESOFT); return; } @@ -779,7 +779,7 @@ static void MifareUWriteBlockEx(mful_writeblock_t *packet, bool reply) { // UL-C authentication if (useCKey) { - if (mifare_ultra_3des_auth(packet->key, true, true, NULL) == 0) { + if (mifare_ultra_3des_auth(packet->key, true, true, NULL, 0, NULL) == 0) { OnErrorNG(CMD_HF_MIFAREU_READBL, PM3_ESOFT); return; } @@ -863,7 +863,7 @@ void MifareUWriteBlockCompat(mful_writeblock_t *packet) { // UL-C authentication if (useCKey) { - if (mifare_ultra_3des_auth(packet->key, true, true, NULL) == 0) { + if (mifare_ultra_3des_auth(packet->key, true, true, NULL, 0, NULL) == 0) { OnErrorNG(CMD_HF_MIFAREU_WRITEBL_COMPAT, PM3_ESOFT); return; } @@ -938,7 +938,7 @@ void MifareUSetKey(mful_setkey_t *packet) { // UL-C authentication if (useCKey && packet->has_auth_key) { - if (mifare_ultra_3des_auth(packet->auth_key, true, true, NULL) == 0) { + if (mifare_ultra_3des_auth(packet->auth_key, true, true, NULL, 0, NULL) == 0) { OnErrorNG(CMD_HF_MIFAREU_SETKEY, PM3_ESOFT); return; } diff --git a/armsrc/mifareutil.c b/armsrc/mifareutil.c index 9b15e4a10..e223b14fb 100644 --- a/armsrc/mifareutil.c +++ b/armsrc/mifareutil.c @@ -402,7 +402,7 @@ int mifare_ul_ev1_auth(uint8_t *keybytes, uint8_t *pack) { return 1; } -int mifare_ultra_3des_auth(uint8_t *keybytes, bool try_auth, bool check_answer, uint8_t *nonce) { +int mifare_ultra_3des_auth(uint8_t *keybytes, bool try_auth, bool check_answer, uint8_t *nonce, uint8_t available_pairs, uint8_t *pairs) { /// 3des2k uint8_t random_a[8] = {1, 1, 1, 1, 1, 1, 1, 2}; @@ -429,6 +429,20 @@ int mifare_ultra_3des_auth(uint8_t *keybytes, bool try_auth, bool check_answer, if (!try_auth) { return 1; } + if (available_pairs > 0) { + for (uint8_t i = 0; i < available_pairs; i++) { + if (memcmp(pairs + i * (8 + 16), resp + 1, 8) == 0) { + if (g_dbglevel >= DBG_EXTENDED) { + Dbprintf("Known nonce found"); + Dbhexdump(8, resp + 1, false); + } + len = mifare_sendcmd(MIFARE_ULC_AUTH_2, pairs + i * (8 + 16) + 8, 16, resp, sizeof(resp), respPar, NULL); + return len == 11; + } + } + return 0; + } + // decrypt nonce. tdes_nxp_receive((void *)(resp + 1), (void *)random_b, sizeof(random_b), (const void *)key, IV, 2); rol(random_b, 8); diff --git a/armsrc/mifareutil.h b/armsrc/mifareutil.h index f3b952d14..9cc0fe766 100644 --- a/armsrc/mifareutil.h +++ b/armsrc/mifareutil.h @@ -104,7 +104,7 @@ int mifare_classic_value(struct Crypto1State *pcs, uint8_t blockNo, uint8_t *blo // Ultralight/NTAG... int mifare_ul_ev1_auth(uint8_t *keybytes, uint8_t *pack); -int mifare_ultra_3des_auth(uint8_t *keybytes, bool try_auth, bool check_answer, uint8_t *nonce); +int mifare_ultra_3des_auth(uint8_t *keybytes, bool try_auth, bool check_answer, uint8_t *nonce, uint8_t available_pairs, uint8_t *pairs); int mifare_ultra_aes_auth(uint8_t keyno, uint8_t *keybytes, bool schann, bool try_auth, bool check_answer, uint8_t *nonce); int mifare_ultra_readblock(uint8_t blockNo, uint8_t *blockData); int mifare_ultra_writeblock_compat(uint8_t blockNo, uint8_t *blockData); diff --git a/client/pyscripts/mfulc_counterfeit_recovery.py b/client/pyscripts/mfulc_counterfeit_recovery.py index f6086d9cc..15c7ac768 100755 --- a/client/pyscripts/mfulc_counterfeit_recovery.py +++ b/client/pyscripts/mfulc_counterfeit_recovery.py @@ -26,6 +26,9 @@ from typing import Optional, Set from pm3_resources import find_tool +legacy_collect = False +legacy_unlock = False + required_version = (3, 8) if sys.version_info < required_version: print(f"Python version: {sys.version}") @@ -247,39 +250,62 @@ def try_unlock(num_challenges: int, dict_erndberndarndb: dict, p) -> bool: challenges_collected = 0 next_progress = 10 - print("[=] Waiting for the provided challenge to appear...") - while challenges_collected < max(1, num_challenges): - p.console("hf 14a raw -sck 1A00") - challenge = p.grabbed_output.split() - if (len(challenge) > 8) and (challenge[1] == "AF"): - hex_challenge = "".join(challenge[2:10]).upper() - # print(hex_challenge, erndb) - challenges_collected += 1 - progress = challenges_collected * 100 // max(1, num_challenges) - if progress >= next_progress: - print(f"[=] Progress: {min(progress, 100)}%") - next_progress += 10 - if hex_challenge in dict_erndberndarndb: - p.console(f"hf 14a raw -ck AF{dict_erndberndarndb[hex_challenge]}") - response = p.grabbed_output.split() - if (len(response) > 8) and (response[1] == "00"): - print("[+] Unlock successful!") - # Rewrite AUTH0 - p.console("hf 14a raw -c a2 2a 30000000") + if legacy_unlock: + print("[=] Waiting for the provided challenge to appear...") + while challenges_collected < max(1, num_challenges): + p.console("hf 14a raw -sck 1A00") + challenge = p.grabbed_output.split() + if (len(challenge) > 8) and (challenge[1] == "AF"): + hex_challenge = "".join(challenge[2:10]).upper() + # print(hex_challenge, erndb) + challenges_collected += 1 + progress = challenges_collected * 100 // max(1, num_challenges) + if progress >= next_progress: + print(f"[=] Progress: {min(progress, 100)}%") + next_progress += 10 + if hex_challenge in dict_erndberndarndb: + p.console(f"hf 14a raw -ck AF{dict_erndberndarndb[hex_challenge]}") response = p.grabbed_output.split() - if response[1] == "0A": - print("[+] AUTH0 reset successful!") - return True + if (len(response) > 8) and (response[1] == "00"): + print("[+] Unlock successful!") + # Rewrite AUTH0 + p.console("hf 14a raw -c a2 2a 30000000") + response = p.grabbed_output.split() + if response[1] == "0A": + print("[+] AUTH0 reset successful!") + return True + else: + print("[-] AUTH0 reset failed") + print(response) + return False else: - print("[-] AUTH0 reset failed") - print(response) + print("[-] Unlock failed") + p.console("hf 14a reader --drop", capture=False) return False - else: - print("[-] Unlock failed") - p.console("hf 14a reader --drop", capture=False) - return False - p.console("hf 14a reader --drop", capture=False) - print("[-] Provided challenge not found, try again") + p.console("hf 14a reader --drop", capture=False) + print("[-] Provided challenge not found, try again") + + else: + p.console(f"hf mfu cauth --read0 --retries {num_challenges - 1} --reset -k --pair " + + " --pair ".join([x + y for x, y in dict_erndberndarndb.items()])) + result = p.grabbed_output.split() + if 'ok' in result: + print("[+] Unlock successful!") + # Rewrite AUTH0 + p.console("hf 14a raw -c a2 2a 30000000") + response = p.grabbed_output.split() + if response[1] == "0A": + print("[+] AUTH0 reset successful!") + return True + else: + print("[-] AUTH0 reset failed") + print(response) + return False + else: + print("[-] Unlock failed") + p.console("hf 14a reader --drop", capture=False) + return False + return False @@ -568,7 +594,6 @@ def main(): if uid is None: return common_nonces = [] - legacy_collect = False if legacy_collect: max_occurrence, challenges = collect_100(num_challenges, p, early_stop=False) if max_occurrence <= 1: diff --git a/client/src/cmdhfmfu.c b/client/src/cmdhfmfu.c index bcb0b3aac..2a496c254 100644 --- a/client/src/cmdhfmfu.c +++ b/client/src/cmdhfmfu.c @@ -524,7 +524,7 @@ Default AES key is 00-00h. Both the data and UID one. Data key is 00, UID is 01. Authenticity is 02h Auth is 1A[Key ID][CRC] - AF[RndB] - AF[RndA][RndB'] - 00[RndA'] */ -static int ul3pass_authentication(const uint8_t *key, uint8_t keyno, bool switch_off_field, int retries, uint32_t *auths, uint32_t *ms, bool schann, bool try_auth, bool check_answer, bool use_fastread0, bool get_nonces, uint8_t* nonces, bool reset_field) { +static int ul3pass_authentication(const uint8_t *key, uint8_t keyno, bool switch_off_field, int retries, uint32_t *auths, uint32_t *ms, bool schann, bool try_auth, bool check_answer, bool use_fastread0, bool get_nonces, uint8_t* nonces, bool reset_field, uint8_t available_pairs, uint8_t* pairs) { // keyno < 3: ULAES // keyno = 3: ULC mful_3passauth_t payload = { @@ -537,10 +537,13 @@ static int ul3pass_authentication(const uint8_t *key, uint8_t keyno, bool switch .reset_field = reset_field, .keyno = keyno, .retries = retries, + .available_pairs = available_pairs, }; memcpy(payload.key, key, sizeof(payload.key)); + int pairs_bytecount = (keyno == 3 ? 8 + 16 : 16 + 32) * MIN(available_pairs, keyno == 3 ? 10 : 5); + memcpy(payload.pairs, pairs, pairs_bytecount); clearCommandBuffer(); - SendCommandNG(CMD_HF_MIFAREU3P_AUTH, (uint8_t *)&payload, sizeof(payload)); + SendCommandNG(CMD_HF_MIFAREU3P_AUTH, (uint8_t *)&payload, sizeof(payload) - sizeof(payload.pairs) + pairs_bytecount); PacketResponseNG resp; if (WaitForResponseTimeout(CMD_HF_MIFAREU3P_AUTH, &resp, 1500 + (retries * 15)) == false) { return PM3_ETIMEOUT; @@ -644,7 +647,7 @@ static int try_default_3des_keys(bool override, uint8_t **correct_key, bool use_ for (uint8_t i = 0; i < ARRAYLEN(default_3des_keys); ++i) { uint8_t *key = default_3des_keys[i]; - if (ul3pass_authentication(key, MIFAREULC_KEY_INDEX, true, 0, NULL, NULL, false, true, true, use_fastread0, false, NULL, false) == PM3_SUCCESS) { + if (ul3pass_authentication(key, MIFAREULC_KEY_INDEX, true, 0, NULL, NULL, false, true, true, use_fastread0, false, NULL, false, 0, NULL) == PM3_SUCCESS) { *correct_key = key; res = PM3_SUCCESS; break; @@ -681,7 +684,7 @@ static int try_default_aes_keys(bool override, bool use_schann, bool use_fastrea for (uint8_t keyno = 0; keyno < 3; keyno++) { - if (ul3pass_authentication(key, keyno, true, 0, NULL, NULL, use_schann, true, true, use_fastread0, false, NULL, false) == PM3_SUCCESS) { + if (ul3pass_authentication(key, keyno, true, 0, NULL, NULL, use_schann, true, true, use_fastread0, false, NULL, false, 0, NULL) == PM3_SUCCESS) { char keystr[20] = {0}; switch (keyno) { @@ -721,13 +724,13 @@ static int ul_auth_select(iso14a_card_select_t *card, uint64_t tagtype, bool has bool use_fastread0 = false; if (hasAuthKey && (tagtype & MFU_TT_UL_C)) { //will select card automatically and close connection on error - if (ul3pass_authentication(authkey, MIFAREULC_KEY_INDEX, false, 0, NULL, NULL, false, true, true, use_fastread0, false, NULL, false) != PM3_SUCCESS) { + if (ul3pass_authentication(authkey, MIFAREULC_KEY_INDEX, false, 0, NULL, NULL, false, true, true, use_fastread0, false, NULL, false, 0, NULL) != PM3_SUCCESS) { PrintAndLogEx(WARNING, "Authentication Failed UL-C"); return PM3_ESOFT; } } else if (hasAuthKey && (tagtype & MFU_TT_UL_AES)) { //will select card automatically and close connection on error - if (ul3pass_authentication(authkey, 0, false, 0, NULL, NULL, use_schann, true, true, use_fastread0, false, NULL, false) != PM3_SUCCESS) { + if (ul3pass_authentication(authkey, 0, false, 0, NULL, NULL, use_schann, true, true, use_fastread0, false, NULL, false, 0, NULL) != PM3_SUCCESS) { PrintAndLogEx(WARNING, "Authentication Failed UL-AES"); return PM3_ESOFT; } @@ -4569,6 +4572,7 @@ static int CmdHF14AMfUCAuth(const char *Cmd) { arg_lit0(NULL, "noauth", "Skip authentication (when collecting nonces)"), arg_lit0(NULL, "reset", "Reset field between each attempt"), arg_lit0(NULL, "collect", "Collect nonces and show top 10"), + arg_strx0(NULL, "pair", "", "Nonce pair (option can be provided up to 10 times)"), arg_param_end }; CLIExecWithReturn(ctx, Cmd, argtable, true); @@ -4585,7 +4589,20 @@ static int CmdHF14AMfUCAuth(const char *Cmd) { bool skip_auth = arg_get_lit(ctx, 7); bool reset_field = arg_get_lit(ctx, 8); bool collect_nonces = arg_get_lit(ctx, 9); + int available_pairs = 0; + int pairs_bytecount = 0; + uint8_t pairs[(8 + 16) * 10] = {0}; + CLIGetHexWithReturn(ctx, 10, pairs, &pairs_bytecount); CLIParserFree(ctx); + available_pairs = pairs_bytecount / (8 + 16); + if (available_pairs * (8 + 16) != pairs_bytecount) { + PrintAndLogEx(WARNING, "Invalid nonce pairs provided, byte count does not match expected size"); + return PM3_EINVARG; + } + if (available_pairs > 10) { + PrintAndLogEx(WARNING, "Too many nonce pairs provided"); + return PM3_EINVARG; + } if (ak_len != 16 && ak_len != 0) { PrintAndLogEx(WARNING, "ERROR: Key is incorrect length"); @@ -4595,7 +4612,7 @@ static int CmdHF14AMfUCAuth(const char *Cmd) { PrintAndLogEx(ERR, "Invalid retries (must be 0..10000)"); return PM3_EINVARG; } - if ((retries > 0) && (ak_len == 0) && !skip_auth) { + if ((retries > 0) && (ak_len == 0) && !skip_auth && available_pairs == 0) { PrintAndLogEx(WARNING, "ERROR: Key is required for retries"); return PM3_EINVARG; } @@ -4603,6 +4620,10 @@ static int CmdHF14AMfUCAuth(const char *Cmd) { PrintAndLogEx(WARNING, "ERROR: Key is required for nocheck"); return PM3_EINVARG; } + if ((available_pairs > 0) && (ak_len > 0)) { + PrintAndLogEx(WARNING, "ERROR: Key and pairs are mutually exclusive"); + return PM3_EINVARG; + } if (skip_auth && !collect_nonces) { PrintAndLogEx(WARNING, "ERROR: noauth option only valid with collect option"); @@ -4628,7 +4649,7 @@ static int CmdHF14AMfUCAuth(const char *Cmd) { uint32_t ms = 0; // If no hex key is specified, try default keys - if (ak_len == 0 && !collect_nonces && !skip_auth) { + if (ak_len == 0 && !collect_nonces && !skip_auth && available_pairs == 0) { PrintAndLogEx(INFO, "Called with no key, checking default keys..."); isok = try_default_3des_keys(false, &auth_key_ptr, use_fastread0); @@ -4641,7 +4662,7 @@ static int CmdHF14AMfUCAuth(const char *Cmd) { // Not strictly needed, but to avoid fw warning max_retries_per_call = ((PM3_CMD_DATA_SIZE - sizeof(uint32_t) * 2) / sizeof(uint64_t)) - 1; } - isok = ul3pass_authentication(auth_key_ptr, MIFAREULC_KEY_INDEX, !keep_field_on, MIN(retries - auths, max_retries_per_call), &auths, &ms, false, !skip_auth, check_answer, use_fastread0, collect_nonces, nonces + auths * sizeof(uint64_t), reset_field); + isok = ul3pass_authentication(auth_key_ptr, MIFAREULC_KEY_INDEX, !keep_field_on, MIN(retries - auths, max_retries_per_call), &auths, &ms, false, !skip_auth, check_answer, use_fastread0, collect_nonces, nonces + auths * sizeof(uint64_t), reset_field, available_pairs, pairs); } while (skip_auth && auths < 1 + retries); } @@ -4651,7 +4672,11 @@ static int CmdHF14AMfUCAuth(const char *Cmd) { if (!skip_auth) { if (isok == PM3_SUCCESS) { - PrintAndLogEx(SUCCESS, "Authentication 3DES key... " _GREEN_("%s") " ( " _GREEN_("ok")" )", sprint_hex_inrow(auth_key_ptr, 16)); + if (available_pairs > 0) { + PrintAndLogEx(SUCCESS, "Authentication 3DES with nonce pair... " _GREEN_("ok")); + } else { + PrintAndLogEx(SUCCESS, "Authentication 3DES key... " _GREEN_("%s") " ( " _GREEN_("ok")" )", sprint_hex_inrow(auth_key_ptr, 16)); + } } else { PrintAndLogEx(WARNING, "Authentication ( " _RED_("fail") " )"); } @@ -4852,7 +4877,7 @@ static int CmdHF14AMfUAESAuth(const char *Cmd) { uint32_t auths = 0; uint32_t ms = 0; - int result = ul3pass_authentication(auth_key_ptr, key_index, !keep_field_on, retries, &auths, &ms, use_schann, true , check_answer, use_fastread0, false, NULL, false); + int result = ul3pass_authentication(auth_key_ptr, key_index, !keep_field_on, retries, &auths, &ms, use_schann, true, check_answer, use_fastread0, false, NULL, false, 0, NULL); if (result == PM3_SUCCESS) { PrintAndLogEx(SUCCESS, "Authentication with " _YELLOW_("%s") " " _GREEN_("%s") " ( " _GREEN_("ok")" )" , key_type[key_index] diff --git a/doc/commands.json b/doc/commands.json index 77576f75c..fcf6e09ec 100644 --- a/doc/commands.json +++ b/doc/commands.json @@ -1982,17 +1982,26 @@ }, "hf 15 reader": { "command": "hf 15 reader", - "description": "Act as a ISO-15693 reader. Look for ISO-15693 tags until Enter or the pm3 button is pressed", + "description": "Act as a ISO-15693 reader. Look for ISO-15693 tags until is pressed Use --all to perform 16-slot inventory with anti-collision tree walking to discover all tags in the field.", "notes": [ "hf 15 reader", - "hf 15 reader -@ -> Continuous mode" + "hf 15 reader -@ -> continuous mode", + "hf 15 reader --afi 01 -> filter by AFI", + "hf 15 reader -2 -> slower '1 out of 256' mode", + "hf 15 reader --all -> find all tags (16-slot anti-collision)", + "hf 15 reader --all -@ -> continuously scan for all tags", + "hf 15 reader --all --afi 01 -> find all tags with AFI filter", + "hf 15 reader --all -2 -> find all tags, slow mode" ], "offline": false, "options": [ "-h, --help This help", - "-@ continuous reader mode" + "-@ continuous reader mode", + "--all find all tags using 16-slot anti-collision", + "--afi Application Family Identifier (1 byte)", + "-2 use slower '1 out of 256' mode" ], - "usage": "hf 15 reader [-h@]" + "usage": "hf 15 reader [-h@2] [--all] [--afi ]" }, "hf 15 restore": { "command": "hf 15 restore", @@ -8608,13 +8617,16 @@ "-h, --help This help", "--key Authentication key (16 bytes in hex)", "-l Swap entered key's endianness", - "-k Keep field on (only if a key is provided)", + "-k Keep field on at the end (only if a key is provided)", "-r, --retries Number of retries with provided key (def: 0)", "-n, --nocheck Skip checking tag answer correctness (only if a key is provided)", "-0, --read0 Use fast READ0 (skip anticol)", - "-c, --collect Collect nonces and show top 10 (def: 0, no collection)" + "--noauth Skip authentication (when collecting nonces)", + "--reset Reset field between each attempt", + "--collect Collect nonces and show top 10", + "--pair Nonce pair (option can be provided up to 10 times)" ], - "usage": "hf mfu cauth [-hlkn0] [--key ] [-r ] [-c ]" + "usage": "hf mfu cauth [-hlkn0] [--key ] [-r ] [--noauth] [--reset] [--collect] [--pair ]..." }, "hf mfu cchk": { "command": "hf mfu cchk", @@ -15373,6 +15385,6 @@ "metadata": { "commands_extracted": 865, "extracted_by": "PM3Help2JSON v1.00", - "extracted_on": "2026-06-07T20:59:30+00:00" + "extracted_on": "2026-06-09T23:01:19+00:00" } } diff --git a/include/pm3_cmd.h b/include/pm3_cmd.h index a3889391b..7fecb93f0 100644 --- a/include/pm3_cmd.h +++ b/include/pm3_cmd.h @@ -384,9 +384,11 @@ typedef struct { uint16_t use_fastread0 : 1; uint16_t get_nonces : 1; uint16_t reset_field : 1; - uint16_t reserved : 7; + uint16_t available_pairs : 4; + uint16_t reserved : 3; uint16_t retries; uint8_t key[16]; + uint8_t pairs[(8 + 16) * 10]; // up to 10 pairs of ULC ERndB:ERndARndBp, 5 pairs of ULAES } PACKED mful_3passauth_t; enum {