diff --git a/CHANGELOG.md b/CHANGELOG.md index 60d625f8b..22900aa96 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac ## [unreleased][unreleased] - Fixed `lf indala clone`, `sim` and `brute` with `--fc`/`--cn` - parity and checksum bits as on genuine cards (@matrix) +- Fixed `hf thinfilm sim` - a second simulation in the same client no longer ends at once with `Done!` (@matrix) +- Added `hf mf supercard -u` - UID change on super card generation 2 (@mishamyte) +- Changed `hf mf supercard` - a refused `-r`/`-u` now exits non-zero instead of reporting success (@mishamyte) - Fixed `wiegand` formats - HPP32, H10320 and S12906b encode as laid out, HGen37 decode checks the right parity bit, the limits of nine formats match their fields, `wiegand list -h` shows its own usage (@matrix) - Fixed `hf secc sim` - the ATQA codes the UID size, so readers that check it select a 7 or 10 byte UID, and a zero UID prints as taken from emulator memory (@matrix) - Fixed `lf keri clone` and `sim` - values the frame can't carry are refused instead of cut, `sim` prints the id and its raw, the help example and the clone hint name `--id` and `lf keri reader` (@matrix) @@ -15,6 +18,7 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac - Fixed `mfulc_des_brute` build on macOS without `openssl@3.6` - OpenSSL is found with `brew --prefix openssl` as in `mfd_aes_brute` (@matrix) - Fixed CI - ProxSpace installs its packages again, WSL builds in its own file system, Ubuntu and CodeQL skip the slow Azure apt mirror (@matrix) - Fixed `recovery.bin` on the AT91 platforms - the bootrom is padded to 0x102000 again, so the OS image is at its load address (@matrix) +- Added `hf mfu info` weak-PRNG backstop - detects counterfeit ULC via RndB collision (@Ryan4n6) - Updated `/Getting_Started_With_PM5.md` (@innocentbystanderproxmark) - Fixed `hf seos pacs`/`write` - 2K3DES GET/UPDATE DATA no longer fails silently with exit 236; print APDU exchange errors, check DES-CMAC, decode SELECT `85` at its real length, and use short-form `85` when the cryptogram is under 128 bytes - Fixed client build with `-march=x86-64-v3` (CentOS/RHEL 10 default) - false `-Wstringop-overflow` in the EMV AID list table (@r3wretrhy) diff --git a/client/src/cmdhfmf.c b/client/src/cmdhfmf.c index 0638d888c..2a9cf55cd 100644 --- a/client/src/cmdhfmf.c +++ b/client/src/cmdhfmf.c @@ -8105,6 +8105,177 @@ static int mfc_supercard_gen2_recovery(uint8_t items, uint8_t tracedata[FURUI_MA return PM3_SUCCESS; } +// super card generation 2, UID write +#define SUPER_GEN2_UID_LEN 7 // UID bytes sent, zero padded +#define SUPER_GEN2_ACK 0x11 // command accepted +#define SUPER_GEN2_COMMITTED 0x22 // halt answer + +// select a super card. Clears the trace when the field is kept, so a later `hf 14a list` holds only the write +static int mfc_supercard_select(bool keep_field_on, iso14a_card_select_t *card) { + + uint32_t flags = ISO14A_CONNECT | ISO14A_NO_RATS; + if (keep_field_on) { + flags |= ISO14A_NO_DISCONNECT | ISO14A_CLEARTRACE; + } + + clearCommandBuffer(); + SendIso14aReader(flags, NULL, 0); + + PacketResponseNG resp; + uint16_t len = 0; + uint8_t sel = 0; + if (WaitForIso14aReply(&resp, 1500, &len, &sel) == false) { + return PM3_ETIMEOUT; + } + + if (sel == 0) { + return PM3_ECARDEXCHANGE; + } + + if (len < sizeof(iso14a_card_select_t)) { + PrintAndLogEx(FAILED, "Short select answer, %u bytes. Client and firmware out of sync?", len); + return PM3_ELENGTH; + } + + memcpy(card, resp.data.asBytes, sizeof(iso14a_card_select_t)); + + if (card->uidlen == 0) { + return PM3_ECARDEXCHANGE; + } + return PM3_SUCCESS; +} + +// one frame of the gen2 UID write. PM3_ECARDEXCHANGE when the card stayed silent, +// PM3_EWRONGANSWER when it answered and refused +static int mfc_supercard_gen2_frame(uint8_t cmd, uint8_t arg, uint8_t status) { + + uint8_t data[2] = {cmd, arg}; + uint32_t flags = ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT; + + clearCommandBuffer(); + SendIso14aReader(flags, data, sizeof(data)); + + PacketResponseNG resp; + uint16_t len = 0; + if (WaitForIso14aReply(&resp, 1500, &len, NULL) == false) { + return PM3_ETIMEOUT; + } + + PrintAndLogEx(DEBUG, "%02X %02X >>> %s", cmd, arg, sprint_hex_inrow(resp.data.asBytes, len)); + + // the device reports a silent card as a zero length answer, not as a timeout + if (len == 0) { + return PM3_ECARDEXCHANGE; + } + + // 18 byte answer on the wire, 16 byte payload plus CRC. Only the payload is required + if (len < 16) { + PrintAndLogEx(FAILED, "Short answer... %s", sprint_hex_inrow(resp.data.asBytes, len)); + return PM3_ELENGTH; + } + + if (resp.data.asBytes[0] != status || resp.data.asBytes[1] != arg) { + PrintAndLogEx(FAILED, "Card answered... %s, expected status %02X arg %02X", + sprint_hex_inrow(resp.data.asBytes, len), status, arg); + return PM3_EWRONGANSWER; + } + return PM3_SUCCESS; +} + +// change UID on a super card generation 2. Knock, UID one byte per command, +// then HLTA, which commits - without it the card discards the write on field drop +static int mfc_supercard_gen2_set_uid(const uint8_t *uid, uint8_t uidlen) { + + static const uint8_t knock[] = {0xF3, 0x2A, 0xBD, 0xEF, 0x01}; + + iso14a_card_select_t old_card = {0}; + + int res = mfc_supercard_select(true, &old_card); + if (res != PM3_SUCCESS) { + if (res == PM3_ETIMEOUT) { + PrintAndLogEx(FAILED, "Device did not answer the select command"); + } else { + PrintAndLogEx(FAILED, "Failed to select card, is it on the antenna?"); + } + DropField(); + return res; + } + + // these parts are physically 4 or 7 byte, the length is not changeable + if (old_card.uidlen != uidlen) { + PrintAndLogEx(FAILED, "Card UID is " _YELLOW_("%u") " bytes, new UID is " _YELLOW_("%u") " bytes", old_card.uidlen, uidlen); + DropField(); + return PM3_EINVARG; + } + + for (uint8_t i = 0; i < ARRAYLEN(knock); i++) { + res = mfc_supercard_gen2_frame(0x30, knock[i], SUPER_GEN2_ACK); + if (res != PM3_SUCCESS) { + if (res == PM3_ECARDEXCHANGE) { + PrintAndLogEx(FAILED, "Card stopped answering at knock command " _YELLOW_("%u") " of %zu", i + 1, ARRAYLEN(knock)); + } else { + PrintAndLogEx(FAILED, "Card rejected knock command " _YELLOW_("%u") " of %zu", i + 1, ARRAYLEN(knock)); + PrintAndLogEx(HINT, "Hint: Are you sure your card is a super card generation 2?"); + } + DropField(); + return res; + } + } + + uint8_t new_uid[SUPER_GEN2_UID_LEN] = {0}; + memcpy(new_uid, uid, uidlen); + + for (uint8_t i = 0; i < SUPER_GEN2_UID_LEN; i++) { + res = mfc_supercard_gen2_frame(0x30, new_uid[i], SUPER_GEN2_ACK); + if (res != PM3_SUCCESS) { + if (res == PM3_ECARDEXCHANGE) { + PrintAndLogEx(FAILED, "Card stopped answering at UID byte " _YELLOW_("%u") " of %u, the write is incomplete", i + 1, SUPER_GEN2_UID_LEN); + PrintAndLogEx(HINT, "Hint: hold the card still on the antenna and run the command again"); + } else { + PrintAndLogEx(FAILED, "Card rejected UID byte " _YELLOW_("%u") " of %u", i + 1, SUPER_GEN2_UID_LEN); + } + DropField(); + return res; + } + } + + // not fatal, the UID read back below decides the outcome + int res_halt = mfc_supercard_gen2_frame(0x50, 0x00, SUPER_GEN2_COMMITTED); + if (res_halt != PM3_SUCCESS) { + PrintAndLogEx(WARNING, "Card did not acknowledge the commit (%d), verifying anyway", res_halt); + } + + DropField(); + + iso14a_card_select_t new_card = {0}; + res = PM3_ETIMEOUT; + + // card is writing, it ignores the first activation attempts + for (uint8_t i = 0; i < 4 && res != PM3_SUCCESS; i++) { + msleep(150); + res = mfc_supercard_select(false, &new_card); + PrintAndLogEx(DEBUG, "verify activation %u... %d", i + 1, res); + } + + if (res != PM3_SUCCESS) { + PrintAndLogEx(FAILED, "Card did not answer after the commit, can't verify the new UID"); + PrintAndLogEx(WARNING, "The write may still have succeeded, the card ignores activation while writing"); + PrintAndLogEx(HINT, "Hint: keep the card on the antenna and run `hf 14a info`"); + return PM3_EPARTIAL; + } + + if (new_card.uidlen != uidlen || memcmp(new_card.uid, uid, uidlen) != 0) { + PrintAndLogEx(FAILED, "Super card UID change [ " _RED_("fail") " ]"); + PrintAndLogEx(INFO, "Card UID... %s", sprint_hex(new_card.uid, new_card.uidlen)); + return PM3_ESOFT; + } + + PrintAndLogEx(SUCCESS, "Old UID... %s", sprint_hex(old_card.uid, old_card.uidlen)); + PrintAndLogEx(SUCCESS, "New UID... %s", sprint_hex(new_card.uid, new_card.uidlen)); + PrintAndLogEx(SUCCESS, "Super card UID change ( " _GREEN_("ok") " )"); + return PM3_SUCCESS; +} + static int CmdHf14AMfSuperCard(const char *Cmd) { CLIParserContext *ctx; CLIParserInit(&ctx, "hf mf supercard", @@ -8116,13 +8287,13 @@ static int CmdHf14AMfSuperCard(const char *Cmd) { void *argtable[] = { arg_param_begin, arg_lit0("r", "reset", "Reset card"), - arg_str0("u", "uid", "", "New UID (4 hex bytes)"), + arg_str0("u", "uid", "", "New UID (4 hex bytes, or 7 on generation 2)"), arg_lit0(NULL, "furui", "Furui detection card"), arg_param_end }; CLIExecWithReturn(ctx, Cmd, argtable, true); bool reset_card = arg_get_lit(ctx, 1); - uint8_t uid[4]; + uint8_t uid[7] = {0}; int uidlen = 0; int res = CLIParamHexToBuf(arg_get_str(ctx, 2), uid, sizeof(uid), &uidlen); bool is_furui = arg_get_lit(ctx, 3); @@ -8130,8 +8301,13 @@ static int CmdHf14AMfSuperCard(const char *Cmd) { CLIParserFree(ctx); // sanity checks - if (res || (!res && uidlen && uidlen != sizeof(uid))) { - PrintAndLogEx(ERR, "UID must include 4 hex bytes"); + if (res) { + PrintAndLogEx(ERR, "UID must be 4 or 7 hex bytes"); + return PM3_EINVARG; + } + + if (uidlen && uidlen != 4 && uidlen != 7) { + PrintAndLogEx(ERR, "UID must be 4 or 7 hex bytes. Got %d", uidlen); return PM3_EINVARG; } @@ -8143,7 +8319,7 @@ static int CmdHf14AMfSuperCard(const char *Cmd) { // no reset on super card FURUI if (uidlen || reset_card) { PrintAndLogEx(FAILED, "Not supported on this card"); - return PM3_SUCCESS; + return PM3_ENOTIMPL; } // read 8 traces @@ -8211,9 +8387,14 @@ static int CmdHf14AMfSuperCard(const char *Cmd) { if (i == SUPER_MAX_TRACES) { // no reset on super card generation 2. - if (uidlen || reset_card) { + if (reset_card) { PrintAndLogEx(FAILED, "Not supported on this card"); - return PM3_SUCCESS; + return PM3_ENOTIMPL; + } + + // change UID on a super card generation 2 + if (uidlen) { + return mfc_supercard_gen2_set_uid(uid, uidlen); } // recover key from collected traces @@ -8231,6 +8412,13 @@ static int CmdHf14AMfSuperCard(const char *Cmd) { // change UID on a super card generation 1 if (uidlen) { + + // generation 1 is 4 byte UID only + if (uidlen != 4) { + PrintAndLogEx(FAILED, "Super card generation 1 UID must be 4 hex bytes"); + return PM3_EINVARG; + } + keep_field_on = false; uint8_t response[6]; int resplen = 0; diff --git a/client/src/cmdhfmfu.c b/client/src/cmdhfmfu.c index 9255a3a21..35c885384 100644 --- a/client/src/cmdhfmfu.c +++ b/client/src/cmdhfmfu.c @@ -2028,6 +2028,69 @@ int mfu_get_version_uid(uint8_t *version, uint8_t *uid) { return PM3_SUCCESS; } +// Weak-PRNG backstop: RndB collision => counterfeit LFSR +#define MFULC_PRNG_SAMPLES 40 +#define MFULC_PRNG_CLEAR 39 + +static int mfulc_prng_test(uint32_t samples) { + if (samples < 2) { + samples = 2; + } + if (samples > 64) { + samples = 64; + } + + uint8_t rndb[64][8]; + uint32_t got = 0; + + for (uint32_t i = 0; i < samples; i++) { + iso14a_card_select_t card; + if (ul_select(&card) == false) { + continue; + } + uint8_t nonce[11] = {0x00}; + int rl = ulc_requestAuthentication(nonce, sizeof(nonce)); + DropField(); + // response is AF || ek(RndB)[8] || CRC[2]; compare the 8-byte ek(RndB) + if (rl < 9 || nonce[0] != 0xAF) { + continue; + } + memcpy(rndb[got], &nonce[1], 8); + got++; + } + + if (got < 2) { + PrintAndLogEx(INFO, "PRNG......... could not collect nonces (got %u)", got); + return PM3_ESOFT; + } + + uint32_t first_dup = 0; + uint32_t dups = 0; + for (uint32_t i = 0; i < got; i++) { + for (uint32_t j = 0; j < i; j++) { + if (memcmp(rndb[i], rndb[j], 8) == 0) { + if (first_dup == 0) { + first_dup = i + 1; // 1-based draw index + } + dups++; + break; + } + } + } + + if (dups > 0) { + PrintAndLogEx(SUCCESS, "PRNG......... " _RED_("Weak") " (RndB collision at %u)", first_dup); + return PM3_SUCCESS; + } + + if (got >= MFULC_PRNG_CLEAR) { + PrintAndLogEx(SUCCESS, "PRNG......... " _GREEN_("Genuine")); + } else { + PrintAndLogEx(INFO, "PRNG......... inconclusive (%u/%u nonces)", got, (uint32_t)MFULC_PRNG_CLEAR); + } + return PM3_SUCCESS; +} + static int mfulc_fingerprint(void) { iso14a_card_select_t card; PacketResponseNG resp; @@ -2139,6 +2202,8 @@ static int mfulc_fingerprint(void) { } } } + // weak-PRNG backstop + mfulc_prng_test(MFULC_PRNG_SAMPLES); PrintAndLogEx(INFO, "likely MF0ICU2"); DropField(); return PM3_SUCCESS; diff --git a/client/src/cmdhfthinfilm.c b/client/src/cmdhfthinfilm.c index 54e4699a2..141b1d67e 100644 --- a/client/src/cmdhfthinfilm.c +++ b/client/src/cmdhfthinfilm.c @@ -179,9 +179,17 @@ int CmdHfThinFilmSim(const char *Cmd) { data[data_len++] = b1; } + // end a simulation still running from an earlier call and drop its reply + PacketResponseNG resp; + clearCommandBuffer(); + SendCommandNG(CMD_PING, NULL, 0); + if (WaitForResponseTimeout(CMD_PING, &resp, 3000) == false) { + PrintAndLogEx(WARNING, "command execution time out"); + return PM3_ETIMEOUT; + } + clearCommandBuffer(); SendCommandNG(CMD_HF_THINFILM_SIMULATE, (uint8_t *)&data, data_len); - PacketResponseNG resp; PrintAndLogEx(SUCCESS, "press " _GREEN_("pm3 button") " to abort simulation"); int ret; diff --git a/doc/commands.json b/doc/commands.json index f0d58f25e..9c22c6718 100644 --- a/doc/commands.json +++ b/doc/commands.json @@ -7102,7 +7102,7 @@ "options": [ "-h, --help This help", "-r, --reset Reset card", - "-u, --uid New UID (4 hex bytes)", + "-u, --uid New UID (4 hex bytes, or 7 on generation 2)", "--furui Furui detection card" ], "usage": "hf mf supercard [-hr] [-u ] [--furui]" diff --git a/doc/magic_cards_notes.md b/doc/magic_cards_notes.md index 76dbe9e55..de9039cb9 100644 --- a/doc/magic_cards_notes.md +++ b/doc/magic_cards_notes.md @@ -1698,6 +1698,39 @@ CF CE <1b block number> // Backdoor read 16b block CF FE <4b new_password> // Change password ``` +UID write without the Gen4 backdoor, all frames raw ISO14443-A with CRC, in one field session +after a normal anticollision + select: + +``` +30 F3 // knock, 5 commands +30 2A +30 BD +30 EF +30 01 +30 // new UID, one byte per command +30 // always 7 commands, zero padded for a 4b UID +... +50 00 // HLTA, commits the write +``` + +Every command is answered with 16 bytes plus CRC: status byte, the echoed argument, the CRC of +the command frame the reader sent, then 12 bytes constant for the session. Status is `11` while +accepting commands and `22` on the halt. + +``` +Rdr |30 5D 62 21| +Tag |11 5D 62 21 6000720F 8CB1A65B E3553815|+crc +Rdr |50 00 57 CD| +Tag |22 00 57 CD 6000720F 8CB1A65B E3553815|+crc +``` + +The halt is the commit. A compliant tag stays silent on HLTA, this one answers, and without it +the card discards everything above when the field drops. Afterwards the card is busy writing: +the next WUPA gets no answer and the one after that returns the new UID, so allow ~150ms and +more than one activation attempt. + +The UID length can't be changed, the parts are physically 4b or 7b. + ### MIFARE Classic Super Furui ^[Top](#top) @@ -1764,6 +1797,9 @@ hf mf info [usb] pm3 --> hf mf supercard --furui ... + +[usb] pm3 --> hf mf supercard -u 11223344 +... ``` # MIFARE Ultralight