diff --git a/client/src/cmdhfemrtd.c b/client/src/cmdhfemrtd.c index 98bb3e44d..2e81ec3a7 100644 --- a/client/src/cmdhfemrtd.c +++ b/client/src/cmdhfemrtd.c @@ -120,7 +120,7 @@ static emrtd_hashalg_t hashalg_table[] = { {"SHA-1", sha1hash, 20, 7, {0x06, 0x05, 0x2B, 0x0E, 0x03, 0x02, 0x1A}}, {"SHA-256", sha256hash, 32, 11, {0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01}}, {"SHA-512", sha512hash, 64, 11, {0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x03}}, - {NULL, NULL, 0, 0, {}} + {NULL, NULL, 0, 0, {0}} }; static emrtd_pacealg_t pacealg_table[] = { @@ -141,7 +141,7 @@ static emrtd_pacealg_t pacealg_table[] = { {"ECDH, Integrated Mapping, AES-CMAC-128", NULL, {0x04, 0x00, 0x7F, 0x00, 0x07, 0x02, 0x02, 0x04, 0x04, 0x02}}, {"ECDH, Integrated Mapping, AES-CMAC-192", NULL, {0x04, 0x00, 0x7F, 0x00, 0x07, 0x02, 0x02, 0x04, 0x04, 0x03}}, {"ECDH, Integrated Mapping, AES-CMAC-256", NULL, {0x04, 0x00, 0x7F, 0x00, 0x07, 0x02, 0x02, 0x04, 0x04, 0x04}}, - {NULL, NULL, {}} + {NULL, NULL, {0}} }; static emrtd_pacesdp_t pacesdp_table[] = { diff --git a/client/src/cmdhftexkom.c b/client/src/cmdhftexkom.c index 6cb77a54e..6063e807c 100644 --- a/client/src/cmdhftexkom.c +++ b/client/src/cmdhftexkom.c @@ -429,7 +429,7 @@ static void TexcomReverseCode(const uint8_t *code, int length, uint8_t *reverse_ for (int i = 0; i < length; i++) { reverse_code[i] = code[(length - 1) - i]; } -}; +} static int texkom_get_type(texkom_card_select_t *card, bool verbose) { @@ -493,7 +493,7 @@ static int texkom_get_type(texkom_card_select_t *card, bool verbose) { noiselvl = TEXKOM_NOISE_THRESHOLD; } - uint32_t implengths[256] = {}; + uint32_t implengths[256] = { 0 }; uint32_t implengthslen = 0; uint32_t impulseindx = 0; uint32_t impulsecnt = 0; @@ -707,7 +707,7 @@ static int CmdHFTexkomReader(const char *Cmd) { //PrintAndLogEx(WARNING, "--- indx: %d, len: %d, max: %d, noise: %d", sindx, slen, maxlvl, noiselvl); - uint32_t implengths[256] = {}; + uint32_t implengths[256] = { 0 }; uint32_t implengthslen = 0; uint32_t impulseindx = 0; uint32_t impulsecnt = 0; @@ -872,7 +872,7 @@ static int CmdHFTexkomSim(const char *Cmd) { uint8_t data[8]; uint8_t modulation; uint32_t timeout; - } PACKED payload = {}; + } PACKED payload = {0}; bool verbose = arg_get_lit(ctx, 1); payload.modulation = 0; // tk-13 diff --git a/client/src/cmdhfvas.c b/client/src/cmdhfvas.c index fa621e853..0c6cc5df8 100644 --- a/client/src/cmdhfvas.c +++ b/client/src/cmdhfvas.c @@ -586,10 +586,10 @@ static command_t CommandTable[] = { int CmdHFVAS(const char *Cmd) { clearCommandBuffer(); return CmdsParse(CommandTable, Cmd); -}; +} static int CmdHelp(const char *Cmd) { (void)Cmd; // Cmd is not used so far CmdsHelp(CommandTable); return PM3_SUCCESS; -}; +} diff --git a/client/src/ksx6924/ksx6924core.c b/client/src/ksx6924/ksx6924core.c index 307573f74..4f4ab676e 100644 --- a/client/src/ksx6924/ksx6924core.c +++ b/client/src/ksx6924/ksx6924core.c @@ -108,86 +108,83 @@ typedef struct { return r->value; \ } -MAKE_ENUM_TYPE(uint8_t); +MAKE_ENUM_TYPE(uint8_t) // KSX6924LookupCardType MAKE_ENUM_CONST(CardType, uint8_t, -{ 0x00, "Pre-paid" }, -{ 0x10, "Post-pay" }, -{ 0x20, "Mobile post-pay" }, - ); + { 0x00, "Pre-paid" }, + { 0x10, "Post-pay" }, + { 0x20, "Mobile post-pay" }, +) // KSX6924LookupAlg MAKE_ENUM_CONST(Alg, uint8_t, -{ 0x00, "SEED" }, -{ 0x10, "3DES" }, - ); + { 0x00, "SEED" }, + { 0x10, "3DES" }, +) // KSX6924LookupTMoneyIDCenter MAKE_ENUM_CONST(TMoneyIDCenter, uint8_t, -{ 0x00, "Reserved" }, -{ 0x01, "Korea Financial Telecommunications and Clearings Institute" }, -{ 0x02, "A-Cash" }, -{ 0x03, "Mybi" }, -{ 0x04, "Reserved" }, -{ 0x05, "V-Cash" }, -{ 0x06, "Mondex Korea" }, -{ 0x07, "Korea Expressway Corporation" }, -{ 0x08, "Tmoney Co., Ltd." }, -{ 0x09, "KORAIL Networks" }, -{ 0x0a, "Reserved" }, -{ 0x0b, "EB Card Corporation" }, -{ 0x0c, "Seoul Bus Transport Association" }, -{ 0x0d, "Cardnet" }, - ); + { 0x00, "Reserved" }, + { 0x01, "Korea Financial Telecommunications and Clearings Institute" }, + { 0x02, "A-Cash" }, + { 0x03, "Mybi" }, + { 0x04, "Reserved" }, + { 0x05, "V-Cash" }, + { 0x06, "Mondex Korea" }, + { 0x07, "Korea Expressway Corporation" }, + { 0x08, "Tmoney Co., Ltd." }, + { 0x09, "KORAIL Networks" }, + { 0x0a, "Reserved" }, + { 0x0b, "EB Card Corporation" }, + { 0x0c, "Seoul Bus Transport Association" }, + { 0x0d, "Cardnet" }, +) // KSX6924LookupTMoneyUserCode MAKE_ENUM_CONST(TMoneyUserCode, uint8_t, -{ 0x01, "Regular/normal" }, -{ 0x02, "Child" }, - -{ 0x04, "Youth" }, - -{ 0x06, "elderly" }, - -{ 0x0f, "Test" }, -{ 0xff, "Inactive" }, - ); + { 0x01, "Regular/normal" }, + { 0x02, "Child" }, + { 0x04, "Youth" }, + { 0x06, "elderly" }, + { 0x0f, "Test" }, + { 0xff, "Inactive" }, +) // KSX6924LookupTMoneyDisRate MAKE_ENUM_CONST(TMoneyDisRate, uint8_t, -{ 0x00, "No discount" }, + { 0x00, "No discount" }, -{ 0x10, "Disabled, basic" }, -{ 0x11, "Disabled, companion" }, + { 0x10, "Disabled, basic" }, + { 0x11, "Disabled, companion" }, -{ 0x20, "Merit, basic" }, -{ 0x21, "Merit, companion" }, - ); + { 0x20, "Merit, basic" }, + { 0x21, "Merit, companion" }, +) // KSX6924LookupTMoneyTCode MAKE_ENUM_CONST(TMoneyTCode, uint8_t, -{ 0x00, "None" }, -{ 0x01, "SK Telecom" }, -{ 0x02, "Korea Telecom" }, -{ 0x03, "LG Uplus" }, - ); + { 0x00, "None" }, + { 0x01, "SK Telecom" }, + { 0x02, "Korea Telecom" }, + { 0x03, "LG Uplus" }, +) // KSX6924LookupTMoneyCCode MAKE_ENUM_CONST(TMoneyCCode, uint8_t, -{ 0x00, "None" }, -{ 0x01, "KB Card" }, -{ 0x02, "NH Card" }, -{ 0x03, "Lotte Card" }, -{ 0x04, "BC Card" }, -{ 0x05, "Samsung Card" }, -{ 0x06, "Shinhan Card" }, -{ 0x07, "Citibank Korea" }, -{ 0x08, "Korea Exchange Bank" }, -{ 0x09, "Woori Card" }, -{ 0x0a, "Hana SK Card" }, -{ 0x0b, "Hyundai Card" }, - ); + { 0x00, "None" }, + { 0x01, "KB Card" }, + { 0x02, "NH Card" }, + { 0x03, "Lotte Card" }, + { 0x04, "BC Card" }, + { 0x05, "Samsung Card" }, + { 0x06, "Shinhan Card" }, + { 0x07, "Citibank Korea" }, + { 0x08, "Korea Exchange Bank" }, + { 0x09, "Woori Card" }, + { 0x0a, "Hana SK Card" }, + { 0x0b, "Hyundai Card" }, +) static const char *KSX6924_UNKNOWN = "Unknown"; diff --git a/client/src/mifare/desfirecrypto.c b/client/src/mifare/desfirecrypto.c index 48126ae50..750723dab 100644 --- a/client/src/mifare/desfirecrypto.c +++ b/client/src/mifare/desfirecrypto.c @@ -788,11 +788,11 @@ bool desfire_crc32_check(uint8_t *data, const size_t len, uint8_t *crc) { } void iso14443a_crc_append(uint8_t *data, size_t len) { - return compute_crc(CRC_14443_A, data, len, data + len, data + len + 1); + compute_crc(CRC_14443_A, data, len, data + len, data + len + 1); } void iso14443a_crc(uint8_t *data, size_t len, uint8_t *pbtCrc) { - return compute_crc(CRC_14443_A, data, len, pbtCrc, pbtCrc + 1); + compute_crc(CRC_14443_A, data, len, pbtCrc, pbtCrc + 1); } bool iso14443a_crc_check(uint8_t *data, const size_t len, uint8_t *crc) { diff --git a/client/src/uart/uart_posix.c b/client/src/uart/uart_posix.c index bc0fb37c4..588e9ae90 100644 --- a/client/src/uart/uart_posix.c +++ b/client/src/uart/uart_posix.c @@ -94,7 +94,7 @@ serial_port uart_open(const char *pcPortName, uint32_t speed) { g_conn.send_via_local_ip = false; g_conn.send_via_ip = PM3_NONE; - char *prefix = strdup(pcPortName); + char *prefix = str_dup(pcPortName); if (prefix == NULL) { PrintAndLogEx(ERR, "error: string duplication"); free(sp); @@ -112,7 +112,7 @@ serial_port uart_open(const char *pcPortName, uint32_t speed) { struct addrinfo *addr = NULL, *rp; - char *addrPortStr = strdup(pcPortName + 4); + char *addrPortStr = str_dup(pcPortName + 4); char *addrstr = addrPortStr; const char *portstr; if (addrPortStr == NULL) { @@ -303,7 +303,7 @@ serial_port uart_open(const char *pcPortName, uint32_t speed) { struct addrinfo *addr = NULL, *rp; - char *addrPortStr = strdup(pcPortName + 4); + char *addrPortStr = str_dup(pcPortName + 4); char *addrstr = addrPortStr; const char *portstr; if (addrPortStr == NULL) { diff --git a/client/src/uart/uart_win32.c b/client/src/uart/uart_win32.c index ba3374494..43299ca5a 100644 --- a/client/src/uart/uart_win32.c +++ b/client/src/uart/uart_win32.c @@ -95,7 +95,7 @@ serial_port uart_open(const char *pcPortName, uint32_t speed) { g_conn.send_via_local_ip = false; g_conn.send_via_ip = PM3_NONE; - char *prefix = strdup(pcPortName); + char *prefix = str_dup(pcPortName); if (prefix == NULL) { PrintAndLogEx(ERR, "error: string duplication"); free(sp); @@ -114,7 +114,7 @@ serial_port uart_open(const char *pcPortName, uint32_t speed) { struct addrinfo *addr = NULL, *rp; - char *addrPortStr = strdup(pcPortName + 4); + char *addrPortStr = str_dup(pcPortName + 4); char *addrstr = addrPortStr; const char *portstr; if (addrPortStr == NULL) { @@ -321,7 +321,7 @@ serial_port uart_open(const char *pcPortName, uint32_t speed) { struct addrinfo *addr = NULL, *rp; - char *addrPortStr = strdup(pcPortName + 4); + char *addrPortStr = str_dup(pcPortName + 4); char *addrstr = addrPortStr; const char *portstr; if (addrPortStr == NULL) {