github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-21 05:43:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

make style

Browse source
This commit is contained in:
Philippe Teuwen 2021-12-29 16:28:50 +01:00
commit 62a9f5dcc2
3 changed files with 62 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

116
client/src/ksx6924/ksx6924core.c
View file

@ -93,82 +93,82 @@ MAKE_ENUM_TYPE(uint8_t);
// KSX6924LookupCardType // KSX6924LookupCardType
MAKE_ENUM_CONST(CardType, uint8_t, MAKE_ENUM_CONST(CardType, uint8_t,
{ 0x00, "Pre-paid" }, { 0x00, "Pre-paid" },
{ 0x10, "Post-pay" }, { 0x10, "Post-pay" },
{ 0x20, "Mobile post-pay" }, { 0x20, "Mobile post-pay" },
); );
// KSX6924LookupAlg // KSX6924LookupAlg
MAKE_ENUM_CONST(Alg, uint8_t, MAKE_ENUM_CONST(Alg, uint8_t,
{ 0x00, "SEED" }, { 0x00, "SEED" },
{ 0x10, "3DES" }, { 0x10, "3DES" },
); );
// KSX6924LookupTMoneyIDCenter // KSX6924LookupTMoneyIDCenter
MAKE_ENUM_CONST(TMoneyIDCenter, uint8_t, MAKE_ENUM_CONST(TMoneyIDCenter, uint8_t,
{ 0x00, "reserved" }, { 0x00, "reserved" },
{ 0x01, "Korea Financial Telecommunications and Clearings Institute" }, { 0x01, "Korea Financial Telecommunications and Clearings Institute" },
{ 0x02, "A-Cash" }, { 0x02, "A-Cash" },
{ 0x03, "Mybi" }, { 0x03, "Mybi" },
{ 0x05, "V-Cash" }, { 0x05, "V-Cash" },
{ 0x06, "Mondex Korea" }, { 0x06, "Mondex Korea" },
{ 0x07, "Korea Expressway Corporation" }, { 0x07, "Korea Expressway Corporation" },
{ 0x08, "Korea Smart Card Corporation" }, { 0x08, "Korea Smart Card Corporation" },
{ 0x09, "KORAIL Networks" }, { 0x09, "KORAIL Networks" },
{ 0x0b, "EB Card Corporation" }, { 0x0b, "EB Card Corporation" },
{ 0x0c, "Seoul Bus Transport Association" }, { 0x0c, "Seoul Bus Transport Association" },
{ 0x0d, "Cardnet" }, { 0x0d, "Cardnet" },
); );
// KSX6924LookupTMoneyUserCode // KSX6924LookupTMoneyUserCode
MAKE_ENUM_CONST(TMoneyUserCode, uint8_t, MAKE_ENUM_CONST(TMoneyUserCode, uint8_t,
{ 0x01, "Regular/normal" }, { 0x01, "Regular/normal" },
{ 0x02, "Child" }, { 0x02, "Child" },
{ 0x04, "Youth" }, { 0x04, "Youth" },
{ 0x06, "elderly" }, { 0x06, "elderly" },
{ 0x0f, "Test" }, { 0x0f, "Test" },
{ 0xff, "Inactive" }, { 0xff, "Inactive" },
); );
// KSX6924LookupTMoneyDisRate // KSX6924LookupTMoneyDisRate
MAKE_ENUM_CONST(TMoneyDisRate, uint8_t, MAKE_ENUM_CONST(TMoneyDisRate, uint8_t,
{ 0x00, "No discount" }, { 0x00, "No discount" },
{ 0x10, "Disabled, basic" }, { 0x10, "Disabled, basic" },
{ 0x11, "Disabled, companion" }, { 0x11, "Disabled, companion" },
{ 0x20, "Merit, basic" }, { 0x20, "Merit, basic" },
{ 0x21, "Merit, companion" }, { 0x21, "Merit, companion" },
); );
// KSX6924LookupTMoneyTCode // KSX6924LookupTMoneyTCode
MAKE_ENUM_CONST(TMoneyTCode, uint8_t, MAKE_ENUM_CONST(TMoneyTCode, uint8_t,
{ 0x00, "None" }, { 0x00, "None" },
{ 0x01, "SK Telecom" }, { 0x01, "SK Telecom" },
{ 0x02, "Korea Telecom" }, { 0x02, "Korea Telecom" },
{ 0x03, "LG Uplus" }, { 0x03, "LG Uplus" },
); );
// KSX6924LookupTMoneyCCode // KSX6924LookupTMoneyCCode
MAKE_ENUM_CONST(TMoneyCCode, uint8_t, MAKE_ENUM_CONST(TMoneyCCode, uint8_t,
{ 0x00, "None" }, { 0x00, "None" },
{ 0x01, "KB Kookmin Bank" }, { 0x01, "KB Kookmin Bank" },
{ 0x02, "Nonghyup Bank" }, { 0x02, "Nonghyup Bank" },
{ 0x03, "Lotte Card" }, { 0x03, "Lotte Card" },
{ 0x04, "BC Card" }, { 0x04, "BC Card" },
{ 0x05, "Samsung Card" }, { 0x05, "Samsung Card" },
{ 0x06, "Shinhan Bank" }, { 0x06, "Shinhan Bank" },
{ 0x07, "Citibank Korea" }, { 0x07, "Citibank Korea" },
{ 0x08, "Korea Exchange Bank" }, { 0x08, "Korea Exchange Bank" },
{ 0x09, "Woori" }, { 0x09, "Woori" },
{ 0x0a, "Hana SK Card" }, { 0x0a, "Hana SK Card" },
{ 0x0b, "Hyundai Capital Services" }, { 0x0b, "Hyundai Capital Services" },
); );
static const char *KSX6924_UNKNOWN = "Unknown"; static const char *KSX6924_UNKNOWN = "Unknown";
@ -226,7 +226,7 @@ static int64_t bcdToLong(const uint8_t *buf, size_t len) {
/** /**
* Converts a date from on-card format to ksx6924_date format. * Converts a date from on-card format to ksx6924_date format.
*/ */
static bool convert_internal_date( const _ksx6924_internal_date_t i, struct ksx6924_date *ret) { static bool convert_internal_date(const _ksx6924_internal_date_t i, struct ksx6924_date *ret) {
int64_t year = bcdToLong(i.year, 2); int64_t year = bcdToLong(i.year, 2);
int16_t month = bcdToInteger(i.month[0]); int16_t month = bcdToInteger(i.month[0]);
@ -276,7 +276,7 @@ bool KSX6924ParsePurseInfo(const uint8_t *purseInfo, size_t purseLen, struct ksx
0, // min_str_len 0, // min_str_len
0, // spaces_between 0, // spaces_between
false // uppercase false // uppercase
); );
int64_t idtr = bcdToLong(internalPurseInfo->idtr, 5); int64_t idtr = bcdToLong(internalPurseInfo->idtr, 5);
if (idtr < 0) { if (idtr < 0) {
@ -294,8 +294,8 @@ bool KSX6924ParsePurseInfo(const uint8_t *purseInfo, size_t purseLen, struct ksx
convert_internal_date(internalPurseInfo->issueDate, &(ret->issueDate)); convert_internal_date(internalPurseInfo->issueDate, &(ret->issueDate));
convert_internal_date(internalPurseInfo->expiryDate, &(ret->expiryDate)); convert_internal_date(internalPurseInfo->expiryDate, &(ret->expiryDate));
ret->balMax = MemBeToUint4byte((uint8_t*)internalPurseInfo->balMax); ret->balMax = MemBeToUint4byte((uint8_t *)internalPurseInfo->balMax);
ret->mmax = MemBeToUint4byte((uint8_t*)internalPurseInfo->mmax); ret->mmax = MemBeToUint4byte((uint8_t *)internalPurseInfo->mmax);
memcpy(&ret->rfu, &internalPurseInfo->rfu, 8); memcpy(&ret->rfu, &internalPurseInfo->rfu, 8);
@ -367,7 +367,7 @@ int KSX6924Select(bool ActivateField, bool LeaveFieldON, uint8_t *Result, size_t
ResultLen, ResultLen,
sw, sw,
NULL NULL
); );
} }
/** /**
@ -390,7 +390,7 @@ bool KSX6924TrySelect(void) {
"Not a KS X 6924 card! APDU response: %04x - %s", "Not a KS X 6924 card! APDU response: %04x - %s",
sw, sw,
GetAPDUCodeDescription(sw >> 8, sw & 0xff) GetAPDUCodeDescription(sw >> 8, sw & 0xff)
); );
} else { } else {
PrintAndLogEx(FAILED, "APDU exchange error. Card returns 0x0000."); PrintAndLogEx(FAILED, "APDU exchange error. Card returns 0x0000.");
} }
@ -430,7 +430,7 @@ bool KSX6924GetBalance(uint32_t *result) {
return false; return false;
} }
*result = MemBeToUint4byte((uint8_t*)arr); *result = MemBeToUint4byte((uint8_t *)arr);
return true; return true;
} }

2
common/mbedtls/ssl_tls.c
View file

@ -3086,7 +3086,7 @@ static void ssl_calc_finished_tls_sha384(
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wstringop-overflow" #pragma GCC diagnostic ignored "-Wstringop-overflow"
#endif #endif
mbedtls_sha512_finish_ret( &sha512, padbuf ); mbedtls_sha512_finish_ret(&sha512, padbuf);
#if defined(__GNUC__) && __GNUC__ >= 11 #if defined(__GNUC__) && __GNUC__ >= 11
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif #endif

2
doc/commands.json
View file

@ -10151,6 +10151,6 @@
"metadata": { "metadata": {
"commands_extracted": 597, "commands_extracted": 597,
"extracted_by": "PM3Help2JSON v1.00", "extracted_by": "PM3Help2JSON v1.00",
"extracted_on": "2021-12-27T18:30:34" "extracted_on": "2021-12-29T15:28:13"
} }
} }