From 134f09be5eb2fbbe76a3cc07890a866f9f2773c7 Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Mon, 17 Jul 2023 17:46:27 +0200 Subject: [PATCH] style --- armsrc/iso14443a.c | 18 ++++++------ client/src/cmdhf14a.c | 64 +++++++++++++++++++++---------------------- client/src/cmdhfvas.c | 24 ++++++++-------- doc/commands.json | 17 ++++++++---- include/mifare.h | 6 ++-- 5 files changed, 67 insertions(+), 62 deletions(-) diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c index 4bb51f69b..62baab9fc 100644 --- a/armsrc/iso14443a.c +++ b/armsrc/iso14443a.c @@ -143,11 +143,11 @@ Default HF 14a config is set to: static hf14a_config hf14aconfig = { 0, 0, 0, 0, 0 } ; -// Polling frames and configurations +// Polling frames and configurations static iso14a_polling_parameters WUPA_POLLING_PARAMETERS = { - .frames={ {{ 0x52 }, 1, 7, 0} }, - .frame_count=1, - .extra_timeout=0, + .frames = { {{ 0x52 }, 1, 7, 0} }, + .frame_count = 1, + .extra_timeout = 0, }; @@ -2519,7 +2519,7 @@ static void iso14a_set_ATS_times(const uint8_t *ats) { static int GetATQA(uint8_t *resp, uint8_t *resp_par, iso14a_polling_parameters *polling_parameters) { - #define WUPA_RETRY_TIMEOUT 10 +#define WUPA_RETRY_TIMEOUT 10 uint32_t save_iso14a_timeout = iso14a_get_timeout(); iso14a_set_timeout(1236 / 128 + 1); // response to WUPA is expected at exactly 1236/fc. No need to wait longer. @@ -2543,7 +2543,7 @@ static int GetATQA(uint8_t *resp, uint8_t *resp_par, iso14a_polling_parameters * if (frame_parameters->extra_delay) { SpinDelay(frame_parameters->extra_delay); } - + // Receive the ATQA len = ReaderReceive(resp, resp_par); @@ -3027,9 +3027,9 @@ void ReaderIso14443a(PacketCommandNG *c) { iso14a_card_select_t *card = (iso14a_card_select_t *)buf; arg0 = iso14443a_select_cardEx( - NULL, card, NULL, true, 0, (param & ISO14A_NO_RATS), - (param & ISO14A_USE_CUSTOM_POLLING) ? (iso14a_polling_parameters *)cmd : &WUPA_POLLING_PARAMETERS - ); + NULL, card, NULL, true, 0, (param & ISO14A_NO_RATS), + (param & ISO14A_USE_CUSTOM_POLLING) ? (iso14a_polling_parameters *)cmd : &WUPA_POLLING_PARAMETERS + ); // TODO: Improve by adding a cmd parser pointer and moving it by struct length to allow combining data with polling params FpgaDisableTracing(); diff --git a/client/src/cmdhf14a.c b/client/src/cmdhf14a.c index bf1ded102..21ad70be7 100644 --- a/client/src/cmdhf14a.c +++ b/client/src/cmdhf14a.c @@ -55,31 +55,31 @@ static int CmdHelp(const char *Cmd); static int waitCmd(bool i_select, uint32_t timeout, bool verbose); -static const iso14a_polling_frame WUPA_FRAME = { +static const iso14a_polling_frame WUPA_FRAME = { { 0x52 }, 1, 7, 0, }; -static const iso14a_polling_frame MAGWUPA1_FRAME = { - { 0x7A }, 1, 7, 0 +static const iso14a_polling_frame MAGWUPA1_FRAME = { + { 0x7A }, 1, 7, 0 }; -static const iso14a_polling_frame MAGWUPA2_FRAME = { - { 0x7B }, 1, 7, 0 +static const iso14a_polling_frame MAGWUPA2_FRAME = { + { 0x7B }, 1, 7, 0 }; -static const iso14a_polling_frame MAGWUPA3_FRAME = { - { 0x7C }, 1, 7, 0 +static const iso14a_polling_frame MAGWUPA3_FRAME = { + { 0x7C }, 1, 7, 0 }; -static const iso14a_polling_frame MAGWUPA4_FRAME = { - { 0x7D }, 1, 7, 0 +static const iso14a_polling_frame MAGWUPA4_FRAME = { + { 0x7D }, 1, 7, 0 }; -static const iso14a_polling_frame ECP_FRAME = { - .frame={ 0x6a, 0x02, 0xC8, 0x01, 0x00, 0x03, 0x00, 0x02, 0x79, 0x00, 0x00, 0x00, 0x00, 0xC2, 0xD8}, - .frame_length=15, - .last_byte_bits=8, - .extra_delay=0 +static const iso14a_polling_frame ECP_FRAME = { + .frame = { 0x6a, 0x02, 0xC8, 0x01, 0x00, 0x03, 0x00, 0x02, 0x79, 0x00, 0x00, 0x00, 0x00, 0xC2, 0xD8}, + .frame_length = 15, + .last_byte_bits = 8, + .extra_delay = 0 }; @@ -465,34 +465,34 @@ int Hf14443_4aGetCardData(iso14a_card_select_t *card) { iso14a_polling_parameters iso14a_get_polling_parameters(bool use_ecp, bool use_magsafe) { // Extra 100ms give enough time for Apple (ECP) devices to proccess field info and make a decision - + if (use_ecp && use_magsafe) { iso14a_polling_parameters full_polling_parameters = { - .frames={ WUPA_FRAME, ECP_FRAME, MAGWUPA1_FRAME, MAGWUPA2_FRAME, MAGWUPA3_FRAME, MAGWUPA4_FRAME }, - .frame_count=6, - .extra_timeout=100 + .frames = { WUPA_FRAME, ECP_FRAME, MAGWUPA1_FRAME, MAGWUPA2_FRAME, MAGWUPA3_FRAME, MAGWUPA4_FRAME }, + .frame_count = 6, + .extra_timeout = 100 }; return full_polling_parameters; } else if (use_ecp) { iso14a_polling_parameters ecp_polling_parameters = { - .frames={ WUPA_FRAME, ECP_FRAME }, - .frame_count=2, - .extra_timeout=100 + .frames = { WUPA_FRAME, ECP_FRAME }, + .frame_count = 2, + .extra_timeout = 100 }; return ecp_polling_parameters; } else if (use_magsafe) { iso14a_polling_parameters magsafe_polling_parameters = { - .frames={ WUPA_FRAME, MAGWUPA1_FRAME, MAGWUPA2_FRAME, MAGWUPA3_FRAME, MAGWUPA4_FRAME }, - .frame_count=5, - .extra_timeout=0 + .frames = { WUPA_FRAME, MAGWUPA1_FRAME, MAGWUPA2_FRAME, MAGWUPA3_FRAME, MAGWUPA4_FRAME }, + .frame_count = 5, + .extra_timeout = 0 }; return magsafe_polling_parameters; - } + } iso14a_polling_parameters wupa_polling_parameters = { - .frames={ WUPA_FRAME }, - .frame_count=1, - .extra_timeout=0, + .frames = { WUPA_FRAME }, + .frame_count = 1, + .extra_timeout = 0, }; return wupa_polling_parameters; } @@ -540,7 +540,7 @@ static int CmdHF14AReader(const char *Cmd) { bool use_ecp = arg_get_lit(ctx, 5); bool use_magsafe = arg_get_lit(ctx, 6); - iso14a_polling_parameters * polling_parameters = NULL; + iso14a_polling_parameters *polling_parameters = NULL; iso14a_polling_parameters parameters = iso14a_get_polling_parameters(use_ecp, use_magsafe); if (use_ecp || use_magsafe) { cm |= ISO14A_USE_CUSTOM_POLLING; @@ -566,7 +566,7 @@ static int CmdHF14AReader(const char *Cmd) { } else { SendCommandMIX(CMD_HF_ISO14443A_READER, cm, 0, 0, NULL, 0); } - + if (ISO14A_CONNECT & cm) { PacketResponseNG resp; @@ -982,7 +982,7 @@ int SelectCard14443A_4_WithParameters(bool disconnect, bool verbose, iso14a_card } else { SendCommandMIX(CMD_HF_ISO14443A_READER, ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0, NULL, 0); } - + if (WaitForResponseTimeout(CMD_ACK, &resp, 1500) == false) { PrintAndLogEx(WARNING, "Command execute timeout"); return PM3_ETIMEOUT; @@ -1439,7 +1439,7 @@ static int CmdHF14ACmdRaw(const char *Cmd) { // flags |= ISO14A_USE_MAGSAFE; // flags |= ISO14A_USE_ECP; } - + // Max buffer is PM3_CMD_DATA_SIZE datalen = (datalen > PM3_CMD_DATA_SIZE) ? PM3_CMD_DATA_SIZE : datalen; diff --git a/client/src/cmdhfvas.c b/client/src/cmdhfvas.c index 1a0dca54e..ac0365cdf 100644 --- a/client/src/cmdhfvas.c +++ b/client/src/cmdhfvas.c @@ -41,18 +41,18 @@ #include "mbedtls/ecc_point_compression.h" #include "mbedtls/gcm.h" -static const iso14a_polling_frame WUPA_FRAME = { - .frame={ 0x52 }, - .frame_length=1, - .last_byte_bits=7, - .extra_delay=0, +static const iso14a_polling_frame WUPA_FRAME = { + .frame = { 0x52 }, + .frame_length = 1, + .last_byte_bits = 7, + .extra_delay = 0, }; static const iso14a_polling_frame ECP_VAS_ONLY_FRAME = { - .frame={0x6a, 0x01, 0x00, 0x00, 0x02, 0xe4, 0xd2}, - .frame_length=7, - .last_byte_bits=8, - .extra_delay=0, + .frame = {0x6a, 0x01, 0x00, 0x00, 0x02, 0xe4, 0xd2}, + .frame_length = 7, + .last_byte_bits = 8, + .extra_delay = 0, }; uint8_t aid[] = { 0x4f, 0x53, 0x45, 0x2e, 0x56, 0x41, 0x53, 0x2e, 0x30, 0x31 }; @@ -350,9 +350,9 @@ static int VASReader(uint8_t *pidHash, const char *url, size_t urlLen, uint8_t * clearCommandBuffer(); iso14a_polling_parameters polling_parameters = { - .frames={ WUPA_FRAME, ECP_VAS_ONLY_FRAME }, - .frame_count=2, - .extra_timeout=250 + .frames = { WUPA_FRAME, ECP_VAS_ONLY_FRAME }, + .frame_count = 2, + .extra_timeout = 250 }; if (SelectCard14443A_4_WithParameters(false, false, NULL, &polling_parameters) != PM3_SUCCESS) { diff --git a/doc/commands.json b/doc/commands.json index 775087e22..5686c7542 100644 --- a/doc/commands.json +++ b/doc/commands.json @@ -3534,13 +3534,17 @@ "command": "hf legic einfo", "description": "It decodes and displays emulator memory", "notes": [ - "hf legic einfo" + "hf legic einfo", + "hf legic eview --22" ], "offline": false, "options": [ - "-h, --help This help" + "-h, --help This help", + "--22 LEGIC Prime MIM22", + "--256 LEGIC Prime MIM256 (def)", + "--1024 LEGIC Prime MIM1024" ], - "usage": "hf legic einfo [-h]" + "usage": "hf legic einfo [-h] [--22] [--256] [--1024]" }, "hf legic eload": { "command": "hf legic eload", @@ -7631,9 +7635,10 @@ ], "offline": true, "options": [ - "-h, --help This help" + "-h, --help This help", + "-v, --verbose verbose output" ], - "usage": "lf cotag demod [-h]" + "usage": "lf cotag demod [-hv]" }, "lf cotag reader": { "command": "lf cotag reader", @@ -11689,6 +11694,6 @@ "metadata": { "commands_extracted": 679, "extracted_by": "PM3Help2JSON v1.00", - "extracted_on": "2023-07-16T13:30:30" + "extracted_on": "2023-07-17T15:46:12" } } \ No newline at end of file diff --git a/include/mifare.h b/include/mifare.h index 3bb8c9ba8..863734cb5 100644 --- a/include/mifare.h +++ b/include/mifare.h @@ -91,9 +91,9 @@ typedef struct { // Defines polling sequence configuration // 6 would be enough for 4 magsafe, 1 wupa, 1 ecp, typedef struct { - iso14a_polling_frame frames[6]; - uint8_t frame_count; - uint16_t extra_timeout; + iso14a_polling_frame frames[6]; + uint8_t frame_count; + uint16_t extra_timeout; } iso14a_polling_parameters; typedef struct {