diff --git a/CHANGELOG.md b/CHANGELOG.md index 44261caae..005dfef4c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ 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 iclass encode` / `hf iclass tagsim` / `hf mf encodehid` / `lf hid sim` / `lf hid clone` / `lf hid brute` - `--cn` was read with a 32 bit getter, silently truncating card numbers of wide formats like H10302 (@iceman1001) - Changed `hf mf eload` - the device now zeroes the emulator memory before the upload (@iceman1001) - Fixed `hf mf sim` / `hf 14a sim` - the anticollision responses were prepared in BigBuf before `iso14443a_setup()` (@iceman1001) - Changed `CAPABILITIES_VERSION` to 10 - `hf mf eload` sends a flags byte the device did not have before, so client and firmware must be flashed as a pair (@iceman1001) diff --git a/client/src/cmdhficlass.c b/client/src/cmdhficlass.c index a5fb913e5..306d5bd93 100644 --- a/client/src/cmdhficlass.c +++ b/client/src/cmdhficlass.c @@ -1338,7 +1338,7 @@ static int CmdHFiClassTagSim(const char *Cmd) { wiegand_card_t card; memset(&card, 0, sizeof(wiegand_card_t)); card.FacilityCode = arg_get_u32_def(ctx, 2, 0); - card.CardNumber = arg_get_u32_def(ctx, 3, 0); + card.CardNumber = arg_get_u64_def(ctx, 3, 0); card.IssueLevel = arg_get_u32_def(ctx, 4, 0); // --- binary string @@ -7675,7 +7675,7 @@ static int CmdHFiClassEncode(const char *Cmd) { memset(&card, 0, sizeof(wiegand_card_t)); card.FacilityCode = arg_get_u32_def(ctx, 8, 0); - card.CardNumber = arg_get_u32_def(ctx, 9, 0); + card.CardNumber = arg_get_u64_def(ctx, 9, 0); card.IssueLevel = arg_get_u32_def(ctx, 10, 0); char format[16] = {0}; diff --git a/client/src/cmdhfmf.c b/client/src/cmdhfmf.c index a72a6b5c6..645af0b42 100644 --- a/client/src/cmdhfmf.c +++ b/client/src/cmdhfmf.c @@ -11256,7 +11256,7 @@ static int CmdHFMFHidEncode(const char *Cmd) { wiegand_card_t card; memset(&card, 0, sizeof(wiegand_card_t)); card.FacilityCode = arg_get_u32_def(ctx, 4, 0); - card.CardNumber = arg_get_u32_def(ctx, 5, 0); + card.CardNumber = arg_get_u64_def(ctx, 5, 0); char format[16] = {0}; int format_len = 0; diff --git a/client/src/cmdlfhid.c b/client/src/cmdlfhid.c index 8093f46c5..8709891fa 100644 --- a/client/src/cmdlfhid.c +++ b/client/src/cmdlfhid.c @@ -346,7 +346,7 @@ static int CmdHIDSim(const char *Cmd) { memset(&cli, 0, sizeof(cli)); CLIParamStrToBuf(arg_get_str(ctx, 1), (uint8_t *)cli.format, sizeof(cli.format), &cli.format_len); cli.card.FacilityCode = arg_get_u32_def(ctx, 2, 0); - cli.card.CardNumber = arg_get_u32_def(ctx, 3, 0); + cli.card.CardNumber = arg_get_u64_def(ctx, 3, 0); cli.card.IssueLevel = arg_get_u32_def(ctx, 4, 0); cli.card.OEM = arg_get_u32_def(ctx, 5, 0); int res = CLIParamHexToBuf(arg_get_str(ctx, 6), cli.raw, sizeof(cli.raw), &cli.raw_len); @@ -435,7 +435,7 @@ static int CmdHIDClone(const char *Cmd) { memset(&cli, 0, sizeof(cli)); CLIParamStrToBuf(arg_get_str(ctx, 1), (uint8_t *)cli.format, sizeof(cli.format), &cli.format_len); cli.card.FacilityCode = arg_get_u32_def(ctx, 2, 0); - cli.card.CardNumber = arg_get_u32_def(ctx, 3, 0); + cli.card.CardNumber = arg_get_u64_def(ctx, 3, 0); cli.card.IssueLevel = arg_get_u32_def(ctx, 4, 0); cli.card.OEM = arg_get_u32_def(ctx, 5, 0); int res = CLIParamHexToBuf(arg_get_str(ctx, 6), cli.raw, sizeof(cli.raw), &cli.raw_len); @@ -586,7 +586,7 @@ static int CmdHIDBrute(const char *Cmd) { CLIParamStrToBuf(arg_get_str(ctx, 3), (uint8_t *)field, sizeof(field), &field_len); card_hi.FacilityCode = arg_get_u32_def(ctx, 4, 0); - card_hi.CardNumber = arg_get_u32_def(ctx, 5, 0); + card_hi.CardNumber = arg_get_u64_def(ctx, 5, 0); card_hi.IssueLevel = arg_get_u32_def(ctx, 6, 0); card_hi.OEM = arg_get_u32_def(ctx, 7, 0);